--- a/.hgtags Mon Sep 12 15:00:58 2016 -0700
+++ b/.hgtags Mon Sep 12 22:04:48 2016 +0000
@@ -376,3 +376,4 @@
4d2a15091124488080d65848b704e25599b2aaeb jdk-9+131
2e83d21d78cd9c1d52e6cd2599e9c8aa36ea1f52 jdk-9+132
e17429a7e843c4a4ed3651458d0f950970edcbcc jdk-9+133
+a71210c0d9800eb6925b61ecd6198abd554f90ee jdk-9+134
--- a/.hgtags-top-repo Mon Sep 12 15:00:58 2016 -0700
+++ b/.hgtags-top-repo Mon Sep 12 22:04:48 2016 +0000
@@ -376,3 +376,4 @@
8728756c2f70a79a90188f4019cfd6b9a275765c jdk-9+131
a24702d4d5ab0015a5c553ed57f66fce7d85155e jdk-9+132
be1218f792a450dfb5d4b1f82616b9d95a6a732e jdk-9+133
+065724348690eda41fc69112278d8da6dcde548c jdk-9+134
--- a/common/autoconf/generated-configure.sh Mon Sep 12 15:00:58 2016 -0700
+++ b/common/autoconf/generated-configure.sh Mon Sep 12 22:04:48 2016 +0000
@@ -5095,7 +5095,7 @@
#CUSTOM_AUTOCONF_INCLUDE
# Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1470863189
+DATE_WHEN_GENERATED=1472718471
###############################################################################
#
@@ -15944,6 +15944,8 @@
HOTSPOT_TARGET_CPU_DEFINE=S390
elif test "x$OPENJDK_TARGET_CPU" = xs390x; then
HOTSPOT_TARGET_CPU_DEFINE=S390
+ elif test "x$OPENJDK_TARGET_CPU" != x; then
+ HOTSPOT_TARGET_CPU_DEFINE=$(echo $OPENJDK_TARGET_CPU | tr a-z A-Z)
fi
@@ -16117,6 +16119,8 @@
HOTSPOT_BUILD_CPU_DEFINE=S390
elif test "x$OPENJDK_BUILD_CPU" = xs390x; then
HOTSPOT_BUILD_CPU_DEFINE=S390
+ elif test "x$OPENJDK_BUILD_CPU" != x; then
+ HOTSPOT_BUILD_CPU_DEFINE=$(echo $OPENJDK_BUILD_CPU | tr a-z A-Z)
fi
--- a/common/autoconf/platform.m4 Mon Sep 12 15:00:58 2016 -0700
+++ b/common/autoconf/platform.m4 Mon Sep 12 22:04:48 2016 +0000
@@ -454,6 +454,8 @@
HOTSPOT_$1_CPU_DEFINE=S390
elif test "x$OPENJDK_$1_CPU" = xs390x; then
HOTSPOT_$1_CPU_DEFINE=S390
+ elif test "x$OPENJDK_$1_CPU" != x; then
+ HOTSPOT_$1_CPU_DEFINE=$(echo $OPENJDK_$1_CPU | tr a-z A-Z)
fi
AC_SUBST(HOTSPOT_$1_CPU_DEFINE)
--- a/corba/.hgtags Mon Sep 12 15:00:58 2016 -0700
+++ b/corba/.hgtags Mon Sep 12 22:04:48 2016 +0000
@@ -376,3 +376,4 @@
f7e1d5337c2e550fe553df7a3886bbed80292ecd jdk-9+131
1ab4b9399c4cba584f66c1c088188f2f565fbf9c jdk-9+132
2021bfedf1c478a4808a7711a6090682a12f4c0e jdk-9+133
+1a497f5ca0cfd88115cc7daa8af8a62b8741caf2 jdk-9+134
--- a/hotspot/.hgtags Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/.hgtags Mon Sep 12 22:04:48 2016 +0000
@@ -536,3 +536,4 @@
943bf73b49c33c2d7cbd796f6a4ae3c7a00ae932 jdk-9+131
713951c08aa26813375175c2ab6cc99ff2a56903 jdk-9+132
a25e0fb6033245ab075136e744d362ce765464cd jdk-9+133
+b8b694c6b4d2ab0939aed7adaf0eec1ac321a085 jdk-9+134
--- a/hotspot/make/test/JtregNative.gmk Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/make/test/JtregNative.gmk Mon Sep 12 22:04:48 2016 +0000
@@ -71,15 +71,15 @@
endif
ifeq ($(TOOLCHAIN_TYPE), solstudio)
- BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_liboverflow := -lc
- BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libSimpleClassFileLoadHook := -lc
- BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libGetNamedModuleTest := -lc
+ BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_liboverflow := -lc
+ BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libSimpleClassFileLoadHook := -lc
+ BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libGetNamedModuleTest := -lc
endif
ifeq ($(OPENJDK_TARGET_OS), linux)
BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rw := -z noexecstack
BUILD_HOTSPOT_JTREG_LIBRARIES_LDFLAGS_libtest-rwx := -z execstack
- BUILD_HOTSPOT_JTREG_EXECUTABLES_LDFLAGS_exeinvoke := -ljvm -lpthread
+ BUILD_HOTSPOT_JTREG_EXECUTABLES_LIBS_exeinvoke := -ljvm -lpthread
BUILD_TEST_invoke_exeinvoke.c_OPTIMIZATION := NONE
endif
--- a/hotspot/src/cpu/aarch64/vm/aarch64.ad Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/aarch64.ad Mon Sep 12 22:04:48 2016 +0000
@@ -4680,7 +4680,7 @@
Label retaddr;
__ adr(rscratch2, retaddr);
__ lea(rscratch1, RuntimeAddress(entry));
- // Leave a breadcrumb for JavaThread::pd_last_frame().
+ // Leave a breadcrumb for JavaFrameAnchor::capture_last_Java_pc()
__ stp(zr, rscratch2, Address(__ pre(sp, -2 * wordSize)));
__ blrt(rscratch1, gpcnt, fpcnt, rtype);
__ bind(retaddr);
--- a/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/c1_Runtime1_aarch64.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -78,7 +78,7 @@
}
pop(r0, sp);
#endif
- reset_last_Java_frame(true, true);
+ reset_last_Java_frame(true);
maybe_isb();
// check for pending exceptions
@@ -547,7 +547,7 @@
__ bind(L);
}
#endif
- __ reset_last_Java_frame(true, false);
+ __ reset_last_Java_frame(true);
__ maybe_isb();
// check for pending exceptions
--- a/hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/frame_aarch64.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -336,13 +336,16 @@
JavaFrameAnchor* jfa = entry_frame_call_wrapper()->anchor();
assert(!entry_frame_is_first(), "next Java fp must be non zero");
assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
+ // Since we are walking the stack now this nested anchor is obviously walkable
+ // even if it wasn't when it was stacked.
+ if (!jfa->walkable()) {
+ // Capture _last_Java_pc (if needed) and mark anchor walkable.
+ jfa->capture_last_Java_pc();
+ }
map->clear();
assert(map->include_argument_oops(), "should be set by clear");
- if (jfa->last_Java_pc() != NULL ) {
- frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc());
- return fr;
- }
- frame fr(jfa->last_Java_sp(), jfa->last_Java_fp());
+ vmassert(jfa->last_Java_pc() != NULL, "not walkable");
+ frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc());
return fr;
}
@@ -769,3 +772,21 @@
init((intptr_t*)sp, (intptr_t*)fp, (address)pc);
}
#endif
+
+void JavaFrameAnchor::make_walkable(JavaThread* thread) {
+ // last frame set?
+ if (last_Java_sp() == NULL) return;
+ // already walkable?
+ if (walkable()) return;
+ vmassert(Thread::current() == (Thread*)thread, "not current thread");
+ vmassert(last_Java_sp() != NULL, "not called from Java code?");
+ vmassert(last_Java_pc() == NULL, "already walkable");
+ capture_last_Java_pc();
+ vmassert(walkable(), "something went wrong");
+}
+
+void JavaFrameAnchor::capture_last_Java_pc() {
+ vmassert(_last_Java_sp != NULL, "no last frame set");
+ vmassert(_last_Java_pc == NULL, "already walkable");
+ _last_Java_pc = (address)_last_Java_sp[-1];
+}
--- a/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/interp_masm_aarch64.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -201,7 +201,7 @@
// #endif
MacroAssembler::null_check(reg, offset);
// #ifdef ASSERT
-// reset_last_Java_frame(true, false);
+// reset_last_Java_frame(true);
// #endif
}
--- a/hotspot/src/cpu/aarch64/vm/javaFrameAnchor_aarch64.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/javaFrameAnchor_aarch64.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -64,10 +64,9 @@
_last_Java_sp = src->_last_Java_sp;
}
- // Always walkable
- bool walkable(void) { return true; }
- // Never any thing to do since we are always walkable and can find address of return addresses
- void make_walkable(JavaThread* thread) { }
+ bool walkable(void) { return _last_Java_sp != NULL && _last_Java_pc != NULL; }
+ void make_walkable(JavaThread* thread);
+ void capture_last_Java_pc(void);
intptr_t* last_Java_sp(void) const { return _last_Java_sp; }
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -274,19 +274,18 @@
}
-void MacroAssembler::reset_last_Java_frame(bool clear_fp,
- bool clear_pc) {
+void MacroAssembler::reset_last_Java_frame(bool clear_fp) {
// we must set sp to zero to clear frame
str(zr, Address(rthread, JavaThread::last_Java_sp_offset()));
+
// must clear fp, so that compiled frames are not confused; it is
// possible that we need it only for debugging
if (clear_fp) {
str(zr, Address(rthread, JavaThread::last_Java_fp_offset()));
}
- if (clear_pc) {
- str(zr, Address(rthread, JavaThread::last_Java_pc_offset()));
- }
+ // Always clear the pc because it could have been set by make_walkable()
+ str(zr, Address(rthread, JavaThread::last_Java_pc_offset()));
}
// Calls to C land
@@ -632,7 +631,7 @@
// reset last Java frame
// Only interpreter should have to clear fp
- reset_last_Java_frame(true, true);
+ reset_last_Java_frame(true);
// C++ interp handles this in the interpreter
check_and_handle_popframe(java_thread);
@@ -875,7 +874,7 @@
if (type == bytecode_start) {
// set_last_Java_frame(esp, rfp, (address)NULL);
Assembler:: notify(type);
- // reset_last_Java_frame(true, false);
+ // reset_last_Java_frame(true);
}
else
Assembler:: notify(type);
--- a/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/macroAssembler_aarch64.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -757,10 +757,10 @@
Register last_java_pc,
Register scratch);
- void reset_last_Java_frame(Register thread, bool clearfp, bool clear_pc);
+ void reset_last_Java_frame(Register thread);
- // thread in the default location (r15_thread on 64bit)
- void reset_last_Java_frame(bool clear_fp, bool clear_pc);
+ // thread in the default location (rthread)
+ void reset_last_Java_frame(bool clear_fp);
// Stores
void store_check(Register obj); // store check for obj - register is destroyed afterwards
--- a/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -2030,7 +2030,7 @@
__ bind(dtrace_method_exit_done);
}
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
// Unpack oop result
if (ret_type == T_OBJECT || ret_type == T_ARRAY) {
@@ -2370,7 +2370,7 @@
__ bind(retaddr);
oop_maps->add_gc_map( __ pc()-start, map->deep_copy());
- __ reset_last_Java_frame(false, false);
+ __ reset_last_Java_frame(false);
__ b(after_fetch_unroll_info_call);
} // EnableJVMCI
@@ -2465,7 +2465,7 @@
// find any register it might need.
oop_maps->add_gc_map(__ pc() - start, map);
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
#if INCLUDE_JVMCI
if (EnableJVMCI) {
@@ -2606,7 +2606,7 @@
new OopMap( frame_size_in_words, 0 ));
// Clear fp AND pc
- __ reset_last_Java_frame(true, true);
+ __ reset_last_Java_frame(true);
// Collect return values
__ ldrd(v0, Address(sp, RegisterSaver::v0_offset_in_bytes()));
@@ -2709,7 +2709,7 @@
oop_maps->add_gc_map(__ pc() - start, map);
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
// move UnrollBlock* into r4
__ mov(r4, r0);
@@ -2828,7 +2828,7 @@
oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
// Clear fp AND pc
- __ reset_last_Java_frame(true, true);
+ __ reset_last_Java_frame(true);
// Pop self-frame.
__ leave(); // Epilog
@@ -2906,7 +2906,7 @@
Label noException;
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
__ maybe_isb();
__ membar(Assembler::LoadLoad | Assembler::LoadStore);
@@ -2985,7 +2985,7 @@
// r0 contains the address we are going to jump to assuming no exception got installed
// clear last_Java_sp
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
// check for pending exceptions
Label pending;
__ ldr(rscratch1, Address(rthread, Thread::pending_exception_offset()));
@@ -3116,7 +3116,7 @@
oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
// Restore callee-saved registers
--- a/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/stubGenerator_aarch64.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -3801,7 +3801,7 @@
oop_maps->add_gc_map(the_pc - start, map);
- __ reset_last_Java_frame(true, true);
+ __ reset_last_Java_frame(true);
__ maybe_isb();
__ leave();
--- a/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/templateInterpreterGenerator_aarch64.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1353,7 +1353,7 @@
__ stlrw(rscratch1, rscratch2);
// reset_last_Java_frame
- __ reset_last_Java_frame(true, true);
+ __ reset_last_Java_frame(true);
// reset handle block
__ ldr(t, Address(rthread, JavaThread::active_handles_offset()));
--- a/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/templateTable_aarch64.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -852,26 +852,23 @@
// get next bytecode
__ load_unsigned_byte(r1, at_bcp(Bytecodes::length_for(Bytecodes::_aload_0)));
- // do actual aload_0
- aload(0);
-
// if _getfield then wait with rewrite
__ cmpw(r1, Bytecodes::Bytecodes::_getfield);
__ br(Assembler::EQ, done);
- // if _igetfield then reqrite to _fast_iaccess_0
+ // if _igetfield then rewrite to _fast_iaccess_0
assert(Bytecodes::java_code(Bytecodes::_fast_iaccess_0) == Bytecodes::_aload_0, "fix bytecode definition");
__ cmpw(r1, Bytecodes::_fast_igetfield);
__ movw(bc, Bytecodes::_fast_iaccess_0);
__ br(Assembler::EQ, rewrite);
- // if _agetfield then reqrite to _fast_aaccess_0
+ // if _agetfield then rewrite to _fast_aaccess_0
assert(Bytecodes::java_code(Bytecodes::_fast_aaccess_0) == Bytecodes::_aload_0, "fix bytecode definition");
__ cmpw(r1, Bytecodes::_fast_agetfield);
__ movw(bc, Bytecodes::_fast_aaccess_0);
__ br(Assembler::EQ, rewrite);
- // if _fgetfield then reqrite to _fast_faccess_0
+ // if _fgetfield then rewrite to _fast_faccess_0
assert(Bytecodes::java_code(Bytecodes::_fast_faccess_0) == Bytecodes::_aload_0, "fix bytecode definition");
__ cmpw(r1, Bytecodes::_fast_fgetfield);
__ movw(bc, Bytecodes::_fast_faccess_0);
@@ -887,9 +884,10 @@
patch_bytecode(Bytecodes::_aload_0, bc, r1, false);
__ bind(done);
- } else {
- aload(0);
}
+
+ // Do actual aload_0 (must do this after patch_bytecode which might call VM and GC might change oop).
+ aload(0);
}
void TemplateTable::istore()
--- a/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/aarch64/vm/vm_version_aarch64.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -28,6 +28,7 @@
#include "runtime/globals_extension.hpp"
#include "runtime/vm_version.hpp"
+#include "utilities/sizes.hpp"
class VM_Version : public Abstract_VM_Version {
friend class JVMCIVMStructs;
--- a/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/sparc/vm/templateTable_sparc.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -705,9 +705,6 @@
// get next byte
__ ldub(at_bcp(Bytecodes::length_for(Bytecodes::_aload_0)), G3_scratch);
- // do actual aload_0
- aload(0);
-
// if _getfield then wait with rewrite
__ cmp_and_br_short(G3_scratch, (int)Bytecodes::_getfield, Assembler::equal, Assembler::pn, done);
@@ -738,9 +735,10 @@
__ bind(rewrite);
patch_bytecode(Bytecodes::_aload_0, G4_scratch, G3_scratch, false);
__ bind(done);
- } else {
- aload(0);
}
+
+ // Do actual aload_0 (must do this after patch_bytecode which might call VM and GC might change oop).
+ aload(0);
}
void TemplateTable::istore() {
--- a/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/c1_Runtime1_x86.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -98,7 +98,7 @@
}
pop(rax);
#endif
- reset_last_Java_frame(thread, true, align_stack);
+ reset_last_Java_frame(thread, true);
// discard thread and arguments
NOT_LP64(addptr(rsp, num_rt_args()*BytesPerWord));
@@ -872,7 +872,7 @@
}
__ pop(rax);
#endif
- __ reset_last_Java_frame(thread, true, false);
+ __ reset_last_Java_frame(thread, true);
#ifndef _LP64
__ pop(rcx); // discard thread arg
__ pop(rcx); // discard dummy
--- a/hotspot/src/cpu/x86/vm/frame_x86.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/frame_x86.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -337,13 +337,16 @@
JavaFrameAnchor* jfa = entry_frame_call_wrapper()->anchor();
assert(!entry_frame_is_first(), "next Java fp must be non zero");
assert(jfa->last_Java_sp() > sp(), "must be above this frame on stack");
+ // Since we are walking the stack now this nested anchor is obviously walkable
+ // even if it wasn't when it was stacked.
+ if (!jfa->walkable()) {
+ // Capture _last_Java_pc (if needed) and mark anchor walkable.
+ jfa->capture_last_Java_pc();
+ }
map->clear();
assert(map->include_argument_oops(), "should be set by clear");
- if (jfa->last_Java_pc() != NULL ) {
- frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc());
- return fr;
- }
- frame fr(jfa->last_Java_sp(), jfa->last_Java_fp());
+ vmassert(jfa->last_Java_pc() != NULL, "not walkable");
+ frame fr(jfa->last_Java_sp(), jfa->last_Java_fp(), jfa->last_Java_pc());
return fr;
}
@@ -666,3 +669,21 @@
init((intptr_t*)sp, (intptr_t*)fp, (address)pc);
}
#endif
+
+void JavaFrameAnchor::make_walkable(JavaThread* thread) {
+ // last frame set?
+ if (last_Java_sp() == NULL) return;
+ // already walkable?
+ if (walkable()) return;
+ vmassert(Thread::current() == (Thread*)thread, "not current thread");
+ vmassert(last_Java_sp() != NULL, "not called from Java code?");
+ vmassert(last_Java_pc() == NULL, "already walkable");
+ capture_last_Java_pc();
+ vmassert(walkable(), "something went wrong");
+}
+
+void JavaFrameAnchor::capture_last_Java_pc() {
+ vmassert(_last_Java_sp != NULL, "no last frame set");
+ vmassert(_last_Java_pc == NULL, "already walkable");
+ _last_Java_pc = (address)_last_Java_sp[-1];
+}
--- a/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/frame_x86.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -101,6 +101,7 @@
// call a specialized frame constructor instead of this one.
// Then we could use the assert below. However this assert is of somewhat dubious
// value.
+ // UPDATE: this constructor is only used by trace_method_handle_stub() now.
// assert(_pc != NULL, "no pc?");
_cb = CodeCache::find_blob(_pc);
--- a/hotspot/src/cpu/x86/vm/javaFrameAnchor_x86.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/javaFrameAnchor_x86.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -62,10 +62,9 @@
_last_Java_sp = src->_last_Java_sp;
}
- // Always walkable
- bool walkable(void) { return true; }
- // Never any thing to do since we are always walkable and can find address of return addresses
- void make_walkable(JavaThread* thread) { }
+ bool walkable(void) { return _last_Java_sp != NULL && _last_Java_pc != NULL; }
+ void make_walkable(JavaThread* thread);
+ void capture_last_Java_pc(void);
intptr_t* last_Java_sp(void) const { return _last_Java_sp; }
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -752,8 +752,7 @@
}
}
-void MacroAssembler::reset_last_Java_frame(bool clear_fp,
- bool clear_pc) {
+void MacroAssembler::reset_last_Java_frame(bool clear_fp) {
// we must set sp to zero to clear frame
movptr(Address(r15_thread, JavaThread::last_Java_sp_offset()), NULL_WORD);
// must clear fp, so that compiled frames are not confused; it is
@@ -762,9 +761,8 @@
movptr(Address(r15_thread, JavaThread::last_Java_fp_offset()), NULL_WORD);
}
- if (clear_pc) {
- movptr(Address(r15_thread, JavaThread::last_Java_pc_offset()), NULL_WORD);
- }
+ // Always clear the pc because it could have been set by make_walkable()
+ movptr(Address(r15_thread, JavaThread::last_Java_pc_offset()), NULL_WORD);
}
void MacroAssembler::set_last_Java_frame(Register last_java_sp,
@@ -2531,7 +2529,7 @@
}
// reset last Java frame
// Only interpreter should have to clear fp
- reset_last_Java_frame(java_thread, true, false);
+ reset_last_Java_frame(java_thread, true);
// C++ interp handles this in the interpreter
check_and_handle_popframe(java_thread);
@@ -3642,8 +3640,7 @@
pusha();
}
-void MacroAssembler::reset_last_Java_frame(Register java_thread, bool clear_fp, bool clear_pc) {
- // determine java_thread register
+void MacroAssembler::reset_last_Java_frame(Register java_thread, bool clear_fp) { // determine java_thread register
if (!java_thread->is_valid()) {
java_thread = rdi;
get_thread(java_thread);
@@ -3654,8 +3651,8 @@
movptr(Address(java_thread, JavaThread::last_Java_fp_offset()), NULL_WORD);
}
- if (clear_pc)
- movptr(Address(java_thread, JavaThread::last_Java_pc_offset()), NULL_WORD);
+ // Always clear the pc because it could have been set by make_walkable()
+ movptr(Address(java_thread, JavaThread::last_Java_pc_offset()), NULL_WORD);
}
--- a/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/macroAssembler_x86.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -288,10 +288,10 @@
Register last_java_fp,
address last_java_pc);
- void reset_last_Java_frame(Register thread, bool clear_fp, bool clear_pc);
+ void reset_last_Java_frame(Register thread, bool clear_fp);
// thread in the default location (r15_thread on 64bit)
- void reset_last_Java_frame(bool clear_fp, bool clear_pc);
+ void reset_last_Java_frame(bool clear_fp);
// Stores
void store_check(Register obj); // store check for obj - register is destroyed afterwards
--- a/hotspot/src/cpu/x86/vm/runtime_x86_32.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/runtime_x86_32.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -117,7 +117,7 @@
// No registers to map, rbp is known implicitly
oop_maps->add_gc_map( __ pc() - start, new OopMap( framesize, 0 ));
__ get_thread(rcx);
- __ reset_last_Java_frame(rcx, false, false);
+ __ reset_last_Java_frame(rcx, false);
// Restore callee-saved registers
__ movptr(rbp, Address(rsp, rbp_off * wordSize));
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_32.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1330,7 +1330,7 @@
__ increment(rsp, wordSize);
__ get_thread(thread);
- __ reset_last_Java_frame(thread, false, true);
+ __ reset_last_Java_frame(thread, false);
save_or_restore_arguments(masm, stack_slots, total_in_args,
arg_save_area, NULL, in_regs, in_sig_bt);
@@ -2224,7 +2224,7 @@
// We can finally stop using that last_Java_frame we setup ages ago
- __ reset_last_Java_frame(thread, false, true);
+ __ reset_last_Java_frame(thread, false);
// Unpack oop result
if (ret_type == T_OBJECT || ret_type == T_ARRAY) {
@@ -2553,7 +2553,7 @@
__ pop(rcx);
__ get_thread(rcx);
- __ reset_last_Java_frame(rcx, false, false);
+ __ reset_last_Java_frame(rcx, false);
// Load UnrollBlock into EDI
__ mov(rdi, rax);
@@ -2702,7 +2702,7 @@
__ push(rax);
__ get_thread(rcx);
- __ reset_last_Java_frame(rcx, false, false);
+ __ reset_last_Java_frame(rcx, false);
// Collect return values
__ movptr(rax,Address(rsp, (RegisterSaver::raxOffset() + additional_words + 1)*wordSize));
@@ -2806,7 +2806,7 @@
__ get_thread(rcx);
- __ reset_last_Java_frame(rcx, false, false);
+ __ reset_last_Java_frame(rcx, false);
// Load UnrollBlock into EDI
__ movptr(rdi, rax);
@@ -2912,7 +2912,7 @@
oop_maps->add_gc_map( __ pc()-start, new OopMap( framesize, 0 ) );
__ get_thread(rdi);
- __ reset_last_Java_frame(rdi, true, false);
+ __ reset_last_Java_frame(rdi, true);
// Pop self-frame.
__ leave(); // Epilog!
@@ -3007,7 +3007,7 @@
// Clear last_Java_sp again
__ get_thread(java_thread);
- __ reset_last_Java_frame(java_thread, false, false);
+ __ reset_last_Java_frame(java_thread, false);
__ cmpptr(Address(java_thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
__ jcc(Assembler::equal, noException);
@@ -3082,7 +3082,7 @@
__ addptr(rsp, wordSize);
// clear last_Java_sp
- __ reset_last_Java_frame(thread, true, false);
+ __ reset_last_Java_frame(thread, true);
// check for pending exceptions
Label pending;
__ cmpptr(Address(thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
--- a/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/sharedRuntime_x86_64.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1461,7 +1461,7 @@
__ mov(rsp, r12); // restore sp
__ reinit_heapbase();
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
save_or_restore_arguments(masm, stack_slots, total_in_args,
arg_save_area, NULL, in_regs, in_sig_bt);
@@ -2577,7 +2577,7 @@
restore_native_result(masm, ret_type, stack_slots);
}
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
// Unpack oop result
if (ret_type == T_OBJECT || ret_type == T_ARRAY) {
@@ -2849,7 +2849,7 @@
__ call(RuntimeAddress(CAST_FROM_FN_PTR(address, Deoptimization::uncommon_trap)));
oop_maps->add_gc_map( __ pc()-start, map->deep_copy());
- __ reset_last_Java_frame(false, false);
+ __ reset_last_Java_frame(false);
__ jmp(after_fetch_unroll_info_call);
} // EnableJVMCI
@@ -2939,7 +2939,7 @@
// find any register it might need.
oop_maps->add_gc_map(__ pc() - start, map);
- __ reset_last_Java_frame(false, false);
+ __ reset_last_Java_frame(false);
#if INCLUDE_JVMCI
if (EnableJVMCI) {
@@ -3087,7 +3087,7 @@
new OopMap( frame_size_in_words, 0 ));
// Clear fp AND pc
- __ reset_last_Java_frame(true, true);
+ __ reset_last_Java_frame(true);
// Collect return values
__ movdbl(xmm0, Address(rsp, RegisterSaver::xmm0_offset_in_bytes()));
@@ -3164,7 +3164,7 @@
oop_maps->add_gc_map(__ pc() - start, map);
- __ reset_last_Java_frame(false, false);
+ __ reset_last_Java_frame(false);
// Load UnrollBlock* into rdi
__ mov(rdi, rax);
@@ -3281,7 +3281,7 @@
oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
// Clear fp AND pc
- __ reset_last_Java_frame(true, true);
+ __ reset_last_Java_frame(true);
// Pop self-frame.
__ leave(); // Epilog
@@ -3364,7 +3364,7 @@
Label noException;
- __ reset_last_Java_frame(false, false);
+ __ reset_last_Java_frame(false);
__ cmpptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
__ jcc(Assembler::equal, noException);
@@ -3434,7 +3434,7 @@
// rax contains the address we are going to jump to assuming no exception got installed
// clear last_Java_sp
- __ reset_last_Java_frame(false, false);
+ __ reset_last_Java_frame(false);
// check for pending exceptions
Label pending;
__ cmpptr(Address(r15_thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
@@ -3809,7 +3809,7 @@
oop_maps->add_gc_map(the_pc - start, new OopMap(SimpleRuntimeFrame::framesize, 0));
- __ reset_last_Java_frame(false, true);
+ __ reset_last_Java_frame(false);
// Restore callee-saved registers
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -3766,7 +3766,7 @@
// however can use the register value directly if it is callee saved.
__ get_thread(java_thread);
- __ reset_last_Java_frame(java_thread, true, false);
+ __ reset_last_Java_frame(java_thread, true);
__ leave(); // required for proper stackwalking of RuntimeStub frame
--- a/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -5018,7 +5018,7 @@
oop_maps->add_gc_map(the_pc - start, map);
- __ reset_last_Java_frame(true, true);
+ __ reset_last_Java_frame(true);
__ leave(); // required for proper stackwalking of RuntimeStub frame
--- a/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/templateInterpreterGenerator_x86.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1167,7 +1167,7 @@
__ movl(Address(thread, JavaThread::thread_state_offset()), _thread_in_Java);
// reset_last_Java_frame
- __ reset_last_Java_frame(thread, true, true);
+ __ reset_last_Java_frame(thread, true);
// reset handle block
__ movptr(t, Address(thread, JavaThread::active_handles_offset()));
@@ -1659,7 +1659,7 @@
__ set_last_Java_frame(noreg, rbp, __ pc());
__ super_call_VM_leaf(CAST_FROM_FN_PTR(address, InterpreterRuntime::popframe_move_outgoing_args), r15_thread, c_rarg1, c_rarg2);
#endif
- __ reset_last_Java_frame(thread, true, true);
+ __ reset_last_Java_frame(thread, true);
// Restore the last_sp and null it out
__ movptr(rsp, Address(rbp, frame::interpreter_frame_last_sp_offset * wordSize));
--- a/hotspot/src/cpu/x86/vm/templateTable_x86.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/templateTable_x86.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -858,26 +858,23 @@
// get next byte
__ load_unsigned_byte(rbx, at_bcp(Bytecodes::length_for(Bytecodes::_aload_0)));
- // do actual aload_0
- aload(0);
-
// if _getfield then wait with rewrite
__ cmpl(rbx, Bytecodes::_getfield);
__ jcc(Assembler::equal, done);
- // if _igetfield then reqrite to _fast_iaccess_0
+ // if _igetfield then rewrite to _fast_iaccess_0
assert(Bytecodes::java_code(Bytecodes::_fast_iaccess_0) == Bytecodes::_aload_0, "fix bytecode definition");
__ cmpl(rbx, Bytecodes::_fast_igetfield);
__ movl(bc, Bytecodes::_fast_iaccess_0);
__ jccb(Assembler::equal, rewrite);
- // if _agetfield then reqrite to _fast_aaccess_0
+ // if _agetfield then rewrite to _fast_aaccess_0
assert(Bytecodes::java_code(Bytecodes::_fast_aaccess_0) == Bytecodes::_aload_0, "fix bytecode definition");
__ cmpl(rbx, Bytecodes::_fast_agetfield);
__ movl(bc, Bytecodes::_fast_aaccess_0);
__ jccb(Assembler::equal, rewrite);
- // if _fgetfield then reqrite to _fast_faccess_0
+ // if _fgetfield then rewrite to _fast_faccess_0
assert(Bytecodes::java_code(Bytecodes::_fast_faccess_0) == Bytecodes::_aload_0, "fix bytecode definition");
__ cmpl(rbx, Bytecodes::_fast_fgetfield);
__ movl(bc, Bytecodes::_fast_faccess_0);
@@ -893,9 +890,10 @@
patch_bytecode(Bytecodes::_aload_0, bc, rbx, false);
__ bind(done);
- } else {
- aload(0);
}
+
+ // Do actual aload_0 (must do this after patch_bytecode which might call VM and GC might change oop).
+ aload(0);
}
void TemplateTable::istore() {
--- a/hotspot/src/cpu/x86/vm/x86_64.ad Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/x86/vm/x86_64.ad Mon Sep 12 22:04:48 2016 +0000
@@ -986,7 +986,7 @@
emit_opcode(cbuf, 0x58 | RBP_enc);
if (StackReservedPages > 0 && C->has_reserved_stack_access()) {
- __ reserved_stack_check();
+ __ reserved_stack_check();
}
if (do_polling() && C->is_method_compilation()) {
@@ -7355,7 +7355,7 @@
"movzbl $res, $res" %}
opcode(0x0F, 0xB0);
ins_encode(lock_prefix,
- REX_reg_mem(newval, mem_ptr),
+ REX_breg_mem(newval, mem_ptr),
OpcP, OpcS,
reg_mem(newval, mem_ptr),
REX_breg(res), Opcode(0x0F), Opcode(0x94), reg(res), // sete
@@ -7380,7 +7380,7 @@
opcode(0x0F, 0xB1);
ins_encode(lock_prefix,
SizePrefix,
- REX_reg_mem(newval, mem_ptr),
+ REX_reg_mem(newval, mem_ptr),
OpcP, OpcS,
reg_mem(newval, mem_ptr),
REX_breg(res), Opcode(0x0F), Opcode(0x94), reg(res), // sete
@@ -7424,7 +7424,7 @@
"If rax == $mem_ptr then store $newval into $mem_ptr\n\t" %}
opcode(0x0F, 0xB0);
ins_encode(lock_prefix,
- REX_reg_mem(newval, mem_ptr),
+ REX_breg_mem(newval, mem_ptr),
OpcP, OpcS,
reg_mem(newval, mem_ptr) // lock cmpxchg
);
--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -37,7 +37,7 @@
#include "prims/jvmtiExport.hpp"
#include "prims/jvmtiThreadState.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/interfaceSupport.hpp"
--- a/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/code/CodeBlob.java Mon Sep 12 22:04:48 2016 +0000
@@ -32,6 +32,7 @@
import sun.jvm.hotspot.types.Type;
import sun.jvm.hotspot.types.TypeDataBase;
import sun.jvm.hotspot.utilities.Assert;
+import sun.jvm.hotspot.utilities.CStringUtilities;
import java.io.PrintStream;
import java.util.Observable;
@@ -115,7 +116,7 @@
}
public String getName() {
- return getName();
+ return CStringUtilities.getString(nameField.getValue(addr));
}
/** OopMap for frame; can return null if none available */
--- a/hotspot/src/os/aix/vm/attachListener_aix.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os/aix/vm/attachListener_aix.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -494,7 +494,7 @@
if (ret == 0) {
ret = ::unlink(fn);
if (ret == -1) {
- debug_only(warning("failed to remove stale attach pid file at %s", fn));
+ log_debug(attach)("Failed to remove stale attach pid file at %s", fn);
}
}
}
@@ -537,16 +537,23 @@
struct stat64 st;
RESTARTABLE(::stat64(fn, &st), ret);
if (ret == -1) {
+ log_trace(attach)("Failed to find attach file: %s, trying alternate", fn);
snprintf(fn, sizeof(fn), "%s/.attach_pid%d",
os::get_temp_directory(), os::current_process_id());
RESTARTABLE(::stat64(fn, &st), ret);
+ if (ret == -1) {
+ log_debug(attach)("Failed to find attach file: %s", fn);
+ }
}
if (ret == 0) {
// simple check to avoid starting the attach mechanism when
// a bogus user creates the file
if (st.st_uid == geteuid()) {
init();
+ log_trace(attach)("Attach trigerred by %s", fn);
return true;
+ } else {
+ log_debug(attach)("File %s has wrong user id %d (vs %d). Attach is not triggered", fn, st.st_uid, geteuid());
}
}
return false;
--- a/hotspot/src/os/aix/vm/os_aix.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os/aix/vm/os_aix.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -52,7 +52,7 @@
#include "prims/jvm.h"
#include "prims/jvm_misc.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/extendedPC.hpp"
#include "runtime/globals.hpp"
#include "runtime/interfaceSupport.hpp"
@@ -3800,10 +3800,6 @@
return ::stat(pathbuf, sbuf);
}
-bool os::check_heap(bool force) {
- return true;
-}
-
// Is a (classpath) directory empty?
bool os::dir_is_empty(const char* path) {
DIR *dir = NULL;
--- a/hotspot/src/os/bsd/vm/attachListener_bsd.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os/bsd/vm/attachListener_bsd.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -456,7 +456,7 @@
if (ret == 0) {
ret = ::unlink(fn);
if (ret == -1) {
- debug_only(warning("failed to remove stale attach pid file at %s", fn));
+ log_debug(attach)("Failed to remove stale attach pid file at %s", fn);
}
}
}
@@ -493,19 +493,25 @@
if (init_at_startup() || is_initialized()) {
return false; // initialized at startup or already initialized
}
- char path[PATH_MAX + 1];
+ char fn[PATH_MAX + 1];
int ret;
struct stat st;
- snprintf(path, PATH_MAX + 1, "%s/.attach_pid%d",
+ snprintf(fn, PATH_MAX + 1, "%s/.attach_pid%d",
os::get_temp_directory(), os::current_process_id());
- RESTARTABLE(::stat(path, &st), ret);
+ RESTARTABLE(::stat(fn, &st), ret);
+ if (ret == -1) {
+ log_debug(attach)("Failed to find attach file: %s", fn);
+ }
if (ret == 0) {
// simple check to avoid starting the attach mechanism when
// a bogus user creates the file
if (st.st_uid == geteuid()) {
init();
+ log_trace(attach)("Attach trigerred by %s", fn);
return true;
+ } else {
+ log_debug(attach)("File %s has wrong user id %d (vs %d). Attach is not triggered", fn, st.st_uid, geteuid());
}
}
return false;
--- a/hotspot/src/os/bsd/vm/os_bsd.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os/bsd/vm/os_bsd.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -42,7 +42,7 @@
#include "prims/jvm.h"
#include "prims/jvm_misc.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/extendedPC.hpp"
#include "runtime/globals.hpp"
#include "runtime/interfaceSupport.hpp"
@@ -3780,11 +3780,6 @@
return diff;
}
-
-bool os::check_heap(bool force) {
- return true;
-}
-
// Is a (classpath) directory empty?
bool os::dir_is_empty(const char* path) {
DIR *dir = NULL;
--- a/hotspot/src/os/linux/vm/attachListener_linux.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os/linux/vm/attachListener_linux.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -453,7 +453,7 @@
if (ret == 0) {
ret = ::unlink(fn);
if (ret == -1) {
- debug_only(warning("failed to remove stale attach pid file at %s", fn));
+ log_debug(attach)("Failed to remove stale attach pid file at %s", fn);
}
}
}
@@ -496,16 +496,23 @@
struct stat64 st;
RESTARTABLE(::stat64(fn, &st), ret);
if (ret == -1) {
+ log_trace(attach)("Failed to find attach file: %s, trying alternate", fn);
snprintf(fn, sizeof(fn), "%s/.attach_pid%d",
os::get_temp_directory(), os::current_process_id());
RESTARTABLE(::stat64(fn, &st), ret);
+ if (ret == -1) {
+ log_debug(attach)("Failed to find attach file: %s", fn);
+ }
}
if (ret == 0) {
// simple check to avoid starting the attach mechanism when
// a bogus user creates the file
if (st.st_uid == geteuid()) {
init();
+ log_trace(attach)("Attach trigerred by %s", fn);
return true;
+ } else {
+ log_debug(attach)("File %s has wrong user id %d (vs %d). Attach is not trigerred", fn, st.st_uid, geteuid());
}
}
return false;
--- a/hotspot/src/os/linux/vm/os_linux.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os/linux/vm/os_linux.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -42,7 +42,7 @@
#include "prims/jvm.h"
#include "prims/jvm_misc.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/extendedPC.hpp"
#include "runtime/globals.hpp"
#include "runtime/interfaceSupport.hpp"
@@ -5174,10 +5174,6 @@
return ::stat(pathbuf, sbuf);
}
-bool os::check_heap(bool force) {
- return true;
-}
-
// Is a (classpath) directory empty?
bool os::dir_is_empty(const char* path) {
DIR *dir = NULL;
--- a/hotspot/src/os/solaris/vm/attachListener_solaris.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os/solaris/vm/attachListener_solaris.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -394,7 +394,7 @@
snprintf(initial_path, sizeof(initial_path), "%s.tmp", door_path);
RESTARTABLE(::creat(initial_path, S_IRUSR | S_IWUSR), fd);
if (fd == -1) {
- debug_only(warning("attempt to create %s failed", initial_path));
+ log_debug(attach)("attempt to create door file %s failed (%d)", initial_path, errno);
::door_revoke(dd);
return -1;
}
@@ -409,6 +409,7 @@
res = ::fattach(dd, initial_path);
}
if (res == -1) {
+ log_debug(attach)("unable to create door - fattach failed (%d)", errno);
::door_revoke(dd);
dd = -1;
}
@@ -419,12 +420,14 @@
if (::rename(initial_path, door_path) == -1) {
::close(dd);
::fdetach(initial_path);
+ log_debug(attach)("unable to create door - rename %s to %s failed (%d)", errno);
dd = -1;
}
}
if (dd >= 0) {
set_door_descriptor(dd);
set_door_path(door_path);
+ log_trace(attach)("door file %s created succesfully", door_path);
} else {
// unable to create door, attach it to file, or rename file into place
::unlink(initial_path);
@@ -602,7 +605,7 @@
if (ret == 0) {
ret = ::unlink(fn);
if (ret == -1) {
- debug_only(warning("failed to remove stale attach pid file at %s", fn));
+ log_debug(attach)("Failed to remove stale attach pid file at %s", fn);
}
}
}
@@ -645,9 +648,13 @@
struct stat64 st;
RESTARTABLE(::stat64(fn, &st), ret);
if (ret == -1) {
+ log_trace(attach)("Failed to find attach file: %s, trying alternate", fn);
snprintf(fn, sizeof(fn), "%s/.attach_pid%d",
os::get_temp_directory(), os::current_process_id());
RESTARTABLE(::stat64(fn, &st), ret);
+ if (ret == -1) {
+ log_debug(attach)("Failed to find attach file: %s", fn);
+ }
}
if (ret == 0) {
// simple check to avoid starting the attach mechanism when
--- a/hotspot/src/os/solaris/vm/os_solaris.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os/solaris/vm/os_solaris.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -42,7 +42,7 @@
#include "prims/jvm.h"
#include "prims/jvm_misc.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/extendedPC.hpp"
#include "runtime/globals.hpp"
#include "runtime/interfaceSupport.hpp"
@@ -4589,10 +4589,6 @@
}
}
-// OS interface.
-
-bool os::check_heap(bool force) { return true; }
-
// Is a (classpath) directory empty?
bool os::dir_is_empty(const char* path) {
DIR *dir = NULL;
--- a/hotspot/src/os/windows/vm/os_windows.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -45,7 +45,7 @@
#include "prims/jvm.h"
#include "prims/jvm_misc.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/extendedPC.hpp"
#include "runtime/globals.hpp"
#include "runtime/interfaceSupport.hpp"
@@ -5258,75 +5258,6 @@
}
}
-//--------------------------------------------------------------------------------------------------
-// Non-product code
-
-static int mallocDebugIntervalCounter = 0;
-static int mallocDebugCounter = 0;
-
-// For debugging possible bugs inside HeapWalk (a ring buffer)
-#define SAVE_COUNT 8
-static PROCESS_HEAP_ENTRY saved_heap_entries[SAVE_COUNT];
-static int saved_heap_entry_index;
-
-bool os::check_heap(bool force) {
- if (++mallocDebugCounter < MallocVerifyStart && !force) return true;
- if (++mallocDebugIntervalCounter >= MallocVerifyInterval || force) {
- // Note: HeapValidate executes two hardware breakpoints when it finds something
- // wrong; at these points, eax contains the address of the offending block (I think).
- // To get to the exlicit error message(s) below, just continue twice.
- //
- // Note: we want to check the CRT heap, which is not necessarily located in the
- // process default heap.
- HANDLE heap = (HANDLE) _get_heap_handle();
- if (!heap) {
- return true;
- }
-
- // If we fail to lock the heap, then gflags.exe has been used
- // or some other special heap flag has been set that prevents
- // locking. We don't try to walk a heap we can't lock.
- if (HeapLock(heap) != 0) {
- PROCESS_HEAP_ENTRY phe;
- phe.lpData = NULL;
- memset(saved_heap_entries, 0, sizeof(saved_heap_entries));
- saved_heap_entry_index = 0;
- int count = 0;
-
- while (HeapWalk(heap, &phe) != 0) {
- count ++;
- if ((phe.wFlags & PROCESS_HEAP_ENTRY_BUSY) &&
- !HeapValidate(heap, 0, phe.lpData)) {
- tty->print_cr("C heap has been corrupted (time: %d allocations)", mallocDebugCounter);
- tty->print_cr("corrupted block near address %#x, length %d, count %d", phe.lpData, phe.cbData, count);
- HeapUnlock(heap);
- fatal("corrupted C heap");
- } else {
- // Save previous seen entries in a ring buffer. We have seen strange
- // heap corruption fatal errors that produced mdmp files, but when we load
- // these mdmp files in WinDBG, "!heap -triage" shows no error.
- // We can examine the saved_heap_entries[] array in the mdmp file to
- // diagnose such seemingly spurious errors reported by HeapWalk.
- saved_heap_entries[saved_heap_entry_index++] = phe;
- if (saved_heap_entry_index >= SAVE_COUNT) {
- saved_heap_entry_index = 0;
- }
- }
- }
- DWORD err = GetLastError();
- if (err != ERROR_NO_MORE_ITEMS && err != ERROR_CALL_NOT_IMPLEMENTED &&
- (err == ERROR_INVALID_FUNCTION && phe.lpData != NULL)) {
- HeapUnlock(heap);
- fatal("heap walk aborted with error %d", err);
- }
- HeapUnlock(heap);
- }
- mallocDebugIntervalCounter = 0;
- }
- return true;
-}
-
-
bool os::find(address addr, outputStream* st) {
int offset = -1;
bool result = false;
--- a/hotspot/src/os/windows/vm/threadCritical_windows.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os/windows/vm/threadCritical_windows.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, 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 @@
*/
#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/thread.inline.hpp"
#include "runtime/threadCritical.hpp"
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP
+#define OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP
+
+#ifndef _LP64
+#error "Atomic currently only impleneted for PPC64"
+#endif
+
+// Implementation of class atomic
+
+inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
+inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
+
+inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
+inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
+
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
+//
+// machine barrier instructions:
+//
+// - ppc_sync two-way memory barrier, aka fence
+// - ppc_lwsync orders Store|Store,
+// Load|Store,
+// Load|Load,
+// but not Store|Load
+// - ppc_eieio orders memory accesses for device memory (only)
+// - ppc_isync invalidates speculatively executed instructions
+// From the POWER ISA 2.06 documentation:
+// "[...] an isync instruction prevents the execution of
+// instructions following the isync until instructions
+// preceding the isync have completed, [...]"
+// From IBM's AIX assembler reference:
+// "The isync [...] instructions causes the processor to
+// refetch any instructions that might have been fetched
+// prior to the isync instruction. The instruction isync
+// causes the processor to wait for all previous instructions
+// to complete. Then any instructions already fetched are
+// discarded and instruction processing continues in the
+// environment established by the previous instructions."
+//
+// semantic barrier instructions:
+// (as defined in orderAccess.hpp)
+//
+// - ppc_release orders Store|Store, (maps to ppc_lwsync)
+// Load|Store
+// - ppc_acquire orders Load|Store, (maps to ppc_lwsync)
+// Load|Load
+// - ppc_fence orders Store|Store, (maps to ppc_sync)
+// Load|Store,
+// Load|Load,
+// Store|Load
+//
+
+#define strasm_sync "\n sync \n"
+#define strasm_lwsync "\n lwsync \n"
+#define strasm_isync "\n isync \n"
+#define strasm_release strasm_lwsync
+#define strasm_acquire strasm_lwsync
+#define strasm_fence strasm_sync
+#define strasm_nobarrier ""
+#define strasm_nobarrier_clobber_memory ""
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+
+ unsigned int result;
+
+ __asm__ __volatile__ (
+ strasm_lwsync
+ "1: lwarx %0, 0, %2 \n"
+ " add %0, %0, %1 \n"
+ " stwcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_isync
+ : /*%0*/"=&r" (result)
+ : /*%1*/"r" (add_value), /*%2*/"r" (dest)
+ : "cc", "memory" );
+
+ return (jint) result;
+}
+
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+
+ long result;
+
+ __asm__ __volatile__ (
+ strasm_lwsync
+ "1: ldarx %0, 0, %2 \n"
+ " add %0, %0, %1 \n"
+ " stdcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_isync
+ : /*%0*/"=&r" (result)
+ : /*%1*/"r" (add_value), /*%2*/"r" (dest)
+ : "cc", "memory" );
+
+ return (intptr_t) result;
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)add_ptr(add_value, (volatile intptr_t*)dest);
+}
+
+
+inline void Atomic::inc (volatile jint* dest) {
+
+ unsigned int temp;
+
+ __asm__ __volatile__ (
+ strasm_nobarrier
+ "1: lwarx %0, 0, %2 \n"
+ " addic %0, %0, 1 \n"
+ " stwcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_nobarrier
+ : /*%0*/"=&r" (temp), "=m" (*dest)
+ : /*%2*/"r" (dest), "m" (*dest)
+ : "cc" strasm_nobarrier_clobber_memory);
+
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+
+ long temp;
+
+ __asm__ __volatile__ (
+ strasm_nobarrier
+ "1: ldarx %0, 0, %2 \n"
+ " addic %0, %0, 1 \n"
+ " stdcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_nobarrier
+ : /*%0*/"=&r" (temp), "=m" (*dest)
+ : /*%2*/"r" (dest), "m" (*dest)
+ : "cc" strasm_nobarrier_clobber_memory);
+
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+ inc_ptr((volatile intptr_t*)dest);
+}
+
+
+inline void Atomic::dec (volatile jint* dest) {
+
+ unsigned int temp;
+
+ __asm__ __volatile__ (
+ strasm_nobarrier
+ "1: lwarx %0, 0, %2 \n"
+ " addic %0, %0, -1 \n"
+ " stwcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_nobarrier
+ : /*%0*/"=&r" (temp), "=m" (*dest)
+ : /*%2*/"r" (dest), "m" (*dest)
+ : "cc" strasm_nobarrier_clobber_memory);
+
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+
+ long temp;
+
+ __asm__ __volatile__ (
+ strasm_nobarrier
+ "1: ldarx %0, 0, %2 \n"
+ " addic %0, %0, -1 \n"
+ " stdcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_nobarrier
+ : /*%0*/"=&r" (temp), "=m" (*dest)
+ : /*%2*/"r" (dest), "m" (*dest)
+ : "cc" strasm_nobarrier_clobber_memory);
+
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+ dec_ptr((volatile intptr_t*)dest);
+}
+
+inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
+
+ // Note that xchg_ptr doesn't necessarily do an acquire
+ // (see synchronizer.cpp).
+
+ unsigned int old_value;
+ const uint64_t zero = 0;
+
+ __asm__ __volatile__ (
+ /* lwsync */
+ strasm_lwsync
+ /* atomic loop */
+ "1: \n"
+ " lwarx %[old_value], %[dest], %[zero] \n"
+ " stwcx. %[exchange_value], %[dest], %[zero] \n"
+ " bne- 1b \n"
+ /* isync */
+ strasm_sync
+ /* exit */
+ "2: \n"
+ /* out */
+ : [old_value] "=&r" (old_value),
+ "=m" (*dest)
+ /* in */
+ : [dest] "b" (dest),
+ [zero] "r" (zero),
+ [exchange_value] "r" (exchange_value),
+ "m" (*dest)
+ /* clobber */
+ : "cc",
+ "memory"
+ );
+
+ return (jint) old_value;
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+
+ // Note that xchg_ptr doesn't necessarily do an acquire
+ // (see synchronizer.cpp).
+
+ long old_value;
+ const uint64_t zero = 0;
+
+ __asm__ __volatile__ (
+ /* lwsync */
+ strasm_lwsync
+ /* atomic loop */
+ "1: \n"
+ " ldarx %[old_value], %[dest], %[zero] \n"
+ " stdcx. %[exchange_value], %[dest], %[zero] \n"
+ " bne- 1b \n"
+ /* isync */
+ strasm_sync
+ /* exit */
+ "2: \n"
+ /* out */
+ : [old_value] "=&r" (old_value),
+ "=m" (*dest)
+ /* in */
+ : [dest] "b" (dest),
+ [zero] "r" (zero),
+ [exchange_value] "r" (exchange_value),
+ "m" (*dest)
+ /* clobber */
+ : "cc",
+ "memory"
+ );
+
+ return (intptr_t) old_value;
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
+}
+
+inline void cmpxchg_pre_membar(cmpxchg_memory_order order) {
+ if (order != memory_order_relaxed) {
+ __asm__ __volatile__ (
+ /* fence */
+ strasm_sync
+ );
+ }
+}
+
+inline void cmpxchg_post_membar(cmpxchg_memory_order order) {
+ if (order != memory_order_relaxed) {
+ __asm__ __volatile__ (
+ /* fence */
+ strasm_sync
+ );
+ }
+}
+
+#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
+
+ // Note that cmpxchg guarantees a two-way memory barrier across
+ // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+ // specified otherwise (see atomic.hpp).
+
+ // Using 32 bit internally.
+ volatile int *dest_base = (volatile int*)((uintptr_t)dest & ~3);
+
+#ifdef VM_LITTLE_ENDIAN
+ const unsigned int shift_amount = ((uintptr_t)dest & 3) * 8;
+#else
+ const unsigned int shift_amount = ((~(uintptr_t)dest) & 3) * 8;
+#endif
+ const unsigned int masked_compare_val = ((unsigned int)(unsigned char)compare_value),
+ masked_exchange_val = ((unsigned int)(unsigned char)exchange_value),
+ xor_value = (masked_compare_val ^ masked_exchange_val) << shift_amount;
+
+ unsigned int old_value, value32;
+
+ cmpxchg_pre_membar(order);
+
+ __asm__ __volatile__ (
+ /* simple guard */
+ " lbz %[old_value], 0(%[dest]) \n"
+ " cmpw %[masked_compare_val], %[old_value] \n"
+ " bne- 2f \n"
+ /* atomic loop */
+ "1: \n"
+ " lwarx %[value32], 0, %[dest_base] \n"
+ /* extract byte and compare */
+ " srd %[old_value], %[value32], %[shift_amount] \n"
+ " clrldi %[old_value], %[old_value], 56 \n"
+ " cmpw %[masked_compare_val], %[old_value] \n"
+ " bne- 2f \n"
+ /* replace byte and try to store */
+ " xor %[value32], %[xor_value], %[value32] \n"
+ " stwcx. %[value32], 0, %[dest_base] \n"
+ " bne- 1b \n"
+ /* exit */
+ "2: \n"
+ /* out */
+ : [old_value] "=&r" (old_value),
+ [value32] "=&r" (value32),
+ "=m" (*dest),
+ "=m" (*dest_base)
+ /* in */
+ : [dest] "b" (dest),
+ [dest_base] "b" (dest_base),
+ [shift_amount] "r" (shift_amount),
+ [masked_compare_val] "r" (masked_compare_val),
+ [xor_value] "r" (xor_value),
+ "m" (*dest),
+ "m" (*dest_base)
+ /* clobber */
+ : "cc",
+ "memory"
+ );
+
+ cmpxchg_post_membar(order);
+
+ return (jbyte)(unsigned char)old_value;
+}
+
+inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
+
+ // Note that cmpxchg guarantees a two-way memory barrier across
+ // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+ // specified otherwise (see atomic.hpp).
+
+ unsigned int old_value;
+ const uint64_t zero = 0;
+
+ cmpxchg_pre_membar(order);
+
+ __asm__ __volatile__ (
+ /* simple guard */
+ " lwz %[old_value], 0(%[dest]) \n"
+ " cmpw %[compare_value], %[old_value] \n"
+ " bne- 2f \n"
+ /* atomic loop */
+ "1: \n"
+ " lwarx %[old_value], %[dest], %[zero] \n"
+ " cmpw %[compare_value], %[old_value] \n"
+ " bne- 2f \n"
+ " stwcx. %[exchange_value], %[dest], %[zero] \n"
+ " bne- 1b \n"
+ /* exit */
+ "2: \n"
+ /* out */
+ : [old_value] "=&r" (old_value),
+ "=m" (*dest)
+ /* in */
+ : [dest] "b" (dest),
+ [zero] "r" (zero),
+ [compare_value] "r" (compare_value),
+ [exchange_value] "r" (exchange_value),
+ "m" (*dest)
+ /* clobber */
+ : "cc",
+ "memory"
+ );
+
+ cmpxchg_post_membar(order);
+
+ return (jint) old_value;
+}
+
+inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+
+ // Note that cmpxchg guarantees a two-way memory barrier across
+ // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+ // specified otherwise (see atomic.hpp).
+
+ long old_value;
+ const uint64_t zero = 0;
+
+ cmpxchg_pre_membar(order);
+
+ __asm__ __volatile__ (
+ /* simple guard */
+ " ld %[old_value], 0(%[dest]) \n"
+ " cmpd %[compare_value], %[old_value] \n"
+ " bne- 2f \n"
+ /* atomic loop */
+ "1: \n"
+ " ldarx %[old_value], %[dest], %[zero] \n"
+ " cmpd %[compare_value], %[old_value] \n"
+ " bne- 2f \n"
+ " stdcx. %[exchange_value], %[dest], %[zero] \n"
+ " bne- 1b \n"
+ /* exit */
+ "2: \n"
+ /* out */
+ : [old_value] "=&r" (old_value),
+ "=m" (*dest)
+ /* in */
+ : [dest] "b" (dest),
+ [zero] "r" (zero),
+ [compare_value] "r" (compare_value),
+ [exchange_value] "r" (exchange_value),
+ "m" (*dest)
+ /* clobber */
+ : "cc",
+ "memory"
+ );
+
+ cmpxchg_post_membar(order);
+
+ return (jlong) old_value;
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
+}
+
+#undef strasm_sync
+#undef strasm_lwsync
+#undef strasm_isync
+#undef strasm_release
+#undef strasm_acquire
+#undef strasm_fence
+#undef strasm_nobarrier
+#undef strasm_nobarrier_clobber_memory
+
+#endif // OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_HPP
--- a/hotspot/src/os_cpu/aix_ppc/vm/atomic_aix_ppc.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,482 +0,0 @@
-/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_INLINE_HPP
-#define OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-
-#ifndef _LP64
-#error "Atomic currently only impleneted for PPC64"
-#endif
-
-// Implementation of class atomic
-
-inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
-inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
-
-inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
-inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
-
-inline jlong Atomic::load(volatile jlong* src) { return *src; }
-
-//
-// machine barrier instructions:
-//
-// - ppc_sync two-way memory barrier, aka fence
-// - ppc_lwsync orders Store|Store,
-// Load|Store,
-// Load|Load,
-// but not Store|Load
-// - ppc_eieio orders memory accesses for device memory (only)
-// - ppc_isync invalidates speculatively executed instructions
-// From the POWER ISA 2.06 documentation:
-// "[...] an isync instruction prevents the execution of
-// instructions following the isync until instructions
-// preceding the isync have completed, [...]"
-// From IBM's AIX assembler reference:
-// "The isync [...] instructions causes the processor to
-// refetch any instructions that might have been fetched
-// prior to the isync instruction. The instruction isync
-// causes the processor to wait for all previous instructions
-// to complete. Then any instructions already fetched are
-// discarded and instruction processing continues in the
-// environment established by the previous instructions."
-//
-// semantic barrier instructions:
-// (as defined in orderAccess.hpp)
-//
-// - ppc_release orders Store|Store, (maps to ppc_lwsync)
-// Load|Store
-// - ppc_acquire orders Load|Store, (maps to ppc_lwsync)
-// Load|Load
-// - ppc_fence orders Store|Store, (maps to ppc_sync)
-// Load|Store,
-// Load|Load,
-// Store|Load
-//
-
-#define strasm_sync "\n sync \n"
-#define strasm_lwsync "\n lwsync \n"
-#define strasm_isync "\n isync \n"
-#define strasm_release strasm_lwsync
-#define strasm_acquire strasm_lwsync
-#define strasm_fence strasm_sync
-#define strasm_nobarrier ""
-#define strasm_nobarrier_clobber_memory ""
-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
-
- unsigned int result;
-
- __asm__ __volatile__ (
- strasm_lwsync
- "1: lwarx %0, 0, %2 \n"
- " add %0, %0, %1 \n"
- " stwcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_isync
- : /*%0*/"=&r" (result)
- : /*%1*/"r" (add_value), /*%2*/"r" (dest)
- : "cc", "memory" );
-
- return (jint) result;
-}
-
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
-
- long result;
-
- __asm__ __volatile__ (
- strasm_lwsync
- "1: ldarx %0, 0, %2 \n"
- " add %0, %0, %1 \n"
- " stdcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_isync
- : /*%0*/"=&r" (result)
- : /*%1*/"r" (add_value), /*%2*/"r" (dest)
- : "cc", "memory" );
-
- return (intptr_t) result;
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)add_ptr(add_value, (volatile intptr_t*)dest);
-}
-
-
-inline void Atomic::inc (volatile jint* dest) {
-
- unsigned int temp;
-
- __asm__ __volatile__ (
- strasm_nobarrier
- "1: lwarx %0, 0, %2 \n"
- " addic %0, %0, 1 \n"
- " stwcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_nobarrier
- : /*%0*/"=&r" (temp), "=m" (*dest)
- : /*%2*/"r" (dest), "m" (*dest)
- : "cc" strasm_nobarrier_clobber_memory);
-
-}
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest) {
-
- long temp;
-
- __asm__ __volatile__ (
- strasm_nobarrier
- "1: ldarx %0, 0, %2 \n"
- " addic %0, %0, 1 \n"
- " stdcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_nobarrier
- : /*%0*/"=&r" (temp), "=m" (*dest)
- : /*%2*/"r" (dest), "m" (*dest)
- : "cc" strasm_nobarrier_clobber_memory);
-
-}
-
-inline void Atomic::inc_ptr(volatile void* dest) {
- inc_ptr((volatile intptr_t*)dest);
-}
-
-
-inline void Atomic::dec (volatile jint* dest) {
-
- unsigned int temp;
-
- __asm__ __volatile__ (
- strasm_nobarrier
- "1: lwarx %0, 0, %2 \n"
- " addic %0, %0, -1 \n"
- " stwcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_nobarrier
- : /*%0*/"=&r" (temp), "=m" (*dest)
- : /*%2*/"r" (dest), "m" (*dest)
- : "cc" strasm_nobarrier_clobber_memory);
-
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest) {
-
- long temp;
-
- __asm__ __volatile__ (
- strasm_nobarrier
- "1: ldarx %0, 0, %2 \n"
- " addic %0, %0, -1 \n"
- " stdcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_nobarrier
- : /*%0*/"=&r" (temp), "=m" (*dest)
- : /*%2*/"r" (dest), "m" (*dest)
- : "cc" strasm_nobarrier_clobber_memory);
-
-}
-
-inline void Atomic::dec_ptr(volatile void* dest) {
- dec_ptr((volatile intptr_t*)dest);
-}
-
-inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
-
- // Note that xchg_ptr doesn't necessarily do an acquire
- // (see synchronizer.cpp).
-
- unsigned int old_value;
- const uint64_t zero = 0;
-
- __asm__ __volatile__ (
- /* lwsync */
- strasm_lwsync
- /* atomic loop */
- "1: \n"
- " lwarx %[old_value], %[dest], %[zero] \n"
- " stwcx. %[exchange_value], %[dest], %[zero] \n"
- " bne- 1b \n"
- /* isync */
- strasm_sync
- /* exit */
- "2: \n"
- /* out */
- : [old_value] "=&r" (old_value),
- "=m" (*dest)
- /* in */
- : [dest] "b" (dest),
- [zero] "r" (zero),
- [exchange_value] "r" (exchange_value),
- "m" (*dest)
- /* clobber */
- : "cc",
- "memory"
- );
-
- return (jint) old_value;
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
-
- // Note that xchg_ptr doesn't necessarily do an acquire
- // (see synchronizer.cpp).
-
- long old_value;
- const uint64_t zero = 0;
-
- __asm__ __volatile__ (
- /* lwsync */
- strasm_lwsync
- /* atomic loop */
- "1: \n"
- " ldarx %[old_value], %[dest], %[zero] \n"
- " stdcx. %[exchange_value], %[dest], %[zero] \n"
- " bne- 1b \n"
- /* isync */
- strasm_sync
- /* exit */
- "2: \n"
- /* out */
- : [old_value] "=&r" (old_value),
- "=m" (*dest)
- /* in */
- : [dest] "b" (dest),
- [zero] "r" (zero),
- [exchange_value] "r" (exchange_value),
- "m" (*dest)
- /* clobber */
- : "cc",
- "memory"
- );
-
- return (intptr_t) old_value;
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
-}
-
-inline void cmpxchg_pre_membar(cmpxchg_memory_order order) {
- if (order != memory_order_relaxed) {
- __asm__ __volatile__ (
- /* fence */
- strasm_sync
- );
- }
-}
-
-inline void cmpxchg_post_membar(cmpxchg_memory_order order) {
- if (order != memory_order_relaxed) {
- __asm__ __volatile__ (
- /* fence */
- strasm_sync
- );
- }
-}
-
-#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
-
- // Note that cmpxchg guarantees a two-way memory barrier across
- // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
- // specified otherwise (see atomic.hpp).
-
- // Using 32 bit internally.
- volatile int *dest_base = (volatile int*)((uintptr_t)dest & ~3);
-
-#ifdef VM_LITTLE_ENDIAN
- const unsigned int shift_amount = ((uintptr_t)dest & 3) * 8;
-#else
- const unsigned int shift_amount = ((~(uintptr_t)dest) & 3) * 8;
-#endif
- const unsigned int masked_compare_val = ((unsigned int)(unsigned char)compare_value),
- masked_exchange_val = ((unsigned int)(unsigned char)exchange_value),
- xor_value = (masked_compare_val ^ masked_exchange_val) << shift_amount;
-
- unsigned int old_value, value32;
-
- cmpxchg_pre_membar(order);
-
- __asm__ __volatile__ (
- /* simple guard */
- " lbz %[old_value], 0(%[dest]) \n"
- " cmpw %[masked_compare_val], %[old_value] \n"
- " bne- 2f \n"
- /* atomic loop */
- "1: \n"
- " lwarx %[value32], 0, %[dest_base] \n"
- /* extract byte and compare */
- " srd %[old_value], %[value32], %[shift_amount] \n"
- " clrldi %[old_value], %[old_value], 56 \n"
- " cmpw %[masked_compare_val], %[old_value] \n"
- " bne- 2f \n"
- /* replace byte and try to store */
- " xor %[value32], %[xor_value], %[value32] \n"
- " stwcx. %[value32], 0, %[dest_base] \n"
- " bne- 1b \n"
- /* exit */
- "2: \n"
- /* out */
- : [old_value] "=&r" (old_value),
- [value32] "=&r" (value32),
- "=m" (*dest),
- "=m" (*dest_base)
- /* in */
- : [dest] "b" (dest),
- [dest_base] "b" (dest_base),
- [shift_amount] "r" (shift_amount),
- [masked_compare_val] "r" (masked_compare_val),
- [xor_value] "r" (xor_value),
- "m" (*dest),
- "m" (*dest_base)
- /* clobber */
- : "cc",
- "memory"
- );
-
- cmpxchg_post_membar(order);
-
- return (jbyte)(unsigned char)old_value;
-}
-
-inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
-
- // Note that cmpxchg guarantees a two-way memory barrier across
- // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
- // specified otherwise (see atomic.hpp).
-
- unsigned int old_value;
- const uint64_t zero = 0;
-
- cmpxchg_pre_membar(order);
-
- __asm__ __volatile__ (
- /* simple guard */
- " lwz %[old_value], 0(%[dest]) \n"
- " cmpw %[compare_value], %[old_value] \n"
- " bne- 2f \n"
- /* atomic loop */
- "1: \n"
- " lwarx %[old_value], %[dest], %[zero] \n"
- " cmpw %[compare_value], %[old_value] \n"
- " bne- 2f \n"
- " stwcx. %[exchange_value], %[dest], %[zero] \n"
- " bne- 1b \n"
- /* exit */
- "2: \n"
- /* out */
- : [old_value] "=&r" (old_value),
- "=m" (*dest)
- /* in */
- : [dest] "b" (dest),
- [zero] "r" (zero),
- [compare_value] "r" (compare_value),
- [exchange_value] "r" (exchange_value),
- "m" (*dest)
- /* clobber */
- : "cc",
- "memory"
- );
-
- cmpxchg_post_membar(order);
-
- return (jint) old_value;
-}
-
-inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
-
- // Note that cmpxchg guarantees a two-way memory barrier across
- // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
- // specified otherwise (see atomic.hpp).
-
- long old_value;
- const uint64_t zero = 0;
-
- cmpxchg_pre_membar(order);
-
- __asm__ __volatile__ (
- /* simple guard */
- " ld %[old_value], 0(%[dest]) \n"
- " cmpd %[compare_value], %[old_value] \n"
- " bne- 2f \n"
- /* atomic loop */
- "1: \n"
- " ldarx %[old_value], %[dest], %[zero] \n"
- " cmpd %[compare_value], %[old_value] \n"
- " bne- 2f \n"
- " stdcx. %[exchange_value], %[dest], %[zero] \n"
- " bne- 1b \n"
- /* exit */
- "2: \n"
- /* out */
- : [old_value] "=&r" (old_value),
- "=m" (*dest)
- /* in */
- : [dest] "b" (dest),
- [zero] "r" (zero),
- [compare_value] "r" (compare_value),
- [exchange_value] "r" (exchange_value),
- "m" (*dest)
- /* clobber */
- : "cc",
- "memory"
- );
-
- cmpxchg_post_membar(order);
-
- return (jlong) old_value;
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
-}
-
-#undef strasm_sync
-#undef strasm_lwsync
-#undef strasm_isync
-#undef strasm_release
-#undef strasm_acquire
-#undef strasm_fence
-#undef strasm_nobarrier
-#undef strasm_nobarrier_clobber_memory
-
-#endif // OS_CPU_AIX_OJDKPPC_VM_ATOMIC_AIX_PPC_INLINE_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 1999, 2016, 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 OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP
+#define OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP
+
+#include "runtime/os.hpp"
+
+// Implementation of class atomic
+
+inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
+
+inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
+
+
+// Adding a lock prefix to an instruction on MP machine
+#define LOCK_IF_MP(mp) "cmp $0, " #mp "; je 1f; lock; 1: "
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+ jint addend = add_value;
+ int mp = os::is_MP();
+ __asm__ volatile ( LOCK_IF_MP(%3) "xaddl %0,(%2)"
+ : "=r" (addend)
+ : "0" (addend), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return addend + add_value;
+}
+
+inline void Atomic::inc (volatile jint* dest) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%1) "addl $1,(%0)" :
+ : "r" (dest), "r" (mp) : "cc", "memory");
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+ inc_ptr((volatile intptr_t*)dest);
+}
+
+inline void Atomic::dec (volatile jint* dest) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%1) "subl $1,(%0)" :
+ : "r" (dest), "r" (mp) : "cc", "memory");
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+ dec_ptr((volatile intptr_t*)dest);
+}
+
+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+ __asm__ volatile ( "xchgl (%2),%0"
+ : "=r" (exchange_value)
+ : "0" (exchange_value), "r" (dest)
+ : "memory");
+ return exchange_value;
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
+}
+
+#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgb %1,(%3)"
+ : "=a" (exchange_value)
+ : "q" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+}
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
+ : "=a" (exchange_value)
+ : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+}
+
+#ifdef AMD64
+inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
+inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ intptr_t addend = add_value;
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%3) "xaddq %0,(%2)"
+ : "=r" (addend)
+ : "0" (addend), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return addend + add_value;
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)add_ptr(add_value, (volatile intptr_t*)dest);
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%1) "addq $1,(%0)"
+ :
+ : "r" (dest), "r" (mp)
+ : "cc", "memory");
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%1) "subq $1,(%0)"
+ :
+ : "r" (dest), "r" (mp)
+ : "cc", "memory");
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ __asm__ __volatile__ ("xchgq (%2),%0"
+ : "=r" (exchange_value)
+ : "0" (exchange_value), "r" (dest)
+ : "memory");
+ return exchange_value;
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
+ : "=a" (exchange_value)
+ : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
+}
+
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
+#else // !AMD64
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ return (intptr_t)Atomic::add((jint)add_value, (volatile jint*)dest);
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)Atomic::add((jint)add_value, (volatile jint*)dest);
+}
+
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ inc((volatile jint*)dest);
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ dec((volatile jint*)dest);
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+extern "C" {
+ // defined in bsd_x86.s
+ jlong _Atomic_cmpxchg_long(jlong, volatile jlong*, jlong, bool);
+ void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+ return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, os::is_MP());
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
+}
+
+inline jlong Atomic::load(volatile jlong* src) {
+ volatile jlong dest;
+ _Atomic_move_long(src, &dest);
+ return dest;
+}
+
+inline void Atomic::store(jlong store_value, jlong* dest) {
+ _Atomic_move_long((volatile jlong*)&store_value, (volatile jlong*)dest);
+}
+
+inline void Atomic::store(jlong store_value, volatile jlong* dest) {
+ _Atomic_move_long((volatile jlong*)&store_value, dest);
+}
+
+#endif // AMD64
+
+#endif // OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_HPP
--- a/hotspot/src/os_cpu/bsd_x86/vm/atomic_bsd_x86.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 1999, 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.
- *
- */
-
-#ifndef OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_INLINE_HPP
-#define OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-
-// Implementation of class atomic
-
-inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
-
-inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
-
-
-// Adding a lock prefix to an instruction on MP machine
-#define LOCK_IF_MP(mp) "cmp $0, " #mp "; je 1f; lock; 1: "
-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
- jint addend = add_value;
- int mp = os::is_MP();
- __asm__ volatile ( LOCK_IF_MP(%3) "xaddl %0,(%2)"
- : "=r" (addend)
- : "0" (addend), "r" (dest), "r" (mp)
- : "cc", "memory");
- return addend + add_value;
-}
-
-inline void Atomic::inc (volatile jint* dest) {
- int mp = os::is_MP();
- __asm__ volatile (LOCK_IF_MP(%1) "addl $1,(%0)" :
- : "r" (dest), "r" (mp) : "cc", "memory");
-}
-
-inline void Atomic::inc_ptr(volatile void* dest) {
- inc_ptr((volatile intptr_t*)dest);
-}
-
-inline void Atomic::dec (volatile jint* dest) {
- int mp = os::is_MP();
- __asm__ volatile (LOCK_IF_MP(%1) "subl $1,(%0)" :
- : "r" (dest), "r" (mp) : "cc", "memory");
-}
-
-inline void Atomic::dec_ptr(volatile void* dest) {
- dec_ptr((volatile intptr_t*)dest);
-}
-
-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
- __asm__ volatile ( "xchgl (%2),%0"
- : "=r" (exchange_value)
- : "0" (exchange_value), "r" (dest)
- : "memory");
- return exchange_value;
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
-}
-
-#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
- int mp = os::is_MP();
- __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgb %1,(%3)"
- : "=a" (exchange_value)
- : "q" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
- : "cc", "memory");
- return exchange_value;
-}
-
-inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
- int mp = os::is_MP();
- __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
- : "=a" (exchange_value)
- : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
- : "cc", "memory");
- return exchange_value;
-}
-
-#ifdef AMD64
-inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
-inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- intptr_t addend = add_value;
- bool mp = os::is_MP();
- __asm__ __volatile__ (LOCK_IF_MP(%3) "xaddq %0,(%2)"
- : "=r" (addend)
- : "0" (addend), "r" (dest), "r" (mp)
- : "cc", "memory");
- return addend + add_value;
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)add_ptr(add_value, (volatile intptr_t*)dest);
-}
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest) {
- bool mp = os::is_MP();
- __asm__ __volatile__ (LOCK_IF_MP(%1) "addq $1,(%0)"
- :
- : "r" (dest), "r" (mp)
- : "cc", "memory");
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest) {
- bool mp = os::is_MP();
- __asm__ __volatile__ (LOCK_IF_MP(%1) "subq $1,(%0)"
- :
- : "r" (dest), "r" (mp)
- : "cc", "memory");
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
- __asm__ __volatile__ ("xchgq (%2),%0"
- : "=r" (exchange_value)
- : "0" (exchange_value), "r" (dest)
- : "memory");
- return exchange_value;
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
- bool mp = os::is_MP();
- __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
- : "=a" (exchange_value)
- : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
- : "cc", "memory");
- return exchange_value;
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
-}
-
-inline jlong Atomic::load(volatile jlong* src) { return *src; }
-
-#else // !AMD64
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- return (intptr_t)Atomic::add((jint)add_value, (volatile jint*)dest);
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)Atomic::add((jint)add_value, (volatile jint*)dest);
-}
-
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest) {
- inc((volatile jint*)dest);
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest) {
- dec((volatile jint*)dest);
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
- return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
-}
-
-extern "C" {
- // defined in bsd_x86.s
- jlong _Atomic_cmpxchg_long(jlong, volatile jlong*, jlong, bool);
- void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
- return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, os::is_MP());
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
-}
-
-inline jlong Atomic::load(volatile jlong* src) {
- volatile jlong dest;
- _Atomic_move_long(src, &dest);
- return dest;
-}
-
-inline void Atomic::store(jlong store_value, jlong* dest) {
- _Atomic_move_long((volatile jlong*)&store_value, (volatile jlong*)dest);
-}
-
-inline void Atomic::store(jlong store_value, volatile jlong* dest) {
- _Atomic_move_long((volatile jlong*)&store_value, dest);
-}
-
-#endif // AMD64
-
-#endif // OS_CPU_BSD_X86_VM_ATOMIC_BSD_X86_INLINE_HPP
--- a/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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 @@
#ifndef OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_INLINE_HPP
#define OS_CPU_BSD_X86_VM_ORDERACCESS_BSD_X86_INLINE_HPP
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.hpp"
#include "runtime/os.hpp"
--- a/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -45,7 +45,7 @@
// If we have a last_Java_frame, then we should use it even if
// isInJava == true. It should be more reliable than ucontext info.
- if (jt->has_last_Java_frame()) {
+ if (jt->has_last_Java_frame() && jt->frame_anchor()->walkable()) {
*fr_addr = jt->pd_last_frame();
return true;
}
--- a/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/bsd_x86/vm/thread_bsd_x86.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -32,12 +32,8 @@
frame pd_last_frame() {
assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
- if (_anchor.last_Java_pc() != NULL) {
- return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
- } else {
- // This will pick up pc from sp
- return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp());
- }
+ vmassert(_anchor.last_Java_pc() != NULL, "not walkable");
+ return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
}
public:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,333 @@
+/*
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2011, 2015, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP
+#define OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP
+
+#include "runtime/os.hpp"
+
+// Implementation of class atomic
+
+#ifdef M68K
+
+/*
+ * __m68k_cmpxchg
+ *
+ * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
+ * Returns newval on success and oldval if no exchange happened.
+ * This implementation is processor specific and works on
+ * 68020 68030 68040 and 68060.
+ *
+ * It will not work on ColdFire, 68000 and 68010 since they lack the CAS
+ * instruction.
+ * Using a kernelhelper would be better for arch complete implementation.
+ *
+ */
+
+static inline int __m68k_cmpxchg(int oldval, int newval, volatile int *ptr) {
+ int ret;
+ __asm __volatile ("cas%.l %0,%2,%1"
+ : "=d" (ret), "+m" (*(ptr))
+ : "d" (newval), "0" (oldval));
+ return ret;
+}
+
+/* Perform an atomic compare and swap: if the current value of `*PTR'
+ is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
+ `*PTR' before the operation.*/
+static inline int m68k_compare_and_swap(volatile int *ptr,
+ int oldval,
+ int newval) {
+ for (;;) {
+ int prev = *ptr;
+ if (prev != oldval)
+ return prev;
+
+ if (__m68k_cmpxchg (prev, newval, ptr) == newval)
+ // Success.
+ return prev;
+
+ // We failed even though prev == oldval. Try again.
+ }
+}
+
+/* Atomically add an int to memory. */
+static inline int m68k_add_and_fetch(volatile int *ptr, int add_value) {
+ for (;;) {
+ // Loop until success.
+
+ int prev = *ptr;
+
+ if (__m68k_cmpxchg (prev, prev + add_value, ptr) == prev + add_value)
+ return prev + add_value;
+ }
+}
+
+/* Atomically write VALUE into `*PTR' and returns the previous
+ contents of `*PTR'. */
+static inline int m68k_lock_test_and_set(volatile int *ptr, int newval) {
+ for (;;) {
+ // Loop until success.
+ int prev = *ptr;
+
+ if (__m68k_cmpxchg (prev, newval, ptr) == prev)
+ return prev;
+ }
+}
+#endif // M68K
+
+#ifdef ARM
+
+/*
+ * __kernel_cmpxchg
+ *
+ * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
+ * Return zero if *ptr was changed or non-zero if no exchange happened.
+ * The C flag is also set if *ptr was changed to allow for assembly
+ * optimization in the calling code.
+ *
+ */
+
+typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
+#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
+
+
+
+/* Perform an atomic compare and swap: if the current value of `*PTR'
+ is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
+ `*PTR' before the operation.*/
+static inline int arm_compare_and_swap(volatile int *ptr,
+ int oldval,
+ int newval) {
+ for (;;) {
+ int prev = *ptr;
+ if (prev != oldval)
+ return prev;
+
+ if (__kernel_cmpxchg (prev, newval, ptr) == 0)
+ // Success.
+ return prev;
+
+ // We failed even though prev == oldval. Try again.
+ }
+}
+
+/* Atomically add an int to memory. */
+static inline int arm_add_and_fetch(volatile int *ptr, int add_value) {
+ for (;;) {
+ // Loop until a __kernel_cmpxchg succeeds.
+
+ int prev = *ptr;
+
+ if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0)
+ return prev + add_value;
+ }
+}
+
+/* Atomically write VALUE into `*PTR' and returns the previous
+ contents of `*PTR'. */
+static inline int arm_lock_test_and_set(volatile int *ptr, int newval) {
+ for (;;) {
+ // Loop until a __kernel_cmpxchg succeeds.
+ int prev = *ptr;
+
+ if (__kernel_cmpxchg (prev, newval, ptr) == 0)
+ return prev;
+ }
+}
+#endif // ARM
+
+inline void Atomic::store(jint store_value, volatile jint* dest) {
+#if !defined(ARM) && !defined(M68K)
+ __sync_synchronize();
+#endif
+ *dest = store_value;
+}
+
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) {
+#if !defined(ARM) && !defined(M68K)
+ __sync_synchronize();
+#endif
+ *dest = store_value;
+}
+
+inline jint Atomic::add(jint add_value, volatile jint* dest) {
+#ifdef ARM
+ return arm_add_and_fetch(dest, add_value);
+#else
+#ifdef M68K
+ return m68k_add_and_fetch(dest, add_value);
+#else
+ return __sync_add_and_fetch(dest, add_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+#ifdef ARM
+ return arm_add_and_fetch(dest, add_value);
+#else
+#ifdef M68K
+ return m68k_add_and_fetch(dest, add_value);
+#else
+ return __sync_add_and_fetch(dest, add_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void *) add_ptr(add_value, (volatile intptr_t *) dest);
+}
+
+inline void Atomic::inc(volatile jint* dest) {
+ add(1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ add_ptr(1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+ add_ptr(1, dest);
+}
+
+inline void Atomic::dec(volatile jint* dest) {
+ add(-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ add_ptr(-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+ add_ptr(-1, dest);
+}
+
+inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
+#ifdef ARM
+ return arm_lock_test_and_set(dest, exchange_value);
+#else
+#ifdef M68K
+ return m68k_lock_test_and_set(dest, exchange_value);
+#else
+ // __sync_lock_test_and_set is a bizarrely named atomic exchange
+ // operation. Note that some platforms only support this with the
+ // limitation that the only valid value to store is the immediate
+ // constant 1. There is a test for this in JNI_CreateJavaVM().
+ jint result = __sync_lock_test_and_set (dest, exchange_value);
+ // All atomic operations are expected to be full memory barriers
+ // (see atomic.hpp). However, __sync_lock_test_and_set is not
+ // a full memory barrier, but an acquire barrier. Hence, this added
+ // barrier.
+ __sync_synchronize();
+ return result;
+#endif // M68K
+#endif // ARM
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value,
+ volatile intptr_t* dest) {
+#ifdef ARM
+ return arm_lock_test_and_set(dest, exchange_value);
+#else
+#ifdef M68K
+ return m68k_lock_test_and_set(dest, exchange_value);
+#else
+ intptr_t result = __sync_lock_test_and_set (dest, exchange_value);
+ __sync_synchronize();
+ return result;
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void *) xchg_ptr((intptr_t) exchange_value,
+ (volatile intptr_t*) dest);
+}
+
+inline jint Atomic::cmpxchg(jint exchange_value,
+ volatile jint* dest,
+ jint compare_value,
+ cmpxchg_memory_order order) {
+#ifdef ARM
+ return arm_compare_and_swap(dest, compare_value, exchange_value);
+#else
+#ifdef M68K
+ return m68k_compare_and_swap(dest, compare_value, exchange_value);
+#else
+ return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline jlong Atomic::cmpxchg(jlong exchange_value,
+ volatile jlong* dest,
+ jlong compare_value,
+ cmpxchg_memory_order order) {
+
+ return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
+ volatile intptr_t* dest,
+ intptr_t compare_value,
+ cmpxchg_memory_order order) {
+#ifdef ARM
+ return arm_compare_and_swap(dest, compare_value, exchange_value);
+#else
+#ifdef M68K
+ return m68k_compare_and_swap(dest, compare_value, exchange_value);
+#else
+ return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value,
+ volatile void* dest,
+ void* compare_value,
+ cmpxchg_memory_order order) {
+
+ return (void *) cmpxchg_ptr((intptr_t) exchange_value,
+ (volatile intptr_t*) dest,
+ (intptr_t) compare_value,
+ order);
+}
+
+inline jlong Atomic::load(volatile jlong* src) {
+ volatile jlong dest;
+ os::atomic_copy64(src, &dest);
+ return dest;
+}
+
+inline void Atomic::store(jlong store_value, jlong* dest) {
+ os::atomic_copy64((volatile jlong*)&store_value, (volatile jlong*)dest);
+}
+
+inline void Atomic::store(jlong store_value, volatile jlong* dest) {
+ os::atomic_copy64((volatile jlong*)&store_value, dest);
+}
+
+#endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_HPP
--- a/hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2011, 2015, Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP
-#define OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-
-// Implementation of class atomic
-
-#ifdef M68K
-
-/*
- * __m68k_cmpxchg
- *
- * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
- * Returns newval on success and oldval if no exchange happened.
- * This implementation is processor specific and works on
- * 68020 68030 68040 and 68060.
- *
- * It will not work on ColdFire, 68000 and 68010 since they lack the CAS
- * instruction.
- * Using a kernelhelper would be better for arch complete implementation.
- *
- */
-
-static inline int __m68k_cmpxchg(int oldval, int newval, volatile int *ptr) {
- int ret;
- __asm __volatile ("cas%.l %0,%2,%1"
- : "=d" (ret), "+m" (*(ptr))
- : "d" (newval), "0" (oldval));
- return ret;
-}
-
-/* Perform an atomic compare and swap: if the current value of `*PTR'
- is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
- `*PTR' before the operation.*/
-static inline int m68k_compare_and_swap(volatile int *ptr,
- int oldval,
- int newval) {
- for (;;) {
- int prev = *ptr;
- if (prev != oldval)
- return prev;
-
- if (__m68k_cmpxchg (prev, newval, ptr) == newval)
- // Success.
- return prev;
-
- // We failed even though prev == oldval. Try again.
- }
-}
-
-/* Atomically add an int to memory. */
-static inline int m68k_add_and_fetch(volatile int *ptr, int add_value) {
- for (;;) {
- // Loop until success.
-
- int prev = *ptr;
-
- if (__m68k_cmpxchg (prev, prev + add_value, ptr) == prev + add_value)
- return prev + add_value;
- }
-}
-
-/* Atomically write VALUE into `*PTR' and returns the previous
- contents of `*PTR'. */
-static inline int m68k_lock_test_and_set(volatile int *ptr, int newval) {
- for (;;) {
- // Loop until success.
- int prev = *ptr;
-
- if (__m68k_cmpxchg (prev, newval, ptr) == prev)
- return prev;
- }
-}
-#endif // M68K
-
-#ifdef ARM
-
-/*
- * __kernel_cmpxchg
- *
- * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
- * Return zero if *ptr was changed or non-zero if no exchange happened.
- * The C flag is also set if *ptr was changed to allow for assembly
- * optimization in the calling code.
- *
- */
-
-typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
-#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
-
-
-
-/* Perform an atomic compare and swap: if the current value of `*PTR'
- is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
- `*PTR' before the operation.*/
-static inline int arm_compare_and_swap(volatile int *ptr,
- int oldval,
- int newval) {
- for (;;) {
- int prev = *ptr;
- if (prev != oldval)
- return prev;
-
- if (__kernel_cmpxchg (prev, newval, ptr) == 0)
- // Success.
- return prev;
-
- // We failed even though prev == oldval. Try again.
- }
-}
-
-/* Atomically add an int to memory. */
-static inline int arm_add_and_fetch(volatile int *ptr, int add_value) {
- for (;;) {
- // Loop until a __kernel_cmpxchg succeeds.
-
- int prev = *ptr;
-
- if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0)
- return prev + add_value;
- }
-}
-
-/* Atomically write VALUE into `*PTR' and returns the previous
- contents of `*PTR'. */
-static inline int arm_lock_test_and_set(volatile int *ptr, int newval) {
- for (;;) {
- // Loop until a __kernel_cmpxchg succeeds.
- int prev = *ptr;
-
- if (__kernel_cmpxchg (prev, newval, ptr) == 0)
- return prev;
- }
-}
-#endif // ARM
-
-inline void Atomic::store(jint store_value, volatile jint* dest) {
-#if !defined(ARM) && !defined(M68K)
- __sync_synchronize();
-#endif
- *dest = store_value;
-}
-
-inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) {
-#if !defined(ARM) && !defined(M68K)
- __sync_synchronize();
-#endif
- *dest = store_value;
-}
-
-inline jint Atomic::add(jint add_value, volatile jint* dest) {
-#ifdef ARM
- return arm_add_and_fetch(dest, add_value);
-#else
-#ifdef M68K
- return m68k_add_and_fetch(dest, add_value);
-#else
- return __sync_add_and_fetch(dest, add_value);
-#endif // M68K
-#endif // ARM
-}
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
-#ifdef ARM
- return arm_add_and_fetch(dest, add_value);
-#else
-#ifdef M68K
- return m68k_add_and_fetch(dest, add_value);
-#else
- return __sync_add_and_fetch(dest, add_value);
-#endif // M68K
-#endif // ARM
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void *) add_ptr(add_value, (volatile intptr_t *) dest);
-}
-
-inline void Atomic::inc(volatile jint* dest) {
- add(1, dest);
-}
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest) {
- add_ptr(1, dest);
-}
-
-inline void Atomic::inc_ptr(volatile void* dest) {
- add_ptr(1, dest);
-}
-
-inline void Atomic::dec(volatile jint* dest) {
- add(-1, dest);
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest) {
- add_ptr(-1, dest);
-}
-
-inline void Atomic::dec_ptr(volatile void* dest) {
- add_ptr(-1, dest);
-}
-
-inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
-#ifdef ARM
- return arm_lock_test_and_set(dest, exchange_value);
-#else
-#ifdef M68K
- return m68k_lock_test_and_set(dest, exchange_value);
-#else
- // __sync_lock_test_and_set is a bizarrely named atomic exchange
- // operation. Note that some platforms only support this with the
- // limitation that the only valid value to store is the immediate
- // constant 1. There is a test for this in JNI_CreateJavaVM().
- jint result = __sync_lock_test_and_set (dest, exchange_value);
- // All atomic operations are expected to be full memory barriers
- // (see atomic.hpp). However, __sync_lock_test_and_set is not
- // a full memory barrier, but an acquire barrier. Hence, this added
- // barrier.
- __sync_synchronize();
- return result;
-#endif // M68K
-#endif // ARM
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value,
- volatile intptr_t* dest) {
-#ifdef ARM
- return arm_lock_test_and_set(dest, exchange_value);
-#else
-#ifdef M68K
- return m68k_lock_test_and_set(dest, exchange_value);
-#else
- intptr_t result = __sync_lock_test_and_set (dest, exchange_value);
- __sync_synchronize();
- return result;
-#endif // M68K
-#endif // ARM
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void *) xchg_ptr((intptr_t) exchange_value,
- (volatile intptr_t*) dest);
-}
-
-inline jint Atomic::cmpxchg(jint exchange_value,
- volatile jint* dest,
- jint compare_value,
- cmpxchg_memory_order order) {
-#ifdef ARM
- return arm_compare_and_swap(dest, compare_value, exchange_value);
-#else
-#ifdef M68K
- return m68k_compare_and_swap(dest, compare_value, exchange_value);
-#else
- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
-#endif // M68K
-#endif // ARM
-}
-
-inline jlong Atomic::cmpxchg(jlong exchange_value,
- volatile jlong* dest,
- jlong compare_value,
- cmpxchg_memory_order order) {
-
- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
- volatile intptr_t* dest,
- intptr_t compare_value,
- cmpxchg_memory_order order) {
-#ifdef ARM
- return arm_compare_and_swap(dest, compare_value, exchange_value);
-#else
-#ifdef M68K
- return m68k_compare_and_swap(dest, compare_value, exchange_value);
-#else
- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
-#endif // M68K
-#endif // ARM
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value,
- volatile void* dest,
- void* compare_value,
- cmpxchg_memory_order order) {
-
- return (void *) cmpxchg_ptr((intptr_t) exchange_value,
- (volatile intptr_t*) dest,
- (intptr_t) compare_value,
- order);
-}
-
-inline jlong Atomic::load(volatile jlong* src) {
- volatile jlong dest;
- os::atomic_copy64(src, &dest);
- return dest;
-}
-
-inline void Atomic::store(jlong store_value, jlong* dest) {
- os::atomic_copy64((volatile jlong*)&store_value, (volatile jlong*)dest);
-}
-
-inline void Atomic::store(jlong store_value, volatile jlong* dest) {
- os::atomic_copy64((volatile jlong*)&store_value, dest);
-}
-
-#endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,162 @@
+/*
+ * Copyright (c) 1999, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, Red Hat Inc. 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 OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP
+#define OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP
+
+#include "vm_version_aarch64.hpp"
+
+// Implementation of class atomic
+
+#define FULL_MEM_BARRIER __sync_synchronize()
+#define READ_MEM_BARRIER __atomic_thread_fence(__ATOMIC_ACQUIRE);
+#define WRITE_MEM_BARRIER __atomic_thread_fence(__ATOMIC_RELEASE);
+
+inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
+
+inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
+
+
+inline jint Atomic::add(jint add_value, volatile jint* dest)
+{
+ return __sync_add_and_fetch(dest, add_value);
+}
+
+inline void Atomic::inc(volatile jint* dest)
+{
+ add(1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile void* dest)
+{
+ add_ptr(1, dest);
+}
+
+inline void Atomic::dec (volatile jint* dest)
+{
+ add(-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile void* dest)
+{
+ add_ptr(-1, dest);
+}
+
+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest)
+{
+ jint res = __sync_lock_test_and_set (dest, exchange_value);
+ FULL_MEM_BARRIER;
+ return res;
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest)
+{
+ return (void *) xchg_ptr((intptr_t) exchange_value,
+ (volatile intptr_t*) dest);
+}
+
+template <typename T> T generic_cmpxchg(T exchange_value, volatile T* dest,
+ T compare_value, cmpxchg_memory_order order)
+{
+ if (order == memory_order_relaxed) {
+ T value = compare_value;
+ __atomic_compare_exchange(dest, &value, &exchange_value, /*weak*/false,
+ __ATOMIC_RELAXED, __ATOMIC_RELAXED);
+ return value;
+ } else {
+ return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+ }
+}
+
+#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order)
+{
+ return generic_cmpxchg(exchange_value, dest, compare_value, order);
+}
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order)
+{
+ return generic_cmpxchg(exchange_value, dest, compare_value, order);
+}
+
+inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
+inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest)
+{
+ return __sync_add_and_fetch(dest, add_value);
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest)
+{
+ return (void *) add_ptr(add_value, (volatile intptr_t *) dest);
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest)
+{
+ add_ptr(1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest)
+{
+ add_ptr(-1, dest);
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest)
+{
+ intptr_t res = __sync_lock_test_and_set (dest, exchange_value);
+ FULL_MEM_BARRIER;
+ return res;
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order)
+{
+ return generic_cmpxchg(exchange_value, dest, compare_value, order);
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order)
+{
+ return generic_cmpxchg(exchange_value, dest, compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order)
+{
+ return (void *) cmpxchg_ptr((intptr_t) exchange_value,
+ (volatile intptr_t*) dest,
+ (intptr_t) compare_value,
+ order);
+}
+
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
+#endif // OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_HPP
--- a/hotspot/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2014, Red Hat Inc. 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 OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_INLINE_HPP
-#define OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-#include "vm_version_aarch64.hpp"
-
-// Implementation of class atomic
-
-#define FULL_MEM_BARRIER __sync_synchronize()
-#define READ_MEM_BARRIER __atomic_thread_fence(__ATOMIC_ACQUIRE);
-#define WRITE_MEM_BARRIER __atomic_thread_fence(__ATOMIC_RELEASE);
-
-inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
-
-inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
-
-
-inline jint Atomic::add(jint add_value, volatile jint* dest)
-{
- return __sync_add_and_fetch(dest, add_value);
-}
-
-inline void Atomic::inc(volatile jint* dest)
-{
- add(1, dest);
-}
-
-inline void Atomic::inc_ptr(volatile void* dest)
-{
- add_ptr(1, dest);
-}
-
-inline void Atomic::dec (volatile jint* dest)
-{
- add(-1, dest);
-}
-
-inline void Atomic::dec_ptr(volatile void* dest)
-{
- add_ptr(-1, dest);
-}
-
-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest)
-{
- jint res = __sync_lock_test_and_set (dest, exchange_value);
- FULL_MEM_BARRIER;
- return res;
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest)
-{
- return (void *) xchg_ptr((intptr_t) exchange_value,
- (volatile intptr_t*) dest);
-}
-
-template <typename T> T generic_cmpxchg(T exchange_value, volatile T* dest,
- T compare_value, cmpxchg_memory_order order)
-{
- if (order == memory_order_relaxed) {
- T value = compare_value;
- __atomic_compare_exchange(dest, &value, &exchange_value, /*weak*/false,
- __ATOMIC_RELAXED, __ATOMIC_RELAXED);
- return value;
- } else {
- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
- }
-}
-
-#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order)
-{
- return generic_cmpxchg(exchange_value, dest, compare_value, order);
-}
-
-inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order)
-{
- return generic_cmpxchg(exchange_value, dest, compare_value, order);
-}
-
-inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
-inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest)
-{
- return __sync_add_and_fetch(dest, add_value);
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest)
-{
- return (void *) add_ptr(add_value, (volatile intptr_t *) dest);
-}
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest)
-{
- add_ptr(1, dest);
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest)
-{
- add_ptr(-1, dest);
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest)
-{
- intptr_t res = __sync_lock_test_and_set (dest, exchange_value);
- FULL_MEM_BARRIER;
- return res;
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order)
-{
- return generic_cmpxchg(exchange_value, dest, compare_value, order);
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order)
-{
- return generic_cmpxchg(exchange_value, dest, compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order)
-{
- return (void *) cmpxchg_ptr((intptr_t) exchange_value,
- (volatile intptr_t*) dest,
- (intptr_t) compare_value,
- order);
-}
-
-inline jlong Atomic::load(volatile jlong* src) { return *src; }
-
-#endif // OS_CPU_LINUX_AARCH64_VM_ATOMIC_LINUX_AARCH64_INLINE_HPP
--- a/hotspot/src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/linux_aarch64/vm/orderAccess_linux_aarch64.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -26,7 +26,7 @@
#ifndef OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_INLINE_HPP
#define OS_CPU_LINUX_AARCH64_VM_ORDERACCESS_LINUX_AARCH64_INLINE_HPP
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.hpp"
#include "runtime/os.hpp"
#include "vm_version_aarch64.hpp"
--- a/hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -47,7 +47,7 @@
// If we have a last_Java_frame, then we should use it even if
// isInJava == true. It should be more reliable than ucontext info.
- if (jt->has_last_Java_frame()) {
+ if (jt->has_last_Java_frame() && jt->frame_anchor()->walkable()) {
*fr_addr = jt->pd_last_frame();
return true;
}
--- a/hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/linux_aarch64/vm/thread_linux_aarch64.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -43,12 +43,7 @@
frame pd_last_frame() {
assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
- if (_anchor.last_Java_pc() != NULL) {
- return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
- } else {
- // This will pick up pc from sp
- return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp());
- }
+ return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
}
public:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,479 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP
+#define OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP
+
+#ifndef PPC64
+#error "Atomic currently only implemented for PPC64"
+#endif
+
+// Implementation of class atomic
+
+inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
+inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
+
+inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
+inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
+
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
+//
+// machine barrier instructions:
+//
+// - sync two-way memory barrier, aka fence
+// - lwsync orders Store|Store,
+// Load|Store,
+// Load|Load,
+// but not Store|Load
+// - eieio orders memory accesses for device memory (only)
+// - isync invalidates speculatively executed instructions
+// From the POWER ISA 2.06 documentation:
+// "[...] an isync instruction prevents the execution of
+// instructions following the isync until instructions
+// preceding the isync have completed, [...]"
+// From IBM's AIX assembler reference:
+// "The isync [...] instructions causes the processor to
+// refetch any instructions that might have been fetched
+// prior to the isync instruction. The instruction isync
+// causes the processor to wait for all previous instructions
+// to complete. Then any instructions already fetched are
+// discarded and instruction processing continues in the
+// environment established by the previous instructions."
+//
+// semantic barrier instructions:
+// (as defined in orderAccess.hpp)
+//
+// - release orders Store|Store, (maps to lwsync)
+// Load|Store
+// - acquire orders Load|Store, (maps to lwsync)
+// Load|Load
+// - fence orders Store|Store, (maps to sync)
+// Load|Store,
+// Load|Load,
+// Store|Load
+//
+
+#define strasm_sync "\n sync \n"
+#define strasm_lwsync "\n lwsync \n"
+#define strasm_isync "\n isync \n"
+#define strasm_release strasm_lwsync
+#define strasm_acquire strasm_lwsync
+#define strasm_fence strasm_sync
+#define strasm_nobarrier ""
+#define strasm_nobarrier_clobber_memory ""
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+
+ unsigned int result;
+
+ __asm__ __volatile__ (
+ strasm_lwsync
+ "1: lwarx %0, 0, %2 \n"
+ " add %0, %0, %1 \n"
+ " stwcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_isync
+ : /*%0*/"=&r" (result)
+ : /*%1*/"r" (add_value), /*%2*/"r" (dest)
+ : "cc", "memory" );
+
+ return (jint) result;
+}
+
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+
+ long result;
+
+ __asm__ __volatile__ (
+ strasm_lwsync
+ "1: ldarx %0, 0, %2 \n"
+ " add %0, %0, %1 \n"
+ " stdcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_isync
+ : /*%0*/"=&r" (result)
+ : /*%1*/"r" (add_value), /*%2*/"r" (dest)
+ : "cc", "memory" );
+
+ return (intptr_t) result;
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)add_ptr(add_value, (volatile intptr_t*)dest);
+}
+
+
+inline void Atomic::inc (volatile jint* dest) {
+
+ unsigned int temp;
+
+ __asm__ __volatile__ (
+ strasm_nobarrier
+ "1: lwarx %0, 0, %2 \n"
+ " addic %0, %0, 1 \n"
+ " stwcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_nobarrier
+ : /*%0*/"=&r" (temp), "=m" (*dest)
+ : /*%2*/"r" (dest), "m" (*dest)
+ : "cc" strasm_nobarrier_clobber_memory);
+
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+
+ long temp;
+
+ __asm__ __volatile__ (
+ strasm_nobarrier
+ "1: ldarx %0, 0, %2 \n"
+ " addic %0, %0, 1 \n"
+ " stdcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_nobarrier
+ : /*%0*/"=&r" (temp), "=m" (*dest)
+ : /*%2*/"r" (dest), "m" (*dest)
+ : "cc" strasm_nobarrier_clobber_memory);
+
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+ inc_ptr((volatile intptr_t*)dest);
+}
+
+
+inline void Atomic::dec (volatile jint* dest) {
+
+ unsigned int temp;
+
+ __asm__ __volatile__ (
+ strasm_nobarrier
+ "1: lwarx %0, 0, %2 \n"
+ " addic %0, %0, -1 \n"
+ " stwcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_nobarrier
+ : /*%0*/"=&r" (temp), "=m" (*dest)
+ : /*%2*/"r" (dest), "m" (*dest)
+ : "cc" strasm_nobarrier_clobber_memory);
+
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+
+ long temp;
+
+ __asm__ __volatile__ (
+ strasm_nobarrier
+ "1: ldarx %0, 0, %2 \n"
+ " addic %0, %0, -1 \n"
+ " stdcx. %0, 0, %2 \n"
+ " bne- 1b \n"
+ strasm_nobarrier
+ : /*%0*/"=&r" (temp), "=m" (*dest)
+ : /*%2*/"r" (dest), "m" (*dest)
+ : "cc" strasm_nobarrier_clobber_memory);
+
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+ dec_ptr((volatile intptr_t*)dest);
+}
+
+inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
+
+ // Note that xchg_ptr doesn't necessarily do an acquire
+ // (see synchronizer.cpp).
+
+ unsigned int old_value;
+ const uint64_t zero = 0;
+
+ __asm__ __volatile__ (
+ /* lwsync */
+ strasm_lwsync
+ /* atomic loop */
+ "1: \n"
+ " lwarx %[old_value], %[dest], %[zero] \n"
+ " stwcx. %[exchange_value], %[dest], %[zero] \n"
+ " bne- 1b \n"
+ /* isync */
+ strasm_sync
+ /* exit */
+ "2: \n"
+ /* out */
+ : [old_value] "=&r" (old_value),
+ "=m" (*dest)
+ /* in */
+ : [dest] "b" (dest),
+ [zero] "r" (zero),
+ [exchange_value] "r" (exchange_value),
+ "m" (*dest)
+ /* clobber */
+ : "cc",
+ "memory"
+ );
+
+ return (jint) old_value;
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+
+ // Note that xchg_ptr doesn't necessarily do an acquire
+ // (see synchronizer.cpp).
+
+ long old_value;
+ const uint64_t zero = 0;
+
+ __asm__ __volatile__ (
+ /* lwsync */
+ strasm_lwsync
+ /* atomic loop */
+ "1: \n"
+ " ldarx %[old_value], %[dest], %[zero] \n"
+ " stdcx. %[exchange_value], %[dest], %[zero] \n"
+ " bne- 1b \n"
+ /* isync */
+ strasm_sync
+ /* exit */
+ "2: \n"
+ /* out */
+ : [old_value] "=&r" (old_value),
+ "=m" (*dest)
+ /* in */
+ : [dest] "b" (dest),
+ [zero] "r" (zero),
+ [exchange_value] "r" (exchange_value),
+ "m" (*dest)
+ /* clobber */
+ : "cc",
+ "memory"
+ );
+
+ return (intptr_t) old_value;
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
+}
+
+inline void cmpxchg_pre_membar(cmpxchg_memory_order order) {
+ if (order != memory_order_relaxed) {
+ __asm__ __volatile__ (
+ /* fence */
+ strasm_sync
+ );
+ }
+}
+
+inline void cmpxchg_post_membar(cmpxchg_memory_order order) {
+ if (order != memory_order_relaxed) {
+ __asm__ __volatile__ (
+ /* fence */
+ strasm_sync
+ );
+ }
+}
+
+#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
+
+ // Note that cmpxchg guarantees a two-way memory barrier across
+ // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+ // specified otherwise (see atomic.hpp).
+
+ // Using 32 bit internally.
+ volatile int *dest_base = (volatile int*)((uintptr_t)dest & ~3);
+
+#ifdef VM_LITTLE_ENDIAN
+ const unsigned int shift_amount = ((uintptr_t)dest & 3) * 8;
+#else
+ const unsigned int shift_amount = ((~(uintptr_t)dest) & 3) * 8;
+#endif
+ const unsigned int masked_compare_val = ((unsigned int)(unsigned char)compare_value),
+ masked_exchange_val = ((unsigned int)(unsigned char)exchange_value),
+ xor_value = (masked_compare_val ^ masked_exchange_val) << shift_amount;
+
+ unsigned int old_value, value32;
+
+ cmpxchg_pre_membar(order);
+
+ __asm__ __volatile__ (
+ /* simple guard */
+ " lbz %[old_value], 0(%[dest]) \n"
+ " cmpw %[masked_compare_val], %[old_value] \n"
+ " bne- 2f \n"
+ /* atomic loop */
+ "1: \n"
+ " lwarx %[value32], 0, %[dest_base] \n"
+ /* extract byte and compare */
+ " srd %[old_value], %[value32], %[shift_amount] \n"
+ " clrldi %[old_value], %[old_value], 56 \n"
+ " cmpw %[masked_compare_val], %[old_value] \n"
+ " bne- 2f \n"
+ /* replace byte and try to store */
+ " xor %[value32], %[xor_value], %[value32] \n"
+ " stwcx. %[value32], 0, %[dest_base] \n"
+ " bne- 1b \n"
+ /* exit */
+ "2: \n"
+ /* out */
+ : [old_value] "=&r" (old_value),
+ [value32] "=&r" (value32),
+ "=m" (*dest),
+ "=m" (*dest_base)
+ /* in */
+ : [dest] "b" (dest),
+ [dest_base] "b" (dest_base),
+ [shift_amount] "r" (shift_amount),
+ [masked_compare_val] "r" (masked_compare_val),
+ [xor_value] "r" (xor_value),
+ "m" (*dest),
+ "m" (*dest_base)
+ /* clobber */
+ : "cc",
+ "memory"
+ );
+
+ cmpxchg_post_membar(order);
+
+ return (jbyte)(unsigned char)old_value;
+}
+
+inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
+
+ // Note that cmpxchg guarantees a two-way memory barrier across
+ // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+ // specified otherwise (see atomic.hpp).
+
+ unsigned int old_value;
+ const uint64_t zero = 0;
+
+ cmpxchg_pre_membar(order);
+
+ __asm__ __volatile__ (
+ /* simple guard */
+ " lwz %[old_value], 0(%[dest]) \n"
+ " cmpw %[compare_value], %[old_value] \n"
+ " bne- 2f \n"
+ /* atomic loop */
+ "1: \n"
+ " lwarx %[old_value], %[dest], %[zero] \n"
+ " cmpw %[compare_value], %[old_value] \n"
+ " bne- 2f \n"
+ " stwcx. %[exchange_value], %[dest], %[zero] \n"
+ " bne- 1b \n"
+ /* exit */
+ "2: \n"
+ /* out */
+ : [old_value] "=&r" (old_value),
+ "=m" (*dest)
+ /* in */
+ : [dest] "b" (dest),
+ [zero] "r" (zero),
+ [compare_value] "r" (compare_value),
+ [exchange_value] "r" (exchange_value),
+ "m" (*dest)
+ /* clobber */
+ : "cc",
+ "memory"
+ );
+
+ cmpxchg_post_membar(order);
+
+ return (jint) old_value;
+}
+
+inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+
+ // Note that cmpxchg guarantees a two-way memory barrier across
+ // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
+ // specified otherwise (see atomic.hpp).
+
+ long old_value;
+ const uint64_t zero = 0;
+
+ cmpxchg_pre_membar(order);
+
+ __asm__ __volatile__ (
+ /* simple guard */
+ " ld %[old_value], 0(%[dest]) \n"
+ " cmpd %[compare_value], %[old_value] \n"
+ " bne- 2f \n"
+ /* atomic loop */
+ "1: \n"
+ " ldarx %[old_value], %[dest], %[zero] \n"
+ " cmpd %[compare_value], %[old_value] \n"
+ " bne- 2f \n"
+ " stdcx. %[exchange_value], %[dest], %[zero] \n"
+ " bne- 1b \n"
+ /* exit */
+ "2: \n"
+ /* out */
+ : [old_value] "=&r" (old_value),
+ "=m" (*dest)
+ /* in */
+ : [dest] "b" (dest),
+ [zero] "r" (zero),
+ [compare_value] "r" (compare_value),
+ [exchange_value] "r" (exchange_value),
+ "m" (*dest)
+ /* clobber */
+ : "cc",
+ "memory"
+ );
+
+ cmpxchg_post_membar(order);
+
+ return (jlong) old_value;
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
+}
+
+#undef strasm_sync
+#undef strasm_lwsync
+#undef strasm_isync
+#undef strasm_release
+#undef strasm_acquire
+#undef strasm_fence
+#undef strasm_nobarrier
+#undef strasm_nobarrier_clobber_memory
+
+#endif // OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_HPP
--- a/hotspot/src/os_cpu/linux_ppc/vm/atomic_linux_ppc.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,482 +0,0 @@
-/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2014 SAP SE. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_INLINE_HPP
-#define OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-
-#ifndef PPC64
-#error "Atomic currently only implemented for PPC64"
-#endif
-
-// Implementation of class atomic
-
-inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
-inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
-
-inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
-inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
-
-inline jlong Atomic::load(volatile jlong* src) { return *src; }
-
-//
-// machine barrier instructions:
-//
-// - sync two-way memory barrier, aka fence
-// - lwsync orders Store|Store,
-// Load|Store,
-// Load|Load,
-// but not Store|Load
-// - eieio orders memory accesses for device memory (only)
-// - isync invalidates speculatively executed instructions
-// From the POWER ISA 2.06 documentation:
-// "[...] an isync instruction prevents the execution of
-// instructions following the isync until instructions
-// preceding the isync have completed, [...]"
-// From IBM's AIX assembler reference:
-// "The isync [...] instructions causes the processor to
-// refetch any instructions that might have been fetched
-// prior to the isync instruction. The instruction isync
-// causes the processor to wait for all previous instructions
-// to complete. Then any instructions already fetched are
-// discarded and instruction processing continues in the
-// environment established by the previous instructions."
-//
-// semantic barrier instructions:
-// (as defined in orderAccess.hpp)
-//
-// - release orders Store|Store, (maps to lwsync)
-// Load|Store
-// - acquire orders Load|Store, (maps to lwsync)
-// Load|Load
-// - fence orders Store|Store, (maps to sync)
-// Load|Store,
-// Load|Load,
-// Store|Load
-//
-
-#define strasm_sync "\n sync \n"
-#define strasm_lwsync "\n lwsync \n"
-#define strasm_isync "\n isync \n"
-#define strasm_release strasm_lwsync
-#define strasm_acquire strasm_lwsync
-#define strasm_fence strasm_sync
-#define strasm_nobarrier ""
-#define strasm_nobarrier_clobber_memory ""
-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
-
- unsigned int result;
-
- __asm__ __volatile__ (
- strasm_lwsync
- "1: lwarx %0, 0, %2 \n"
- " add %0, %0, %1 \n"
- " stwcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_isync
- : /*%0*/"=&r" (result)
- : /*%1*/"r" (add_value), /*%2*/"r" (dest)
- : "cc", "memory" );
-
- return (jint) result;
-}
-
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
-
- long result;
-
- __asm__ __volatile__ (
- strasm_lwsync
- "1: ldarx %0, 0, %2 \n"
- " add %0, %0, %1 \n"
- " stdcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_isync
- : /*%0*/"=&r" (result)
- : /*%1*/"r" (add_value), /*%2*/"r" (dest)
- : "cc", "memory" );
-
- return (intptr_t) result;
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)add_ptr(add_value, (volatile intptr_t*)dest);
-}
-
-
-inline void Atomic::inc (volatile jint* dest) {
-
- unsigned int temp;
-
- __asm__ __volatile__ (
- strasm_nobarrier
- "1: lwarx %0, 0, %2 \n"
- " addic %0, %0, 1 \n"
- " stwcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_nobarrier
- : /*%0*/"=&r" (temp), "=m" (*dest)
- : /*%2*/"r" (dest), "m" (*dest)
- : "cc" strasm_nobarrier_clobber_memory);
-
-}
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest) {
-
- long temp;
-
- __asm__ __volatile__ (
- strasm_nobarrier
- "1: ldarx %0, 0, %2 \n"
- " addic %0, %0, 1 \n"
- " stdcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_nobarrier
- : /*%0*/"=&r" (temp), "=m" (*dest)
- : /*%2*/"r" (dest), "m" (*dest)
- : "cc" strasm_nobarrier_clobber_memory);
-
-}
-
-inline void Atomic::inc_ptr(volatile void* dest) {
- inc_ptr((volatile intptr_t*)dest);
-}
-
-
-inline void Atomic::dec (volatile jint* dest) {
-
- unsigned int temp;
-
- __asm__ __volatile__ (
- strasm_nobarrier
- "1: lwarx %0, 0, %2 \n"
- " addic %0, %0, -1 \n"
- " stwcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_nobarrier
- : /*%0*/"=&r" (temp), "=m" (*dest)
- : /*%2*/"r" (dest), "m" (*dest)
- : "cc" strasm_nobarrier_clobber_memory);
-
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest) {
-
- long temp;
-
- __asm__ __volatile__ (
- strasm_nobarrier
- "1: ldarx %0, 0, %2 \n"
- " addic %0, %0, -1 \n"
- " stdcx. %0, 0, %2 \n"
- " bne- 1b \n"
- strasm_nobarrier
- : /*%0*/"=&r" (temp), "=m" (*dest)
- : /*%2*/"r" (dest), "m" (*dest)
- : "cc" strasm_nobarrier_clobber_memory);
-
-}
-
-inline void Atomic::dec_ptr(volatile void* dest) {
- dec_ptr((volatile intptr_t*)dest);
-}
-
-inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
-
- // Note that xchg_ptr doesn't necessarily do an acquire
- // (see synchronizer.cpp).
-
- unsigned int old_value;
- const uint64_t zero = 0;
-
- __asm__ __volatile__ (
- /* lwsync */
- strasm_lwsync
- /* atomic loop */
- "1: \n"
- " lwarx %[old_value], %[dest], %[zero] \n"
- " stwcx. %[exchange_value], %[dest], %[zero] \n"
- " bne- 1b \n"
- /* isync */
- strasm_sync
- /* exit */
- "2: \n"
- /* out */
- : [old_value] "=&r" (old_value),
- "=m" (*dest)
- /* in */
- : [dest] "b" (dest),
- [zero] "r" (zero),
- [exchange_value] "r" (exchange_value),
- "m" (*dest)
- /* clobber */
- : "cc",
- "memory"
- );
-
- return (jint) old_value;
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
-
- // Note that xchg_ptr doesn't necessarily do an acquire
- // (see synchronizer.cpp).
-
- long old_value;
- const uint64_t zero = 0;
-
- __asm__ __volatile__ (
- /* lwsync */
- strasm_lwsync
- /* atomic loop */
- "1: \n"
- " ldarx %[old_value], %[dest], %[zero] \n"
- " stdcx. %[exchange_value], %[dest], %[zero] \n"
- " bne- 1b \n"
- /* isync */
- strasm_sync
- /* exit */
- "2: \n"
- /* out */
- : [old_value] "=&r" (old_value),
- "=m" (*dest)
- /* in */
- : [dest] "b" (dest),
- [zero] "r" (zero),
- [exchange_value] "r" (exchange_value),
- "m" (*dest)
- /* clobber */
- : "cc",
- "memory"
- );
-
- return (intptr_t) old_value;
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
-}
-
-inline void cmpxchg_pre_membar(cmpxchg_memory_order order) {
- if (order != memory_order_relaxed) {
- __asm__ __volatile__ (
- /* fence */
- strasm_sync
- );
- }
-}
-
-inline void cmpxchg_post_membar(cmpxchg_memory_order order) {
- if (order != memory_order_relaxed) {
- __asm__ __volatile__ (
- /* fence */
- strasm_sync
- );
- }
-}
-
-#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
-
- // Note that cmpxchg guarantees a two-way memory barrier across
- // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
- // specified otherwise (see atomic.hpp).
-
- // Using 32 bit internally.
- volatile int *dest_base = (volatile int*)((uintptr_t)dest & ~3);
-
-#ifdef VM_LITTLE_ENDIAN
- const unsigned int shift_amount = ((uintptr_t)dest & 3) * 8;
-#else
- const unsigned int shift_amount = ((~(uintptr_t)dest) & 3) * 8;
-#endif
- const unsigned int masked_compare_val = ((unsigned int)(unsigned char)compare_value),
- masked_exchange_val = ((unsigned int)(unsigned char)exchange_value),
- xor_value = (masked_compare_val ^ masked_exchange_val) << shift_amount;
-
- unsigned int old_value, value32;
-
- cmpxchg_pre_membar(order);
-
- __asm__ __volatile__ (
- /* simple guard */
- " lbz %[old_value], 0(%[dest]) \n"
- " cmpw %[masked_compare_val], %[old_value] \n"
- " bne- 2f \n"
- /* atomic loop */
- "1: \n"
- " lwarx %[value32], 0, %[dest_base] \n"
- /* extract byte and compare */
- " srd %[old_value], %[value32], %[shift_amount] \n"
- " clrldi %[old_value], %[old_value], 56 \n"
- " cmpw %[masked_compare_val], %[old_value] \n"
- " bne- 2f \n"
- /* replace byte and try to store */
- " xor %[value32], %[xor_value], %[value32] \n"
- " stwcx. %[value32], 0, %[dest_base] \n"
- " bne- 1b \n"
- /* exit */
- "2: \n"
- /* out */
- : [old_value] "=&r" (old_value),
- [value32] "=&r" (value32),
- "=m" (*dest),
- "=m" (*dest_base)
- /* in */
- : [dest] "b" (dest),
- [dest_base] "b" (dest_base),
- [shift_amount] "r" (shift_amount),
- [masked_compare_val] "r" (masked_compare_val),
- [xor_value] "r" (xor_value),
- "m" (*dest),
- "m" (*dest_base)
- /* clobber */
- : "cc",
- "memory"
- );
-
- cmpxchg_post_membar(order);
-
- return (jbyte)(unsigned char)old_value;
-}
-
-inline jint Atomic::cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
-
- // Note that cmpxchg guarantees a two-way memory barrier across
- // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
- // specified otherwise (see atomic.hpp).
-
- unsigned int old_value;
- const uint64_t zero = 0;
-
- cmpxchg_pre_membar(order);
-
- __asm__ __volatile__ (
- /* simple guard */
- " lwz %[old_value], 0(%[dest]) \n"
- " cmpw %[compare_value], %[old_value] \n"
- " bne- 2f \n"
- /* atomic loop */
- "1: \n"
- " lwarx %[old_value], %[dest], %[zero] \n"
- " cmpw %[compare_value], %[old_value] \n"
- " bne- 2f \n"
- " stwcx. %[exchange_value], %[dest], %[zero] \n"
- " bne- 1b \n"
- /* exit */
- "2: \n"
- /* out */
- : [old_value] "=&r" (old_value),
- "=m" (*dest)
- /* in */
- : [dest] "b" (dest),
- [zero] "r" (zero),
- [compare_value] "r" (compare_value),
- [exchange_value] "r" (exchange_value),
- "m" (*dest)
- /* clobber */
- : "cc",
- "memory"
- );
-
- cmpxchg_post_membar(order);
-
- return (jint) old_value;
-}
-
-inline jlong Atomic::cmpxchg(jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
-
- // Note that cmpxchg guarantees a two-way memory barrier across
- // the cmpxchg, so it's really a a 'fence_cmpxchg_fence' if not
- // specified otherwise (see atomic.hpp).
-
- long old_value;
- const uint64_t zero = 0;
-
- cmpxchg_pre_membar(order);
-
- __asm__ __volatile__ (
- /* simple guard */
- " ld %[old_value], 0(%[dest]) \n"
- " cmpd %[compare_value], %[old_value] \n"
- " bne- 2f \n"
- /* atomic loop */
- "1: \n"
- " ldarx %[old_value], %[dest], %[zero] \n"
- " cmpd %[compare_value], %[old_value] \n"
- " bne- 2f \n"
- " stdcx. %[exchange_value], %[dest], %[zero] \n"
- " bne- 1b \n"
- /* exit */
- "2: \n"
- /* out */
- : [old_value] "=&r" (old_value),
- "=m" (*dest)
- /* in */
- : [dest] "b" (dest),
- [zero] "r" (zero),
- [compare_value] "r" (compare_value),
- [exchange_value] "r" (exchange_value),
- "m" (*dest)
- /* clobber */
- : "cc",
- "memory"
- );
-
- cmpxchg_post_membar(order);
-
- return (jlong) old_value;
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
-}
-
-#undef strasm_sync
-#undef strasm_lwsync
-#undef strasm_isync
-#undef strasm_release
-#undef strasm_acquire
-#undef strasm_fence
-#undef strasm_nobarrier
-#undef strasm_nobarrier_clobber_memory
-
-#endif // OS_CPU_LINUX_PPC_VM_ATOMIC_LINUX_PPC_INLINE_HPP
--- a/hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/linux_sparc/vm/atomic_linux_sparc.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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,9 +25,6 @@
#ifndef OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
#define OS_CPU_LINUX_SPARC_VM_ATOMIC_LINUX_SPARC_INLINE_HPP
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-
// Implementation of class atomic
inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os_cpu/linux_x86/vm/atomic_linux_x86.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,227 @@
+/*
+ * Copyright (c) 1999, 2016, 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 OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
+#define OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
+
+#include "runtime/os.hpp"
+
+// Implementation of class atomic
+
+inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
+
+inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
+
+
+// Adding a lock prefix to an instruction on MP machine
+#define LOCK_IF_MP(mp) "cmp $0, " #mp "; je 1f; lock; 1: "
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+ jint addend = add_value;
+ int mp = os::is_MP();
+ __asm__ volatile ( LOCK_IF_MP(%3) "xaddl %0,(%2)"
+ : "=r" (addend)
+ : "0" (addend), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return addend + add_value;
+}
+
+inline void Atomic::inc (volatile jint* dest) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%1) "addl $1,(%0)" :
+ : "r" (dest), "r" (mp) : "cc", "memory");
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+ inc_ptr((volatile intptr_t*)dest);
+}
+
+inline void Atomic::dec (volatile jint* dest) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%1) "subl $1,(%0)" :
+ : "r" (dest), "r" (mp) : "cc", "memory");
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+ dec_ptr((volatile intptr_t*)dest);
+}
+
+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+ __asm__ volatile ( "xchgl (%2),%0"
+ : "=r" (exchange_value)
+ : "0" (exchange_value), "r" (dest)
+ : "memory");
+ return exchange_value;
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
+}
+
+#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgb %1,(%3)"
+ : "=a" (exchange_value)
+ : "q" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+}
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
+ int mp = os::is_MP();
+ __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
+ : "=a" (exchange_value)
+ : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+}
+
+#ifdef AMD64
+inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
+inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ intptr_t addend = add_value;
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%3) "xaddq %0,(%2)"
+ : "=r" (addend)
+ : "0" (addend), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return addend + add_value;
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)add_ptr(add_value, (volatile intptr_t*)dest);
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%1) "addq $1,(%0)"
+ :
+ : "r" (dest), "r" (mp)
+ : "cc", "memory");
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%1) "subq $1,(%0)"
+ :
+ : "r" (dest), "r" (mp)
+ : "cc", "memory");
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ __asm__ __volatile__ ("xchgq (%2),%0"
+ : "=r" (exchange_value)
+ : "0" (exchange_value), "r" (dest)
+ : "memory");
+ return exchange_value;
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+ bool mp = os::is_MP();
+ __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
+ : "=a" (exchange_value)
+ : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
+}
+
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
+#else // !AMD64
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ return (intptr_t)Atomic::add((jint)add_value, (volatile jint*)dest);
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)Atomic::add((jint)add_value, (volatile jint*)dest);
+}
+
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ inc((volatile jint*)dest);
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ dec((volatile jint*)dest);
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+extern "C" {
+ // defined in linux_x86.s
+ jlong _Atomic_cmpxchg_long(jlong, volatile jlong*, jlong, bool);
+ void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+ return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, os::is_MP());
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
+}
+
+inline jlong Atomic::load(volatile jlong* src) {
+ volatile jlong dest;
+ _Atomic_move_long(src, &dest);
+ return dest;
+}
+
+inline void Atomic::store(jlong store_value, jlong* dest) {
+ _Atomic_move_long((volatile jlong*)&store_value, (volatile jlong*)dest);
+}
+
+inline void Atomic::store(jlong store_value, volatile jlong* dest) {
+ _Atomic_move_long((volatile jlong*)&store_value, dest);
+}
+
+#endif // AMD64
+
+#endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_HPP
--- a/hotspot/src/os_cpu/linux_x86/vm/atomic_linux_x86.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,228 +0,0 @@
-/*
- * Copyright (c) 1999, 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.
- *
- */
-
-#ifndef OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP
-#define OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-
-// Implementation of class atomic
-
-inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
-
-inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
-
-
-// Adding a lock prefix to an instruction on MP machine
-#define LOCK_IF_MP(mp) "cmp $0, " #mp "; je 1f; lock; 1: "
-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
- jint addend = add_value;
- int mp = os::is_MP();
- __asm__ volatile ( LOCK_IF_MP(%3) "xaddl %0,(%2)"
- : "=r" (addend)
- : "0" (addend), "r" (dest), "r" (mp)
- : "cc", "memory");
- return addend + add_value;
-}
-
-inline void Atomic::inc (volatile jint* dest) {
- int mp = os::is_MP();
- __asm__ volatile (LOCK_IF_MP(%1) "addl $1,(%0)" :
- : "r" (dest), "r" (mp) : "cc", "memory");
-}
-
-inline void Atomic::inc_ptr(volatile void* dest) {
- inc_ptr((volatile intptr_t*)dest);
-}
-
-inline void Atomic::dec (volatile jint* dest) {
- int mp = os::is_MP();
- __asm__ volatile (LOCK_IF_MP(%1) "subl $1,(%0)" :
- : "r" (dest), "r" (mp) : "cc", "memory");
-}
-
-inline void Atomic::dec_ptr(volatile void* dest) {
- dec_ptr((volatile intptr_t*)dest);
-}
-
-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
- __asm__ volatile ( "xchgl (%2),%0"
- : "=r" (exchange_value)
- : "0" (exchange_value), "r" (dest)
- : "memory");
- return exchange_value;
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
-}
-
-#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
- int mp = os::is_MP();
- __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgb %1,(%3)"
- : "=a" (exchange_value)
- : "q" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
- : "cc", "memory");
- return exchange_value;
-}
-
-inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
- int mp = os::is_MP();
- __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
- : "=a" (exchange_value)
- : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
- : "cc", "memory");
- return exchange_value;
-}
-
-#ifdef AMD64
-inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
-inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- intptr_t addend = add_value;
- bool mp = os::is_MP();
- __asm__ __volatile__ (LOCK_IF_MP(%3) "xaddq %0,(%2)"
- : "=r" (addend)
- : "0" (addend), "r" (dest), "r" (mp)
- : "cc", "memory");
- return addend + add_value;
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)add_ptr(add_value, (volatile intptr_t*)dest);
-}
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest) {
- bool mp = os::is_MP();
- __asm__ __volatile__ (LOCK_IF_MP(%1) "addq $1,(%0)"
- :
- : "r" (dest), "r" (mp)
- : "cc", "memory");
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest) {
- bool mp = os::is_MP();
- __asm__ __volatile__ (LOCK_IF_MP(%1) "subq $1,(%0)"
- :
- : "r" (dest), "r" (mp)
- : "cc", "memory");
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
- __asm__ __volatile__ ("xchgq (%2),%0"
- : "=r" (exchange_value)
- : "0" (exchange_value), "r" (dest)
- : "memory");
- return exchange_value;
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
- bool mp = os::is_MP();
- __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
- : "=a" (exchange_value)
- : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
- : "cc", "memory");
- return exchange_value;
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
-}
-
-inline jlong Atomic::load(volatile jlong* src) { return *src; }
-
-#else // !AMD64
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- return (intptr_t)Atomic::add((jint)add_value, (volatile jint*)dest);
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)Atomic::add((jint)add_value, (volatile jint*)dest);
-}
-
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest) {
- inc((volatile jint*)dest);
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest) {
- dec((volatile jint*)dest);
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
- return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
-}
-
-extern "C" {
- // defined in linux_x86.s
- jlong _Atomic_cmpxchg_long(jlong, volatile jlong*, jlong, bool);
- void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
- return _Atomic_cmpxchg_long(exchange_value, dest, compare_value, os::is_MP());
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
-}
-
-inline jlong Atomic::load(volatile jlong* src) {
- volatile jlong dest;
- _Atomic_move_long(src, &dest);
- return dest;
-}
-
-inline void Atomic::store(jlong store_value, jlong* dest) {
- _Atomic_move_long((volatile jlong*)&store_value, (volatile jlong*)dest);
-}
-
-inline void Atomic::store(jlong store_value, volatile jlong* dest) {
- _Atomic_move_long((volatile jlong*)&store_value, dest);
-}
-
-#endif // AMD64
-
-#endif // OS_CPU_LINUX_X86_VM_ATOMIC_LINUX_X86_INLINE_HPP
--- a/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/linux_x86/vm/orderAccess_linux_x86.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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 @@
#ifndef OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP
#define OS_CPU_LINUX_X86_VM_ORDERACCESS_LINUX_X86_INLINE_HPP
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.hpp"
#include "runtime/os.hpp"
--- a/hotspot/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/linux_x86/vm/thread_linux_x86.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -46,7 +46,7 @@
// If we have a last_Java_frame, then we should use it even if
// isInJava == true. It should be more reliable than ucontext info.
- if (jt->has_last_Java_frame()) {
+ if (jt->has_last_Java_frame() && jt->frame_anchor()->walkable()) {
*fr_addr = jt->pd_last_frame();
return true;
}
--- a/hotspot/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/linux_x86/vm/thread_linux_x86.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -32,12 +32,8 @@
frame pd_last_frame() {
assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
- if (_anchor.last_Java_pc() != NULL) {
- return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
- } else {
- // This will pick up pc from sp
- return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp());
- }
+ vmassert(_anchor.last_Java_pc() != NULL, "not walkable");
+ return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
}
public:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,327 @@
+/*
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2007, 2008, 2011, 2015, Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP
+#define OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP
+
+#include "runtime/os.hpp"
+
+// Implementation of class atomic
+
+#ifdef M68K
+
+/*
+ * __m68k_cmpxchg
+ *
+ * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
+ * Returns newval on success and oldval if no exchange happened.
+ * This implementation is processor specific and works on
+ * 68020 68030 68040 and 68060.
+ *
+ * It will not work on ColdFire, 68000 and 68010 since they lack the CAS
+ * instruction.
+ * Using a kernelhelper would be better for arch complete implementation.
+ *
+ */
+
+static inline int __m68k_cmpxchg(int oldval, int newval, volatile int *ptr) {
+ int ret;
+ __asm __volatile ("cas%.l %0,%2,%1"
+ : "=d" (ret), "+m" (*(ptr))
+ : "d" (newval), "0" (oldval));
+ return ret;
+}
+
+/* Perform an atomic compare and swap: if the current value of `*PTR'
+ is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
+ `*PTR' before the operation.*/
+static inline int m68k_compare_and_swap(volatile int *ptr,
+ int oldval,
+ int newval) {
+ for (;;) {
+ int prev = *ptr;
+ if (prev != oldval)
+ return prev;
+
+ if (__m68k_cmpxchg (prev, newval, ptr) == newval)
+ // Success.
+ return prev;
+
+ // We failed even though prev == oldval. Try again.
+ }
+}
+
+/* Atomically add an int to memory. */
+static inline int m68k_add_and_fetch(volatile int *ptr, int add_value) {
+ for (;;) {
+ // Loop until success.
+
+ int prev = *ptr;
+
+ if (__m68k_cmpxchg (prev, prev + add_value, ptr) == prev + add_value)
+ return prev + add_value;
+ }
+}
+
+/* Atomically write VALUE into `*PTR' and returns the previous
+ contents of `*PTR'. */
+static inline int m68k_lock_test_and_set(volatile int *ptr, int newval) {
+ for (;;) {
+ // Loop until success.
+ int prev = *ptr;
+
+ if (__m68k_cmpxchg (prev, newval, ptr) == prev)
+ return prev;
+ }
+}
+#endif // M68K
+
+#ifdef ARM
+
+/*
+ * __kernel_cmpxchg
+ *
+ * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
+ * Return zero if *ptr was changed or non-zero if no exchange happened.
+ * The C flag is also set if *ptr was changed to allow for assembly
+ * optimization in the calling code.
+ *
+ */
+
+typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
+#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
+
+
+
+/* Perform an atomic compare and swap: if the current value of `*PTR'
+ is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
+ `*PTR' before the operation.*/
+static inline int arm_compare_and_swap(volatile int *ptr,
+ int oldval,
+ int newval) {
+ for (;;) {
+ int prev = *ptr;
+ if (prev != oldval)
+ return prev;
+
+ if (__kernel_cmpxchg (prev, newval, ptr) == 0)
+ // Success.
+ return prev;
+
+ // We failed even though prev == oldval. Try again.
+ }
+}
+
+/* Atomically add an int to memory. */
+static inline int arm_add_and_fetch(volatile int *ptr, int add_value) {
+ for (;;) {
+ // Loop until a __kernel_cmpxchg succeeds.
+
+ int prev = *ptr;
+
+ if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0)
+ return prev + add_value;
+ }
+}
+
+/* Atomically write VALUE into `*PTR' and returns the previous
+ contents of `*PTR'. */
+static inline int arm_lock_test_and_set(volatile int *ptr, int newval) {
+ for (;;) {
+ // Loop until a __kernel_cmpxchg succeeds.
+ int prev = *ptr;
+
+ if (__kernel_cmpxchg (prev, newval, ptr) == 0)
+ return prev;
+ }
+}
+#endif // ARM
+
+inline void Atomic::store(jint store_value, volatile jint* dest) {
+ *dest = store_value;
+}
+
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) {
+ *dest = store_value;
+}
+
+inline jint Atomic::add(jint add_value, volatile jint* dest) {
+#ifdef ARM
+ return arm_add_and_fetch(dest, add_value);
+#else
+#ifdef M68K
+ return m68k_add_and_fetch(dest, add_value);
+#else
+ return __sync_add_and_fetch(dest, add_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+#ifdef ARM
+ return arm_add_and_fetch(dest, add_value);
+#else
+#ifdef M68K
+ return m68k_add_and_fetch(dest, add_value);
+#else
+ return __sync_add_and_fetch(dest, add_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void *) add_ptr(add_value, (volatile intptr_t *) dest);
+}
+
+inline void Atomic::inc(volatile jint* dest) {
+ add(1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ add_ptr(1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+ add_ptr(1, dest);
+}
+
+inline void Atomic::dec(volatile jint* dest) {
+ add(-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ add_ptr(-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+ add_ptr(-1, dest);
+}
+
+inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
+#ifdef ARM
+ return arm_lock_test_and_set(dest, exchange_value);
+#else
+#ifdef M68K
+ return m68k_lock_test_and_set(dest, exchange_value);
+#else
+ // __sync_lock_test_and_set is a bizarrely named atomic exchange
+ // operation. Note that some platforms only support this with the
+ // limitation that the only valid value to store is the immediate
+ // constant 1. There is a test for this in JNI_CreateJavaVM().
+ jint result = __sync_lock_test_and_set (dest, exchange_value);
+ // All atomic operations are expected to be full memory barriers
+ // (see atomic.hpp). However, __sync_lock_test_and_set is not
+ // a full memory barrier, but an acquire barrier. Hence, this added
+ // barrier.
+ __sync_synchronize();
+ return result;
+#endif // M68K
+#endif // ARM
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value,
+ volatile intptr_t* dest) {
+#ifdef ARM
+ return arm_lock_test_and_set(dest, exchange_value);
+#else
+#ifdef M68K
+ return m68k_lock_test_and_set(dest, exchange_value);
+#else
+ intptr_t result = __sync_lock_test_and_set (dest, exchange_value);
+ __sync_synchronize();
+ return result;
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void *) xchg_ptr((intptr_t) exchange_value,
+ (volatile intptr_t*) dest);
+}
+
+inline jint Atomic::cmpxchg(jint exchange_value,
+ volatile jint* dest,
+ jint compare_value,
+ cmpxchg_memory_order order) {
+#ifdef ARM
+ return arm_compare_and_swap(dest, compare_value, exchange_value);
+#else
+#ifdef M68K
+ return m68k_compare_and_swap(dest, compare_value, exchange_value);
+#else
+ return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline jlong Atomic::cmpxchg(jlong exchange_value,
+ volatile jlong* dest,
+ jlong compare_value,
+ cmpxchg_memory_order order) {
+
+ return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
+ volatile intptr_t* dest,
+ intptr_t compare_value,
+ cmpxchg_memory_order order) {
+#ifdef ARM
+ return arm_compare_and_swap(dest, compare_value, exchange_value);
+#else
+#ifdef M68K
+ return m68k_compare_and_swap(dest, compare_value, exchange_value);
+#else
+ return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
+#endif // M68K
+#endif // ARM
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value,
+ volatile void* dest,
+ void* compare_value,
+ cmpxchg_memory_order order) {
+
+ return (void *) cmpxchg_ptr((intptr_t) exchange_value,
+ (volatile intptr_t*) dest,
+ (intptr_t) compare_value,
+ order);
+}
+
+inline jlong Atomic::load(volatile jlong* src) {
+ volatile jlong dest;
+ os::atomic_copy64(src, &dest);
+ return dest;
+}
+
+inline void Atomic::store(jlong store_value, jlong* dest) {
+ os::atomic_copy64((volatile jlong*)&store_value, (volatile jlong*)dest);
+}
+
+inline void Atomic::store(jlong store_value, volatile jlong* dest) {
+ os::atomic_copy64((volatile jlong*)&store_value, dest);
+}
+
+#endif // OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_HPP
--- a/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,328 +0,0 @@
-/*
- * Copyright (c) 2003, 2014, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2007, 2008, 2011, 2015, Red Hat, Inc.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_INLINE_HPP
-#define OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-
-// Implementation of class atomic
-
-#ifdef M68K
-
-/*
- * __m68k_cmpxchg
- *
- * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
- * Returns newval on success and oldval if no exchange happened.
- * This implementation is processor specific and works on
- * 68020 68030 68040 and 68060.
- *
- * It will not work on ColdFire, 68000 and 68010 since they lack the CAS
- * instruction.
- * Using a kernelhelper would be better for arch complete implementation.
- *
- */
-
-static inline int __m68k_cmpxchg(int oldval, int newval, volatile int *ptr) {
- int ret;
- __asm __volatile ("cas%.l %0,%2,%1"
- : "=d" (ret), "+m" (*(ptr))
- : "d" (newval), "0" (oldval));
- return ret;
-}
-
-/* Perform an atomic compare and swap: if the current value of `*PTR'
- is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
- `*PTR' before the operation.*/
-static inline int m68k_compare_and_swap(volatile int *ptr,
- int oldval,
- int newval) {
- for (;;) {
- int prev = *ptr;
- if (prev != oldval)
- return prev;
-
- if (__m68k_cmpxchg (prev, newval, ptr) == newval)
- // Success.
- return prev;
-
- // We failed even though prev == oldval. Try again.
- }
-}
-
-/* Atomically add an int to memory. */
-static inline int m68k_add_and_fetch(volatile int *ptr, int add_value) {
- for (;;) {
- // Loop until success.
-
- int prev = *ptr;
-
- if (__m68k_cmpxchg (prev, prev + add_value, ptr) == prev + add_value)
- return prev + add_value;
- }
-}
-
-/* Atomically write VALUE into `*PTR' and returns the previous
- contents of `*PTR'. */
-static inline int m68k_lock_test_and_set(volatile int *ptr, int newval) {
- for (;;) {
- // Loop until success.
- int prev = *ptr;
-
- if (__m68k_cmpxchg (prev, newval, ptr) == prev)
- return prev;
- }
-}
-#endif // M68K
-
-#ifdef ARM
-
-/*
- * __kernel_cmpxchg
- *
- * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
- * Return zero if *ptr was changed or non-zero if no exchange happened.
- * The C flag is also set if *ptr was changed to allow for assembly
- * optimization in the calling code.
- *
- */
-
-typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
-#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
-
-
-
-/* Perform an atomic compare and swap: if the current value of `*PTR'
- is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
- `*PTR' before the operation.*/
-static inline int arm_compare_and_swap(volatile int *ptr,
- int oldval,
- int newval) {
- for (;;) {
- int prev = *ptr;
- if (prev != oldval)
- return prev;
-
- if (__kernel_cmpxchg (prev, newval, ptr) == 0)
- // Success.
- return prev;
-
- // We failed even though prev == oldval. Try again.
- }
-}
-
-/* Atomically add an int to memory. */
-static inline int arm_add_and_fetch(volatile int *ptr, int add_value) {
- for (;;) {
- // Loop until a __kernel_cmpxchg succeeds.
-
- int prev = *ptr;
-
- if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0)
- return prev + add_value;
- }
-}
-
-/* Atomically write VALUE into `*PTR' and returns the previous
- contents of `*PTR'. */
-static inline int arm_lock_test_and_set(volatile int *ptr, int newval) {
- for (;;) {
- // Loop until a __kernel_cmpxchg succeeds.
- int prev = *ptr;
-
- if (__kernel_cmpxchg (prev, newval, ptr) == 0)
- return prev;
- }
-}
-#endif // ARM
-
-inline void Atomic::store(jint store_value, volatile jint* dest) {
- *dest = store_value;
-}
-
-inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) {
- *dest = store_value;
-}
-
-inline jint Atomic::add(jint add_value, volatile jint* dest) {
-#ifdef ARM
- return arm_add_and_fetch(dest, add_value);
-#else
-#ifdef M68K
- return m68k_add_and_fetch(dest, add_value);
-#else
- return __sync_add_and_fetch(dest, add_value);
-#endif // M68K
-#endif // ARM
-}
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
-#ifdef ARM
- return arm_add_and_fetch(dest, add_value);
-#else
-#ifdef M68K
- return m68k_add_and_fetch(dest, add_value);
-#else
- return __sync_add_and_fetch(dest, add_value);
-#endif // M68K
-#endif // ARM
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void *) add_ptr(add_value, (volatile intptr_t *) dest);
-}
-
-inline void Atomic::inc(volatile jint* dest) {
- add(1, dest);
-}
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest) {
- add_ptr(1, dest);
-}
-
-inline void Atomic::inc_ptr(volatile void* dest) {
- add_ptr(1, dest);
-}
-
-inline void Atomic::dec(volatile jint* dest) {
- add(-1, dest);
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest) {
- add_ptr(-1, dest);
-}
-
-inline void Atomic::dec_ptr(volatile void* dest) {
- add_ptr(-1, dest);
-}
-
-inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
-#ifdef ARM
- return arm_lock_test_and_set(dest, exchange_value);
-#else
-#ifdef M68K
- return m68k_lock_test_and_set(dest, exchange_value);
-#else
- // __sync_lock_test_and_set is a bizarrely named atomic exchange
- // operation. Note that some platforms only support this with the
- // limitation that the only valid value to store is the immediate
- // constant 1. There is a test for this in JNI_CreateJavaVM().
- jint result = __sync_lock_test_and_set (dest, exchange_value);
- // All atomic operations are expected to be full memory barriers
- // (see atomic.hpp). However, __sync_lock_test_and_set is not
- // a full memory barrier, but an acquire barrier. Hence, this added
- // barrier.
- __sync_synchronize();
- return result;
-#endif // M68K
-#endif // ARM
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value,
- volatile intptr_t* dest) {
-#ifdef ARM
- return arm_lock_test_and_set(dest, exchange_value);
-#else
-#ifdef M68K
- return m68k_lock_test_and_set(dest, exchange_value);
-#else
- intptr_t result = __sync_lock_test_and_set (dest, exchange_value);
- __sync_synchronize();
- return result;
-#endif // M68K
-#endif // ARM
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void *) xchg_ptr((intptr_t) exchange_value,
- (volatile intptr_t*) dest);
-}
-
-inline jint Atomic::cmpxchg(jint exchange_value,
- volatile jint* dest,
- jint compare_value,
- cmpxchg_memory_order order) {
-#ifdef ARM
- return arm_compare_and_swap(dest, compare_value, exchange_value);
-#else
-#ifdef M68K
- return m68k_compare_and_swap(dest, compare_value, exchange_value);
-#else
- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
-#endif // M68K
-#endif // ARM
-}
-
-inline jlong Atomic::cmpxchg(jlong exchange_value,
- volatile jlong* dest,
- jlong compare_value,
- cmpxchg_memory_order order) {
-
- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value,
- volatile intptr_t* dest,
- intptr_t compare_value,
- cmpxchg_memory_order order) {
-#ifdef ARM
- return arm_compare_and_swap(dest, compare_value, exchange_value);
-#else
-#ifdef M68K
- return m68k_compare_and_swap(dest, compare_value, exchange_value);
-#else
- return __sync_val_compare_and_swap(dest, compare_value, exchange_value);
-#endif // M68K
-#endif // ARM
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value,
- volatile void* dest,
- void* compare_value,
- cmpxchg_memory_order order) {
-
- return (void *) cmpxchg_ptr((intptr_t) exchange_value,
- (volatile intptr_t*) dest,
- (intptr_t) compare_value,
- order);
-}
-
-inline jlong Atomic::load(volatile jlong* src) {
- volatile jlong dest;
- os::atomic_copy64(src, &dest);
- return dest;
-}
-
-inline void Atomic::store(jlong store_value, jlong* dest) {
- os::atomic_copy64((volatile jlong*)&store_value, (volatile jlong*)dest);
-}
-
-inline void Atomic::store(jlong store_value, volatile jlong* dest) {
- os::atomic_copy64((volatile jlong*)&store_value, dest);
-}
-
-#endif // OS_CPU_LINUX_ZERO_VM_ATOMIC_LINUX_ZERO_INLINE_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,376 @@
+/*
+ * Copyright (c) 1999, 2016, 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 OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
+#define OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
+
+#include "runtime/os.hpp"
+
+// Implementation of class atomic
+
+inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
+
+inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
+
+inline void Atomic::inc (volatile jint* dest) { (void)add (1, dest); }
+inline void Atomic::inc_ptr(volatile intptr_t* dest) { (void)add_ptr(1, dest); }
+inline void Atomic::inc_ptr(volatile void* dest) { (void)add_ptr(1, dest); }
+
+inline void Atomic::dec (volatile jint* dest) { (void)add (-1, dest); }
+inline void Atomic::dec_ptr(volatile intptr_t* dest) { (void)add_ptr(-1, dest); }
+inline void Atomic::dec_ptr(volatile void* dest) { (void)add_ptr(-1, dest); }
+
+
+#ifdef _LP64
+
+inline void Atomic::store(jlong store_value, jlong* dest) { *dest = store_value; }
+inline void Atomic::store(jlong store_value, volatile jlong* dest) { *dest = store_value; }
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
+#else
+
+extern "C" void _Atomic_move_long_v9(volatile jlong* src, volatile jlong* dst);
+
+inline void Atomic_move_long(volatile jlong* src, volatile jlong* dst) {
+ _Atomic_move_long_v9(src, dst);
+}
+
+inline jlong Atomic::load(volatile jlong* src) {
+ volatile jlong dest;
+ Atomic_move_long(src, &dest);
+ return dest;
+}
+
+inline void Atomic::store(jlong store_value, jlong* dest) {
+ Atomic_move_long((volatile jlong*)&store_value, (volatile jlong*)dest);
+}
+
+inline void Atomic::store(jlong store_value, volatile jlong* dest) {
+ Atomic_move_long((volatile jlong*)&store_value, dest);
+}
+
+#endif
+
+#ifdef _GNU_SOURCE
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+ intptr_t rv;
+ __asm__ volatile(
+ "1: \n\t"
+ " ld [%2], %%o2\n\t"
+ " add %1, %%o2, %%o3\n\t"
+ " cas [%2], %%o2, %%o3\n\t"
+ " cmp %%o2, %%o3\n\t"
+ " bne 1b\n\t"
+ " nop\n\t"
+ " add %1, %%o2, %0\n\t"
+ : "=r" (rv)
+ : "r" (add_value), "r" (dest)
+ : "memory", "o2", "o3");
+ return rv;
+}
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ intptr_t rv;
+#ifdef _LP64
+ __asm__ volatile(
+ "1: \n\t"
+ " ldx [%2], %%o2\n\t"
+ " add %0, %%o2, %%o3\n\t"
+ " casx [%2], %%o2, %%o3\n\t"
+ " cmp %%o2, %%o3\n\t"
+ " bne %%xcc, 1b\n\t"
+ " nop\n\t"
+ " add %0, %%o2, %0\n\t"
+ : "=r" (rv)
+ : "r" (add_value), "r" (dest)
+ : "memory", "o2", "o3");
+#else //_LP64
+ __asm__ volatile(
+ "1: \n\t"
+ " ld [%2], %%o2\n\t"
+ " add %1, %%o2, %%o3\n\t"
+ " cas [%2], %%o2, %%o3\n\t"
+ " cmp %%o2, %%o3\n\t"
+ " bne 1b\n\t"
+ " nop\n\t"
+ " add %1, %%o2, %0\n\t"
+ : "=r" (rv)
+ : "r" (add_value), "r" (dest)
+ : "memory", "o2", "o3");
+#endif // _LP64
+ return rv;
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)add_ptr((intptr_t)add_value, (volatile intptr_t*)dest);
+}
+
+
+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+ intptr_t rv = exchange_value;
+ __asm__ volatile(
+ " swap [%2],%1\n\t"
+ : "=r" (rv)
+ : "0" (exchange_value) /* we use same register as for return value */, "r" (dest)
+ : "memory");
+ return rv;
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ intptr_t rv = exchange_value;
+#ifdef _LP64
+ __asm__ volatile(
+ "1:\n\t"
+ " mov %1, %%o3\n\t"
+ " ldx [%2], %%o2\n\t"
+ " casx [%2], %%o2, %%o3\n\t"
+ " cmp %%o2, %%o3\n\t"
+ " bne %%xcc, 1b\n\t"
+ " nop\n\t"
+ " mov %%o2, %0\n\t"
+ : "=r" (rv)
+ : "r" (exchange_value), "r" (dest)
+ : "memory", "o2", "o3");
+#else //_LP64
+ __asm__ volatile(
+ "swap [%2],%1\n\t"
+ : "=r" (rv)
+ : "0" (exchange_value) /* we use same register as for return value */, "r" (dest)
+ : "memory");
+#endif // _LP64
+ return rv;
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
+}
+
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
+ jint rv;
+ __asm__ volatile(
+ " cas [%2], %3, %0"
+ : "=r" (rv)
+ : "0" (exchange_value), "r" (dest), "r" (compare_value)
+ : "memory");
+ return rv;
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+#ifdef _LP64
+ jlong rv;
+ __asm__ volatile(
+ " casx [%2], %3, %0"
+ : "=r" (rv)
+ : "0" (exchange_value), "r" (dest), "r" (compare_value)
+ : "memory");
+ return rv;
+#else //_LP64
+ volatile jlong_accessor evl, cvl, rv;
+ evl.long_value = exchange_value;
+ cvl.long_value = compare_value;
+
+ __asm__ volatile(
+ " sllx %2, 32, %2\n\t"
+ " srl %3, 0, %3\n\t"
+ " or %2, %3, %2\n\t"
+ " sllx %5, 32, %5\n\t"
+ " srl %6, 0, %6\n\t"
+ " or %5, %6, %5\n\t"
+ " casx [%4], %5, %2\n\t"
+ " srl %2, 0, %1\n\t"
+ " srlx %2, 32, %0\n\t"
+ : "=r" (rv.words[0]), "=r" (rv.words[1])
+ : "r" (evl.words[0]), "r" (evl.words[1]), "r" (dest), "r" (cvl.words[0]), "r" (cvl.words[1])
+ : "memory");
+
+ return rv.long_value;
+#endif //_LP64
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ intptr_t rv;
+#ifdef _LP64
+ __asm__ volatile(
+ " casx [%2], %3, %0"
+ : "=r" (rv)
+ : "0" (exchange_value), "r" (dest), "r" (compare_value)
+ : "memory");
+#else //_LP64
+ __asm__ volatile(
+ " cas [%2], %3, %0"
+ : "=r" (rv)
+ : "0" (exchange_value), "r" (dest), "r" (compare_value)
+ : "memory");
+#endif // _LP64
+ return rv;
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value, order);
+}
+
+#else // _GNU_SOURCE
+
+#if defined(COMPILER2) || defined(_LP64)
+
+// This is the interface to the atomic instructions in solaris_sparc.il.
+// It's very messy because we need to support v8 and these instructions
+// are illegal there. When sparc v8 is dropped, we can drop out lots of
+// this code. Also compiler2 does not support v8 so the conditional code
+// omits the instruction set check.
+
+extern "C" jint _Atomic_swap32(jint exchange_value, volatile jint* dest);
+extern "C" intptr_t _Atomic_swap64(intptr_t exchange_value, volatile intptr_t* dest);
+
+extern "C" jint _Atomic_cas32(jint exchange_value, volatile jint* dest, jint compare_value);
+extern "C" intptr_t _Atomic_cas64(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value);
+extern "C" jlong _Atomic_casl (jlong exchange_value, volatile jlong* dest, jlong compare_value);
+
+extern "C" jint _Atomic_add32(jint inc, volatile jint* dest);
+extern "C" intptr_t _Atomic_add64(intptr_t add_value, volatile intptr_t* dest);
+
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+ return _Atomic_add32(add_value, dest);
+}
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+#ifdef _LP64
+ return _Atomic_add64(add_value, dest);
+#else //_LP64
+ return _Atomic_add32(add_value, dest);
+#endif // _LP64
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)add_ptr((intptr_t)add_value, (volatile intptr_t*)dest);
+}
+
+
+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+ return _Atomic_swap32(exchange_value, dest);
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+#ifdef _LP64
+ return _Atomic_swap64(exchange_value, dest);
+#else // _LP64
+ return _Atomic_swap32(exchange_value, dest);
+#endif // _LP64
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
+}
+
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
+ return _Atomic_cas32(exchange_value, dest, compare_value);
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+#ifdef _LP64
+ // Return 64 bit value in %o0
+ return _Atomic_cas64((intptr_t)exchange_value, (intptr_t *)dest, (intptr_t)compare_value);
+#else // _LP64
+ // Return 64 bit value in %o0,%o1 by hand
+ return _Atomic_casl(exchange_value, dest, compare_value);
+#endif // _LP64
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+#ifdef _LP64
+ return _Atomic_cas64(exchange_value, dest, compare_value);
+#else // _LP64
+ return _Atomic_cas32(exchange_value, dest, compare_value);
+#endif // _LP64
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value, order);
+}
+
+
+#else // _LP64 || COMPILER2
+
+
+// 32-bit compiler1 only
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+ return (*os::atomic_add_func)(add_value, dest);
+}
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ return (intptr_t)add((jint)add_value, (volatile jint*)dest);
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)add((jint)add_value, (volatile jint*)dest);
+}
+
+
+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+ return (*os::atomic_xchg_func)(exchange_value, dest);
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
+ return (*os::atomic_cmpxchg_func)(exchange_value, dest, compare_value);
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+ return (*os::atomic_cmpxchg_long_func)(exchange_value, dest, compare_value);
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
+}
+
+#endif // _LP64 || COMPILER2
+
+#endif // _GNU_SOURCE
+
+#endif // OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_HPP
--- a/hotspot/src/os_cpu/solaris_sparc/vm/atomic_solaris_sparc.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,377 +0,0 @@
-/*
- * Copyright (c) 1999, 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.
- *
- */
-
-#ifndef OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_INLINE_HPP
-#define OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-
-// Implementation of class atomic
-
-inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
-
-inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
-
-inline void Atomic::inc (volatile jint* dest) { (void)add (1, dest); }
-inline void Atomic::inc_ptr(volatile intptr_t* dest) { (void)add_ptr(1, dest); }
-inline void Atomic::inc_ptr(volatile void* dest) { (void)add_ptr(1, dest); }
-
-inline void Atomic::dec (volatile jint* dest) { (void)add (-1, dest); }
-inline void Atomic::dec_ptr(volatile intptr_t* dest) { (void)add_ptr(-1, dest); }
-inline void Atomic::dec_ptr(volatile void* dest) { (void)add_ptr(-1, dest); }
-
-
-#ifdef _LP64
-
-inline void Atomic::store(jlong store_value, jlong* dest) { *dest = store_value; }
-inline void Atomic::store(jlong store_value, volatile jlong* dest) { *dest = store_value; }
-inline jlong Atomic::load(volatile jlong* src) { return *src; }
-
-#else
-
-extern "C" void _Atomic_move_long_v9(volatile jlong* src, volatile jlong* dst);
-
-inline void Atomic_move_long(volatile jlong* src, volatile jlong* dst) {
- _Atomic_move_long_v9(src, dst);
-}
-
-inline jlong Atomic::load(volatile jlong* src) {
- volatile jlong dest;
- Atomic_move_long(src, &dest);
- return dest;
-}
-
-inline void Atomic::store(jlong store_value, jlong* dest) {
- Atomic_move_long((volatile jlong*)&store_value, (volatile jlong*)dest);
-}
-
-inline void Atomic::store(jlong store_value, volatile jlong* dest) {
- Atomic_move_long((volatile jlong*)&store_value, dest);
-}
-
-#endif
-
-#ifdef _GNU_SOURCE
-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
- intptr_t rv;
- __asm__ volatile(
- "1: \n\t"
- " ld [%2], %%o2\n\t"
- " add %1, %%o2, %%o3\n\t"
- " cas [%2], %%o2, %%o3\n\t"
- " cmp %%o2, %%o3\n\t"
- " bne 1b\n\t"
- " nop\n\t"
- " add %1, %%o2, %0\n\t"
- : "=r" (rv)
- : "r" (add_value), "r" (dest)
- : "memory", "o2", "o3");
- return rv;
-}
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- intptr_t rv;
-#ifdef _LP64
- __asm__ volatile(
- "1: \n\t"
- " ldx [%2], %%o2\n\t"
- " add %0, %%o2, %%o3\n\t"
- " casx [%2], %%o2, %%o3\n\t"
- " cmp %%o2, %%o3\n\t"
- " bne %%xcc, 1b\n\t"
- " nop\n\t"
- " add %0, %%o2, %0\n\t"
- : "=r" (rv)
- : "r" (add_value), "r" (dest)
- : "memory", "o2", "o3");
-#else //_LP64
- __asm__ volatile(
- "1: \n\t"
- " ld [%2], %%o2\n\t"
- " add %1, %%o2, %%o3\n\t"
- " cas [%2], %%o2, %%o3\n\t"
- " cmp %%o2, %%o3\n\t"
- " bne 1b\n\t"
- " nop\n\t"
- " add %1, %%o2, %0\n\t"
- : "=r" (rv)
- : "r" (add_value), "r" (dest)
- : "memory", "o2", "o3");
-#endif // _LP64
- return rv;
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)add_ptr((intptr_t)add_value, (volatile intptr_t*)dest);
-}
-
-
-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
- intptr_t rv = exchange_value;
- __asm__ volatile(
- " swap [%2],%1\n\t"
- : "=r" (rv)
- : "0" (exchange_value) /* we use same register as for return value */, "r" (dest)
- : "memory");
- return rv;
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
- intptr_t rv = exchange_value;
-#ifdef _LP64
- __asm__ volatile(
- "1:\n\t"
- " mov %1, %%o3\n\t"
- " ldx [%2], %%o2\n\t"
- " casx [%2], %%o2, %%o3\n\t"
- " cmp %%o2, %%o3\n\t"
- " bne %%xcc, 1b\n\t"
- " nop\n\t"
- " mov %%o2, %0\n\t"
- : "=r" (rv)
- : "r" (exchange_value), "r" (dest)
- : "memory", "o2", "o3");
-#else //_LP64
- __asm__ volatile(
- "swap [%2],%1\n\t"
- : "=r" (rv)
- : "0" (exchange_value) /* we use same register as for return value */, "r" (dest)
- : "memory");
-#endif // _LP64
- return rv;
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
-}
-
-
-inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
- jint rv;
- __asm__ volatile(
- " cas [%2], %3, %0"
- : "=r" (rv)
- : "0" (exchange_value), "r" (dest), "r" (compare_value)
- : "memory");
- return rv;
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
-#ifdef _LP64
- jlong rv;
- __asm__ volatile(
- " casx [%2], %3, %0"
- : "=r" (rv)
- : "0" (exchange_value), "r" (dest), "r" (compare_value)
- : "memory");
- return rv;
-#else //_LP64
- volatile jlong_accessor evl, cvl, rv;
- evl.long_value = exchange_value;
- cvl.long_value = compare_value;
-
- __asm__ volatile(
- " sllx %2, 32, %2\n\t"
- " srl %3, 0, %3\n\t"
- " or %2, %3, %2\n\t"
- " sllx %5, 32, %5\n\t"
- " srl %6, 0, %6\n\t"
- " or %5, %6, %5\n\t"
- " casx [%4], %5, %2\n\t"
- " srl %2, 0, %1\n\t"
- " srlx %2, 32, %0\n\t"
- : "=r" (rv.words[0]), "=r" (rv.words[1])
- : "r" (evl.words[0]), "r" (evl.words[1]), "r" (dest), "r" (cvl.words[0]), "r" (cvl.words[1])
- : "memory");
-
- return rv.long_value;
-#endif //_LP64
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- intptr_t rv;
-#ifdef _LP64
- __asm__ volatile(
- " casx [%2], %3, %0"
- : "=r" (rv)
- : "0" (exchange_value), "r" (dest), "r" (compare_value)
- : "memory");
-#else //_LP64
- __asm__ volatile(
- " cas [%2], %3, %0"
- : "=r" (rv)
- : "0" (exchange_value), "r" (dest), "r" (compare_value)
- : "memory");
-#endif // _LP64
- return rv;
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value, order);
-}
-
-#else // _GNU_SOURCE
-
-#if defined(COMPILER2) || defined(_LP64)
-
-// This is the interface to the atomic instructions in solaris_sparc.il.
-// It's very messy because we need to support v8 and these instructions
-// are illegal there. When sparc v8 is dropped, we can drop out lots of
-// this code. Also compiler2 does not support v8 so the conditional code
-// omits the instruction set check.
-
-extern "C" jint _Atomic_swap32(jint exchange_value, volatile jint* dest);
-extern "C" intptr_t _Atomic_swap64(intptr_t exchange_value, volatile intptr_t* dest);
-
-extern "C" jint _Atomic_cas32(jint exchange_value, volatile jint* dest, jint compare_value);
-extern "C" intptr_t _Atomic_cas64(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value);
-extern "C" jlong _Atomic_casl (jlong exchange_value, volatile jlong* dest, jlong compare_value);
-
-extern "C" jint _Atomic_add32(jint inc, volatile jint* dest);
-extern "C" intptr_t _Atomic_add64(intptr_t add_value, volatile intptr_t* dest);
-
-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
- return _Atomic_add32(add_value, dest);
-}
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
-#ifdef _LP64
- return _Atomic_add64(add_value, dest);
-#else //_LP64
- return _Atomic_add32(add_value, dest);
-#endif // _LP64
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)add_ptr((intptr_t)add_value, (volatile intptr_t*)dest);
-}
-
-
-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
- return _Atomic_swap32(exchange_value, dest);
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
-#ifdef _LP64
- return _Atomic_swap64(exchange_value, dest);
-#else // _LP64
- return _Atomic_swap32(exchange_value, dest);
-#endif // _LP64
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void*)xchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest);
-}
-
-
-inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
- return _Atomic_cas32(exchange_value, dest, compare_value);
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
-#ifdef _LP64
- // Return 64 bit value in %o0
- return _Atomic_cas64((intptr_t)exchange_value, (intptr_t *)dest, (intptr_t)compare_value);
-#else // _LP64
- // Return 64 bit value in %o0,%o1 by hand
- return _Atomic_casl(exchange_value, dest, compare_value);
-#endif // _LP64
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
-#ifdef _LP64
- return _Atomic_cas64(exchange_value, dest, compare_value);
-#else // _LP64
- return _Atomic_cas32(exchange_value, dest, compare_value);
-#endif // _LP64
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value, order);
-}
-
-
-#else // _LP64 || COMPILER2
-
-
-// 32-bit compiler1 only
-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
- return (*os::atomic_add_func)(add_value, dest);
-}
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- return (intptr_t)add((jint)add_value, (volatile jint*)dest);
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)add((jint)add_value, (volatile jint*)dest);
-}
-
-
-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
- return (*os::atomic_xchg_func)(exchange_value, dest);
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
- return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void*)xchg((jint)exchange_value, (volatile jint*)dest);
-}
-
-
-inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
- return (*os::atomic_cmpxchg_func)(exchange_value, dest, compare_value);
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
- return (*os::atomic_cmpxchg_long_func)(exchange_value, dest, compare_value);
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
-}
-
-#endif // _LP64 || COMPILER2
-
-#endif // _GNU_SOURCE
-
-#endif // OS_CPU_SOLARIS_SPARC_VM_ATOMIC_SOLARIS_SPARC_INLINE_HPP
--- a/hotspot/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/orderAccess_solaris_sparc.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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 @@
#ifndef OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP
#define OS_CPU_SOLARIS_SPARC_VM_ORDERACCESS_SOLARIS_SPARC_INLINE_HPP
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.hpp"
// Compiler version last used for testing: solaris studio 12u3
--- a/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/solaris_sparc/vm/os_solaris_sparc.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -274,8 +274,14 @@
// stack overflow handling
return false;
} else {
- *fr = os::fetch_frame_from_ucontext(thread, uc);
- *fr = frame(fr->sender_sp(), fr->sp());
+ // Returned frame will be the caller of the method that faults on the stack bang.
+ // Register window not yet rotated (happens at SAVE after stack bang), so there is no new
+ // frame to go with the faulting PC. Using caller SP that is still in SP, and caller PC
+ // that was written to O7 at call.
+ intptr_t* sp = os::Solaris::ucontext_get_sp(uc);
+ address pc = (address)uc->uc_mcontext.gregs[REG_O7];
+ *fr = frame(sp, frame::unpatchable, pc);
+
if (!fr->is_java_frame()) {
assert(fr->safe_for_sender(thread), "Safety check");
*fr = fr->java_sender();
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,278 @@
+/*
+ * Copyright (c) 1999, 2016, 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 OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP
+#define OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP
+
+#include "runtime/os.hpp"
+
+inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
+
+
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
+
+inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
+
+inline void Atomic::inc (volatile jint* dest) { (void)add (1, dest); }
+inline void Atomic::inc_ptr(volatile intptr_t* dest) { (void)add_ptr(1, dest); }
+inline void Atomic::inc_ptr(volatile void* dest) { (void)add_ptr(1, dest); }
+
+inline void Atomic::dec (volatile jint* dest) { (void)add (-1, dest); }
+inline void Atomic::dec_ptr(volatile intptr_t* dest) { (void)add_ptr(-1, dest); }
+inline void Atomic::dec_ptr(volatile void* dest) { (void)add_ptr(-1, dest); }
+
+// For Sun Studio - implementation is in solaris_x86_[32/64].il.
+// For gcc - implementation is just below.
+
+// The lock prefix can be omitted for certain instructions on uniprocessors; to
+// facilitate this, os::is_MP() is passed as an additional argument. 64-bit
+// processors are assumed to be multi-threaded and/or multi-core, so the extra
+// argument is unnecessary.
+#ifndef _LP64
+#define IS_MP_DECL() , int is_mp
+#define IS_MP_ARG() , (int) os::is_MP()
+#else
+#define IS_MP_DECL()
+#define IS_MP_ARG()
+#endif // _LP64
+
+extern "C" {
+ jint _Atomic_add(jint add_value, volatile jint* dest IS_MP_DECL());
+ jint _Atomic_xchg(jint exchange_value, volatile jint* dest);
+ jbyte _Atomic_cmpxchg_byte(jbyte exchange_value, volatile jbyte* dest,
+ jbyte compare_value IS_MP_DECL());
+ jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest,
+ jint compare_value IS_MP_DECL());
+ jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest,
+ jlong compare_value IS_MP_DECL());
+}
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+ return _Atomic_add(add_value, dest IS_MP_ARG());
+}
+
+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+ return _Atomic_xchg(exchange_value, dest);
+}
+
+#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
+ return _Atomic_cmpxchg_byte(exchange_value, dest, compare_value IS_MP_ARG());
+}
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
+ return _Atomic_cmpxchg(exchange_value, dest, compare_value IS_MP_ARG());
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+ return _Atomic_cmpxchg_long(exchange_value, dest, compare_value IS_MP_ARG());
+}
+
+
+#ifdef AMD64
+inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
+inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
+extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest);
+extern "C" jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest);
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest);
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest);
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ return (intptr_t)_Atomic_xchg_long((jlong)exchange_value, (volatile jlong*)dest);
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)_Atomic_xchg_long((jlong)exchange_value, (volatile jlong*)dest);
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
+}
+
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
+#else // !AMD64
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ return (intptr_t)add((jint)add_value, (volatile jint*)dest);
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)add((jint)add_value, (volatile jint*)dest);
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
+}
+
+extern "C" void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
+
+inline jlong Atomic::load(volatile jlong* src) {
+ volatile jlong dest;
+ _Atomic_move_long(src, &dest);
+ return dest;
+}
+
+inline void Atomic::store(jlong store_value, jlong* dest) {
+ _Atomic_move_long((volatile jlong*)&store_value, (volatile jlong*)dest);
+}
+
+inline void Atomic::store(jlong store_value, volatile jlong* dest) {
+ _Atomic_move_long((volatile jlong*)&store_value, dest);
+}
+
+#endif // AMD64
+
+#ifdef _GNU_SOURCE
+// Add a lock prefix to an instruction on an MP machine
+#define LOCK_IF_MP(mp) "cmp $0, " #mp "; je 1f; lock; 1: "
+
+extern "C" {
+ inline jint _Atomic_add(jint add_value, volatile jint* dest, int mp) {
+ jint addend = add_value;
+ __asm__ volatile ( LOCK_IF_MP(%3) "xaddl %0,(%2)"
+ : "=r" (addend)
+ : "0" (addend), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return addend + add_value;
+ }
+
+#ifdef AMD64
+ inline jlong _Atomic_add_long(jlong add_value, volatile jlong* dest, int mp) {
+ intptr_t addend = add_value;
+ __asm__ __volatile__ (LOCK_IF_MP(%3) "xaddq %0,(%2)"
+ : "=r" (addend)
+ : "0" (addend), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return addend + add_value;
+ }
+
+ inline jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest) {
+ __asm__ __volatile__ ("xchgq (%2),%0"
+ : "=r" (exchange_value)
+ : "0" (exchange_value), "r" (dest)
+ : "memory");
+ return exchange_value;
+ }
+
+#endif // AMD64
+
+ inline jint _Atomic_xchg(jint exchange_value, volatile jint* dest) {
+ __asm__ __volatile__ ("xchgl (%2),%0"
+ : "=r" (exchange_value)
+ : "0" (exchange_value), "r" (dest)
+ : "memory");
+ return exchange_value;
+ }
+
+ inline jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, int mp) {
+ __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
+ : "=a" (exchange_value)
+ : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+ }
+
+
+ inline jbyte _Atomic_cmpxchg_byte(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, int mp) {
+ __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgb %1,(%3)"
+ : "=a" (exchange_value)
+ : "q" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+ }
+
+ // This is the interface to the atomic instruction in solaris_i486.s.
+ jlong _Atomic_cmpxchg_long_gcc(jlong exchange_value, volatile jlong* dest, jlong compare_value, int mp);
+
+ inline jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, jlong compare_value, int mp) {
+#ifdef AMD64
+ __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
+ : "=a" (exchange_value)
+ : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
+ : "cc", "memory");
+ return exchange_value;
+#else
+ return _Atomic_cmpxchg_long_gcc(exchange_value, dest, compare_value, os::is_MP());
+
+ #if 0
+ // The code below does not work presumably because of the bug in gcc
+ // The error message says:
+ // can't find a register in class BREG while reloading asm
+ // However I want to save this code and later replace _Atomic_cmpxchg_long_gcc
+ // with such inline asm code:
+
+ volatile jlong_accessor evl, cvl, rv;
+ evl.long_value = exchange_value;
+ cvl.long_value = compare_value;
+ int mp = os::is_MP();
+
+ __asm__ volatile ("cmp $0, %%esi\n\t"
+ "je 1f \n\t"
+ "lock\n\t"
+ "1: cmpxchg8b (%%edi)\n\t"
+ : "=a"(cvl.words[0]), "=d"(cvl.words[1])
+ : "a"(cvl.words[0]), "d"(cvl.words[1]),
+ "b"(evl.words[0]), "c"(evl.words[1]),
+ "D"(dest), "S"(mp)
+ : "cc", "memory");
+ return cvl.long_value;
+ #endif // if 0
+#endif // AMD64
+ }
+}
+#undef LOCK_IF_MP
+
+#endif // _GNU_SOURCE
+
+#endif // OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_HPP
--- a/hotspot/src/os_cpu/solaris_x86/vm/atomic_solaris_x86.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,279 +0,0 @@
-/*
- * Copyright (c) 1999, 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.
- *
- */
-
-#ifndef OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_INLINE_HPP
-#define OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-
-inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
-
-
-inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
-
-inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
-
-inline void Atomic::inc (volatile jint* dest) { (void)add (1, dest); }
-inline void Atomic::inc_ptr(volatile intptr_t* dest) { (void)add_ptr(1, dest); }
-inline void Atomic::inc_ptr(volatile void* dest) { (void)add_ptr(1, dest); }
-
-inline void Atomic::dec (volatile jint* dest) { (void)add (-1, dest); }
-inline void Atomic::dec_ptr(volatile intptr_t* dest) { (void)add_ptr(-1, dest); }
-inline void Atomic::dec_ptr(volatile void* dest) { (void)add_ptr(-1, dest); }
-
-// For Sun Studio - implementation is in solaris_x86_[32/64].il.
-// For gcc - implementation is just below.
-
-// The lock prefix can be omitted for certain instructions on uniprocessors; to
-// facilitate this, os::is_MP() is passed as an additional argument. 64-bit
-// processors are assumed to be multi-threaded and/or multi-core, so the extra
-// argument is unnecessary.
-#ifndef _LP64
-#define IS_MP_DECL() , int is_mp
-#define IS_MP_ARG() , (int) os::is_MP()
-#else
-#define IS_MP_DECL()
-#define IS_MP_ARG()
-#endif // _LP64
-
-extern "C" {
- jint _Atomic_add(jint add_value, volatile jint* dest IS_MP_DECL());
- jint _Atomic_xchg(jint exchange_value, volatile jint* dest);
- jbyte _Atomic_cmpxchg_byte(jbyte exchange_value, volatile jbyte* dest,
- jbyte compare_value IS_MP_DECL());
- jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest,
- jint compare_value IS_MP_DECL());
- jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest,
- jlong compare_value IS_MP_DECL());
-}
-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
- return _Atomic_add(add_value, dest IS_MP_ARG());
-}
-
-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
- return _Atomic_xchg(exchange_value, dest);
-}
-
-#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
- return _Atomic_cmpxchg_byte(exchange_value, dest, compare_value IS_MP_ARG());
-}
-
-inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
- return _Atomic_cmpxchg(exchange_value, dest, compare_value IS_MP_ARG());
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
- return _Atomic_cmpxchg_long(exchange_value, dest, compare_value IS_MP_ARG());
-}
-
-
-#ifdef AMD64
-inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
-inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
-extern "C" jlong _Atomic_add_long(jlong add_value, volatile jlong* dest);
-extern "C" jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest);
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- return (intptr_t)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest);
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)_Atomic_add_long((jlong)add_value, (volatile jlong*)dest);
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
- return (intptr_t)_Atomic_xchg_long((jlong)exchange_value, (volatile jlong*)dest);
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void*)_Atomic_xchg_long((jlong)exchange_value, (volatile jlong*)dest);
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)_Atomic_cmpxchg_long((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value);
-}
-
-inline jlong Atomic::load(volatile jlong* src) { return *src; }
-
-#else // !AMD64
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- return (intptr_t)add((jint)add_value, (volatile jint*)dest);
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)add((jint)add_value, (volatile jint*)dest);
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
- return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void*)xchg((jint)exchange_value, (volatile jint*)dest);
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
-}
-
-extern "C" void _Atomic_move_long(volatile jlong* src, volatile jlong* dst);
-
-inline jlong Atomic::load(volatile jlong* src) {
- volatile jlong dest;
- _Atomic_move_long(src, &dest);
- return dest;
-}
-
-inline void Atomic::store(jlong store_value, jlong* dest) {
- _Atomic_move_long((volatile jlong*)&store_value, (volatile jlong*)dest);
-}
-
-inline void Atomic::store(jlong store_value, volatile jlong* dest) {
- _Atomic_move_long((volatile jlong*)&store_value, dest);
-}
-
-#endif // AMD64
-
-#ifdef _GNU_SOURCE
-// Add a lock prefix to an instruction on an MP machine
-#define LOCK_IF_MP(mp) "cmp $0, " #mp "; je 1f; lock; 1: "
-
-extern "C" {
- inline jint _Atomic_add(jint add_value, volatile jint* dest, int mp) {
- jint addend = add_value;
- __asm__ volatile ( LOCK_IF_MP(%3) "xaddl %0,(%2)"
- : "=r" (addend)
- : "0" (addend), "r" (dest), "r" (mp)
- : "cc", "memory");
- return addend + add_value;
- }
-
-#ifdef AMD64
- inline jlong _Atomic_add_long(jlong add_value, volatile jlong* dest, int mp) {
- intptr_t addend = add_value;
- __asm__ __volatile__ (LOCK_IF_MP(%3) "xaddq %0,(%2)"
- : "=r" (addend)
- : "0" (addend), "r" (dest), "r" (mp)
- : "cc", "memory");
- return addend + add_value;
- }
-
- inline jlong _Atomic_xchg_long(jlong exchange_value, volatile jlong* dest) {
- __asm__ __volatile__ ("xchgq (%2),%0"
- : "=r" (exchange_value)
- : "0" (exchange_value), "r" (dest)
- : "memory");
- return exchange_value;
- }
-
-#endif // AMD64
-
- inline jint _Atomic_xchg(jint exchange_value, volatile jint* dest) {
- __asm__ __volatile__ ("xchgl (%2),%0"
- : "=r" (exchange_value)
- : "0" (exchange_value), "r" (dest)
- : "memory");
- return exchange_value;
- }
-
- inline jint _Atomic_cmpxchg(jint exchange_value, volatile jint* dest, jint compare_value, int mp) {
- __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgl %1,(%3)"
- : "=a" (exchange_value)
- : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
- : "cc", "memory");
- return exchange_value;
- }
-
-
- inline jbyte _Atomic_cmpxchg_byte(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, int mp) {
- __asm__ volatile (LOCK_IF_MP(%4) "cmpxchgb %1,(%3)"
- : "=a" (exchange_value)
- : "q" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
- : "cc", "memory");
- return exchange_value;
- }
-
- // This is the interface to the atomic instruction in solaris_i486.s.
- jlong _Atomic_cmpxchg_long_gcc(jlong exchange_value, volatile jlong* dest, jlong compare_value, int mp);
-
- inline jlong _Atomic_cmpxchg_long(jlong exchange_value, volatile jlong* dest, jlong compare_value, int mp) {
-#ifdef AMD64
- __asm__ __volatile__ (LOCK_IF_MP(%4) "cmpxchgq %1,(%3)"
- : "=a" (exchange_value)
- : "r" (exchange_value), "a" (compare_value), "r" (dest), "r" (mp)
- : "cc", "memory");
- return exchange_value;
-#else
- return _Atomic_cmpxchg_long_gcc(exchange_value, dest, compare_value, os::is_MP());
-
- #if 0
- // The code below does not work presumably because of the bug in gcc
- // The error message says:
- // can't find a register in class BREG while reloading asm
- // However I want to save this code and later replace _Atomic_cmpxchg_long_gcc
- // with such inline asm code:
-
- volatile jlong_accessor evl, cvl, rv;
- evl.long_value = exchange_value;
- cvl.long_value = compare_value;
- int mp = os::is_MP();
-
- __asm__ volatile ("cmp $0, %%esi\n\t"
- "je 1f \n\t"
- "lock\n\t"
- "1: cmpxchg8b (%%edi)\n\t"
- : "=a"(cvl.words[0]), "=d"(cvl.words[1])
- : "a"(cvl.words[0]), "d"(cvl.words[1]),
- "b"(evl.words[0]), "c"(evl.words[1]),
- "D"(dest), "S"(mp)
- : "cc", "memory");
- return cvl.long_value;
- #endif // if 0
-#endif // AMD64
- }
-}
-#undef LOCK_IF_MP
-
-#endif // _GNU_SOURCE
-
-#endif // OS_CPU_SOLARIS_X86_VM_ATOMIC_SOLARIS_X86_INLINE_HPP
--- a/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/solaris_x86/vm/orderAccess_solaris_x86.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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 @@
#ifndef OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP
#define OS_CPU_SOLARIS_X86_VM_ORDERACCESS_SOLARIS_X86_INLINE_HPP
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.hpp"
#include "runtime/os.hpp"
--- a/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/solaris_x86/vm/os_solaris_x86.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -38,7 +38,7 @@
#include "prims/jvm.h"
#include "prims/jvm_misc.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/extendedPC.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/interfaceSupport.hpp"
--- a/hotspot/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/solaris_x86/vm/thread_solaris_x86.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -45,9 +45,8 @@
assert(this->is_Java_thread(), "must be JavaThread");
JavaThread* jt = (JavaThread *)this;
- // last_Java_frame is always walkable and safe use it if we have it
-
- if (jt->has_last_Java_frame()) {
+ // There is small window where last_Java_frame is not walkable or safe
+ if (jt->has_last_Java_frame() && jt->frame_anchor()->walkable()) {
*fr_addr = jt->pd_last_frame();
return true;
}
--- a/hotspot/src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/solaris_x86/vm/thread_solaris_x86.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -30,12 +30,8 @@
frame pd_last_frame() {
assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
- if (_anchor.last_Java_pc() != NULL) {
- return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
- } else {
- // This will pick up pc from sp
- return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp());
- }
+ vmassert(_anchor.last_Java_pc() != NULL, "not walkable");
+ return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
}
public:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,303 @@
+/*
+ * Copyright (c) 1999, 2016, 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 OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP
+#define OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP
+
+#include "runtime/os.hpp"
+
+// The following alternative implementations are needed because
+// Windows 95 doesn't support (some of) the corresponding Windows NT
+// calls. Furthermore, these versions allow inlining in the caller.
+// (More precisely: The documentation for InterlockedExchange says
+// it is supported for Windows 95. However, when single-stepping
+// through the assembly code we cannot step into the routine and
+// when looking at the routine address we see only garbage code.
+// Better safe then sorry!). Was bug 7/31/98 (gri).
+//
+// Performance note: On uniprocessors, the 'lock' prefixes are not
+// necessary (and expensive). We should generate separate cases if
+// this becomes a performance problem.
+
+#pragma warning(disable: 4035) // Disables warnings reporting missing return statement
+
+inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
+
+inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
+
+inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
+inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
+inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
+
+
+inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
+inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
+
+// Adding a lock prefix to an instruction on MP machine
+// VC++ doesn't like the lock prefix to be on a single line
+// so we can't insert a label after the lock prefix.
+// By emitting a lock prefix, we can define a label after it.
+#define LOCK_IF_MP(mp) __asm cmp mp, 0 \
+ __asm je L0 \
+ __asm _emit 0xF0 \
+ __asm L0:
+
+#ifdef AMD64
+inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
+inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+ return (jint)(*os::atomic_add_func)(add_value, dest);
+}
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ return (intptr_t)(*os::atomic_add_ptr_func)(add_value, dest);
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)(*os::atomic_add_ptr_func)(add_value, (volatile intptr_t*)dest);
+}
+
+inline void Atomic::inc (volatile jint* dest) {
+ (void)add (1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ (void)add_ptr(1, dest);
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+ (void)add_ptr(1, dest);
+}
+
+inline void Atomic::dec (volatile jint* dest) {
+ (void)add (-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ (void)add_ptr(-1, dest);
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+ (void)add_ptr(-1, dest);
+}
+
+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+ return (jint)(*os::atomic_xchg_func)(exchange_value, dest);
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ return (intptr_t)(os::atomic_xchg_ptr_func)(exchange_value, dest);
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void *)(os::atomic_xchg_ptr_func)((intptr_t)exchange_value, (volatile intptr_t*)dest);
+}
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
+ return (*os::atomic_cmpxchg_func)(exchange_value, dest, compare_value);
+}
+
+#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
+ return (*os::atomic_cmpxchg_byte_func)(exchange_value, dest, compare_value);
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+ return (*os::atomic_cmpxchg_long_func)(exchange_value, dest, compare_value);
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
+}
+
+inline jlong Atomic::load(volatile jlong* src) { return *src; }
+
+#else // !AMD64
+
+inline jint Atomic::add (jint add_value, volatile jint* dest) {
+ int mp = os::is_MP();
+ __asm {
+ mov edx, dest;
+ mov eax, add_value;
+ mov ecx, eax;
+ LOCK_IF_MP(mp)
+ xadd dword ptr [edx], eax;
+ add eax, ecx;
+ }
+}
+
+inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
+ return (intptr_t)add((jint)add_value, (volatile jint*)dest);
+}
+
+inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
+ return (void*)add((jint)add_value, (volatile jint*)dest);
+}
+
+inline void Atomic::inc (volatile jint* dest) {
+ // alternative for InterlockedIncrement
+ int mp = os::is_MP();
+ __asm {
+ mov edx, dest;
+ LOCK_IF_MP(mp)
+ add dword ptr [edx], 1;
+ }
+}
+
+inline void Atomic::inc_ptr(volatile intptr_t* dest) {
+ inc((volatile jint*)dest);
+}
+
+inline void Atomic::inc_ptr(volatile void* dest) {
+ inc((volatile jint*)dest);
+}
+
+inline void Atomic::dec (volatile jint* dest) {
+ // alternative for InterlockedDecrement
+ int mp = os::is_MP();
+ __asm {
+ mov edx, dest;
+ LOCK_IF_MP(mp)
+ sub dword ptr [edx], 1;
+ }
+}
+
+inline void Atomic::dec_ptr(volatile intptr_t* dest) {
+ dec((volatile jint*)dest);
+}
+
+inline void Atomic::dec_ptr(volatile void* dest) {
+ dec((volatile jint*)dest);
+}
+
+inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
+ // alternative for InterlockedExchange
+ __asm {
+ mov eax, exchange_value;
+ mov ecx, dest;
+ xchg eax, dword ptr [ecx];
+ }
+}
+
+inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
+ return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
+ return (void*)xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
+ // alternative for InterlockedCompareExchange
+ int mp = os::is_MP();
+ __asm {
+ mov edx, dest
+ mov cl, exchange_value
+ mov al, compare_value
+ LOCK_IF_MP(mp)
+ cmpxchg byte ptr [edx], cl
+ }
+}
+
+inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
+ // alternative for InterlockedCompareExchange
+ int mp = os::is_MP();
+ __asm {
+ mov edx, dest
+ mov ecx, exchange_value
+ mov eax, compare_value
+ LOCK_IF_MP(mp)
+ cmpxchg dword ptr [edx], ecx
+ }
+}
+
+inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
+ int mp = os::is_MP();
+ jint ex_lo = (jint)exchange_value;
+ jint ex_hi = *( ((jint*)&exchange_value) + 1 );
+ jint cmp_lo = (jint)compare_value;
+ jint cmp_hi = *( ((jint*)&compare_value) + 1 );
+ __asm {
+ push ebx
+ push edi
+ mov eax, cmp_lo
+ mov edx, cmp_hi
+ mov edi, dest
+ mov ebx, ex_lo
+ mov ecx, ex_hi
+ LOCK_IF_MP(mp)
+ cmpxchg8b qword ptr [edi]
+ pop edi
+ pop ebx
+ }
+}
+
+inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
+ return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
+}
+
+inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
+ return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
+}
+
+inline jlong Atomic::load(volatile jlong* src) {
+ volatile jlong dest;
+ volatile jlong* pdest = &dest;
+ __asm {
+ mov eax, src
+ fild qword ptr [eax]
+ mov eax, pdest
+ fistp qword ptr [eax]
+ }
+ return dest;
+}
+
+inline void Atomic::store(jlong store_value, volatile jlong* dest) {
+ volatile jlong* src = &store_value;
+ __asm {
+ mov eax, src
+ fild qword ptr [eax]
+ mov eax, dest
+ fistp qword ptr [eax]
+ }
+}
+
+inline void Atomic::store(jlong store_value, jlong* dest) {
+ Atomic::store(store_value, (volatile jlong*)dest);
+}
+
+#endif // AMD64
+
+#pragma warning(default: 4035) // Enables warnings reporting missing return statement
+
+#endif // OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_HPP
--- a/hotspot/src/os_cpu/windows_x86/vm/atomic_windows_x86.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,304 +0,0 @@
-/*
- * Copyright (c) 1999, 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.
- *
- */
-
-#ifndef OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP
-#define OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "runtime/os.hpp"
-
-// The following alternative implementations are needed because
-// Windows 95 doesn't support (some of) the corresponding Windows NT
-// calls. Furthermore, these versions allow inlining in the caller.
-// (More precisely: The documentation for InterlockedExchange says
-// it is supported for Windows 95. However, when single-stepping
-// through the assembly code we cannot step into the routine and
-// when looking at the routine address we see only garbage code.
-// Better safe then sorry!). Was bug 7/31/98 (gri).
-//
-// Performance note: On uniprocessors, the 'lock' prefixes are not
-// necessary (and expensive). We should generate separate cases if
-// this becomes a performance problem.
-
-#pragma warning(disable: 4035) // Disables warnings reporting missing return statement
-
-inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, jint* dest) { *dest = store_value; }
-
-inline void Atomic::store_ptr(intptr_t store_value, intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, void* dest) { *(void**)dest = store_value; }
-
-inline void Atomic::store (jbyte store_value, volatile jbyte* dest) { *dest = store_value; }
-inline void Atomic::store (jshort store_value, volatile jshort* dest) { *dest = store_value; }
-inline void Atomic::store (jint store_value, volatile jint* dest) { *dest = store_value; }
-
-
-inline void Atomic::store_ptr(intptr_t store_value, volatile intptr_t* dest) { *dest = store_value; }
-inline void Atomic::store_ptr(void* store_value, volatile void* dest) { *(void* volatile *)dest = store_value; }
-
-// Adding a lock prefix to an instruction on MP machine
-// VC++ doesn't like the lock prefix to be on a single line
-// so we can't insert a label after the lock prefix.
-// By emitting a lock prefix, we can define a label after it.
-#define LOCK_IF_MP(mp) __asm cmp mp, 0 \
- __asm je L0 \
- __asm _emit 0xF0 \
- __asm L0:
-
-#ifdef AMD64
-inline void Atomic::store (jlong store_value, jlong* dest) { *dest = store_value; }
-inline void Atomic::store (jlong store_value, volatile jlong* dest) { *dest = store_value; }
-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
- return (jint)(*os::atomic_add_func)(add_value, dest);
-}
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- return (intptr_t)(*os::atomic_add_ptr_func)(add_value, dest);
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)(*os::atomic_add_ptr_func)(add_value, (volatile intptr_t*)dest);
-}
-
-inline void Atomic::inc (volatile jint* dest) {
- (void)add (1, dest);
-}
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest) {
- (void)add_ptr(1, dest);
-}
-
-inline void Atomic::inc_ptr(volatile void* dest) {
- (void)add_ptr(1, dest);
-}
-
-inline void Atomic::dec (volatile jint* dest) {
- (void)add (-1, dest);
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest) {
- (void)add_ptr(-1, dest);
-}
-
-inline void Atomic::dec_ptr(volatile void* dest) {
- (void)add_ptr(-1, dest);
-}
-
-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
- return (jint)(*os::atomic_xchg_func)(exchange_value, dest);
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
- return (intptr_t)(os::atomic_xchg_ptr_func)(exchange_value, dest);
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void *)(os::atomic_xchg_ptr_func)((intptr_t)exchange_value, (volatile intptr_t*)dest);
-}
-
-inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
- return (*os::atomic_cmpxchg_func)(exchange_value, dest, compare_value);
-}
-
-#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
- return (*os::atomic_cmpxchg_byte_func)(exchange_value, dest, compare_value);
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
- return (*os::atomic_cmpxchg_long_func)(exchange_value, dest, compare_value);
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg((jlong)exchange_value, (volatile jlong*)dest, (jlong)compare_value, order);
-}
-
-inline jlong Atomic::load(volatile jlong* src) { return *src; }
-
-#else // !AMD64
-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
- int mp = os::is_MP();
- __asm {
- mov edx, dest;
- mov eax, add_value;
- mov ecx, eax;
- LOCK_IF_MP(mp)
- xadd dword ptr [edx], eax;
- add eax, ecx;
- }
-}
-
-inline intptr_t Atomic::add_ptr(intptr_t add_value, volatile intptr_t* dest) {
- return (intptr_t)add((jint)add_value, (volatile jint*)dest);
-}
-
-inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
- return (void*)add((jint)add_value, (volatile jint*)dest);
-}
-
-inline void Atomic::inc (volatile jint* dest) {
- // alternative for InterlockedIncrement
- int mp = os::is_MP();
- __asm {
- mov edx, dest;
- LOCK_IF_MP(mp)
- add dword ptr [edx], 1;
- }
-}
-
-inline void Atomic::inc_ptr(volatile intptr_t* dest) {
- inc((volatile jint*)dest);
-}
-
-inline void Atomic::inc_ptr(volatile void* dest) {
- inc((volatile jint*)dest);
-}
-
-inline void Atomic::dec (volatile jint* dest) {
- // alternative for InterlockedDecrement
- int mp = os::is_MP();
- __asm {
- mov edx, dest;
- LOCK_IF_MP(mp)
- sub dword ptr [edx], 1;
- }
-}
-
-inline void Atomic::dec_ptr(volatile intptr_t* dest) {
- dec((volatile jint*)dest);
-}
-
-inline void Atomic::dec_ptr(volatile void* dest) {
- dec((volatile jint*)dest);
-}
-
-inline jint Atomic::xchg (jint exchange_value, volatile jint* dest) {
- // alternative for InterlockedExchange
- __asm {
- mov eax, exchange_value;
- mov ecx, dest;
- xchg eax, dword ptr [ecx];
- }
-}
-
-inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest) {
- return (intptr_t)xchg((jint)exchange_value, (volatile jint*)dest);
-}
-
-inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
- return (void*)xchg((jint)exchange_value, (volatile jint*)dest);
-}
-
-#define VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-inline jbyte Atomic::cmpxchg (jbyte exchange_value, volatile jbyte* dest, jbyte compare_value, cmpxchg_memory_order order) {
- // alternative for InterlockedCompareExchange
- int mp = os::is_MP();
- __asm {
- mov edx, dest
- mov cl, exchange_value
- mov al, compare_value
- LOCK_IF_MP(mp)
- cmpxchg byte ptr [edx], cl
- }
-}
-
-inline jint Atomic::cmpxchg (jint exchange_value, volatile jint* dest, jint compare_value, cmpxchg_memory_order order) {
- // alternative for InterlockedCompareExchange
- int mp = os::is_MP();
- __asm {
- mov edx, dest
- mov ecx, exchange_value
- mov eax, compare_value
- LOCK_IF_MP(mp)
- cmpxchg dword ptr [edx], ecx
- }
-}
-
-inline jlong Atomic::cmpxchg (jlong exchange_value, volatile jlong* dest, jlong compare_value, cmpxchg_memory_order order) {
- int mp = os::is_MP();
- jint ex_lo = (jint)exchange_value;
- jint ex_hi = *( ((jint*)&exchange_value) + 1 );
- jint cmp_lo = (jint)compare_value;
- jint cmp_hi = *( ((jint*)&compare_value) + 1 );
- __asm {
- push ebx
- push edi
- mov eax, cmp_lo
- mov edx, cmp_hi
- mov edi, dest
- mov ebx, ex_lo
- mov ecx, ex_hi
- LOCK_IF_MP(mp)
- cmpxchg8b qword ptr [edi]
- pop edi
- pop ebx
- }
-}
-
-inline intptr_t Atomic::cmpxchg_ptr(intptr_t exchange_value, volatile intptr_t* dest, intptr_t compare_value, cmpxchg_memory_order order) {
- return (intptr_t)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
-}
-
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order) {
- return (void*)cmpxchg((jint)exchange_value, (volatile jint*)dest, (jint)compare_value, order);
-}
-
-inline jlong Atomic::load(volatile jlong* src) {
- volatile jlong dest;
- volatile jlong* pdest = &dest;
- __asm {
- mov eax, src
- fild qword ptr [eax]
- mov eax, pdest
- fistp qword ptr [eax]
- }
- return dest;
-}
-
-inline void Atomic::store(jlong store_value, volatile jlong* dest) {
- volatile jlong* src = &store_value;
- __asm {
- mov eax, src
- fild qword ptr [eax]
- mov eax, dest
- fistp qword ptr [eax]
- }
-}
-
-inline void Atomic::store(jlong store_value, jlong* dest) {
- Atomic::store(store_value, (volatile jlong*)dest);
-}
-
-#endif // AMD64
-
-#pragma warning(default: 4035) // Enables warnings reporting missing return statement
-
-#endif // OS_CPU_WINDOWS_X86_VM_ATOMIC_WINDOWS_X86_INLINE_HPP
--- a/hotspot/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/windows_x86/vm/orderAccess_windows_x86.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
#define OS_CPU_WINDOWS_X86_VM_ORDERACCESS_WINDOWS_X86_INLINE_HPP
#include <intrin.h>
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.hpp"
#include "runtime/os.hpp"
--- a/hotspot/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/windows_x86/vm/thread_windows_x86.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -48,7 +48,7 @@
// If we have a last_Java_frame, then we should use it even if
// isInJava == true. It should be more reliable than CONTEXT info.
- if (jt->has_last_Java_frame()) {
+ if (jt->has_last_Java_frame() && jt->frame_anchor()->walkable()) {
*fr_addr = jt->pd_last_frame();
return true;
}
--- a/hotspot/src/os_cpu/windows_x86/vm/thread_windows_x86.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/os_cpu/windows_x86/vm/thread_windows_x86.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -32,12 +32,8 @@
frame pd_last_frame() {
assert(has_last_Java_frame(), "must have last_Java_sp() when suspended");
- if (_anchor.last_Java_pc() != NULL) {
- return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
- } else {
- // This will pick up pc from sp
- return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp());
- }
+ vmassert(_anchor.last_Java_pc() != NULL, "not walkable");
+ return frame(_anchor.last_Java_sp(), _anchor.last_Java_fp(), _anchor.last_Java_pc());
}
public:
--- a/hotspot/src/share/vm/asm/assembler.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/asm/assembler.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
#include "asm/codeBuffer.hpp"
#include "asm/macroAssembler.hpp"
#include "asm/macroAssembler.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/icache.hpp"
#include "runtime/os.hpp"
#include "runtime/thread.hpp"
--- a/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/c1/c1_GraphBuilder.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -4255,7 +4255,7 @@
#if INCLUDE_TRACE
EventCompilerInlining event;
if (event.should_commit()) {
- event.set_compileID(compilation()->env()->task()->compile_id());
+ event.set_compileId(compilation()->env()->task()->compile_id());
event.set_message(msg);
event.set_succeeded(success);
event.set_bci(bci());
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -49,7 +49,7 @@
#include "memory/resourceArea.hpp"
#include "oops/objArrayKlass.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/compilationPolicy.hpp"
#include "runtime/interfaceSupport.hpp"
--- a/hotspot/src/share/vm/ci/ciEnv.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/ci/ciEnv.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1149,10 +1149,10 @@
void ciEnv::report_failure(const char* reason) {
// Create and fire JFR event
- EventCompilerFailure event;
+ EventCompilationFailure event;
if (event.should_commit()) {
- event.set_compileID(compile_id());
- event.set_failure(reason);
+ event.set_compileId(compile_id());
+ event.set_failureMessage(reason);
event.commit();
}
}
--- a/hotspot/src/share/vm/ci/ciMethod.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/ci/ciMethod.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1410,11 +1410,11 @@
}
#if INCLUDE_TRACE
-TraceStructCiMethod ciMethod::to_trace_struct() const {
- TraceStructCiMethod result;
- result.set_class(holder()->name()->as_utf8());
+TraceStructCalleeMethod ciMethod::to_trace_struct() const {
+ TraceStructCalleeMethod result;
+ result.set_type(holder()->name()->as_utf8());
result.set_name(name()->as_utf8());
- result.set_signature(signature()->as_symbol()->as_utf8());
+ result.set_descriptor(signature()->as_symbol()->as_utf8());
return result;
}
#endif
--- a/hotspot/src/share/vm/ci/ciMethod.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/ci/ciMethod.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -342,7 +342,7 @@
void print_short_name(outputStream* st = tty);
#if INCLUDE_TRACE
- TraceStructCiMethod to_trace_struct() const;
+ TraceStructCalleeMethod to_trace_struct() const;
#endif
};
--- a/hotspot/src/share/vm/classfile/classFileParser.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/classfile/classFileParser.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -5844,6 +5844,7 @@
_super_klass,
_methods,
_access_flags,
+ _major_version,
_loader_data->class_loader(),
_class_name,
_local_interfaces,
--- a/hotspot/src/share/vm/classfile/classLoaderData.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/classfile/classLoaderData.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -63,7 +63,7 @@
#include "memory/resourceArea.hpp"
#include "oops/objArrayOop.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/javaCalls.hpp"
#include "runtime/jniHandles.hpp"
#include "runtime/mutex.hpp"
--- a/hotspot/src/share/vm/classfile/klassFactory.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/classfile/klassFactory.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -31,12 +31,12 @@
#include "prims/jvmtiEnvBase.hpp"
#include "trace/traceMacros.hpp"
-static ClassFileStream* prologue(ClassFileStream* stream,
- Symbol* name,
- ClassLoaderData* loader_data,
- Handle protection_domain,
- JvmtiCachedClassFileData** cached_class_file,
- TRAPS) {
+static ClassFileStream* check_class_file_load_hook(ClassFileStream* stream,
+ Symbol* name,
+ ClassLoaderData* loader_data,
+ Handle protection_domain,
+ JvmtiCachedClassFileData** cached_class_file,
+ TRAPS) {
assert(stream != NULL, "invariant");
@@ -102,8 +102,6 @@
assert(loader_data != NULL, "invariant");
assert(THREAD->is_Java_thread(), "must be a JavaThread");
- bool changed_by_loadhook = false;
-
ResourceMark rm;
HandleMark hm;
@@ -111,12 +109,15 @@
ClassFileStream* old_stream = stream;
- stream = prologue(stream,
- name,
- loader_data,
- protection_domain,
- &cached_class_file,
- CHECK_NULL);
+ // Skip this processing for VM anonymous classes
+ if (host_klass == NULL) {
+ stream = check_class_file_load_hook(stream,
+ name,
+ loader_data,
+ protection_domain,
+ &cached_class_file,
+ CHECK_NULL);
+ }
ClassFileParser parser(stream,
name,
--- a/hotspot/src/share/vm/classfile/stringTable.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/classfile/stringTable.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -34,7 +34,7 @@
#include "memory/filemap.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/mutexLocker.hpp"
#include "utilities/hashtable.inline.hpp"
#include "utilities/macros.hpp"
--- a/hotspot/src/share/vm/classfile/symbolTable.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/classfile/symbolTable.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -34,7 +34,7 @@
#include "memory/filemap.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/mutexLocker.hpp"
#include "utilities/hashtable.inline.hpp"
--- a/hotspot/src/share/vm/classfile/systemDictionary.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/classfile/systemDictionary.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1641,7 +1641,6 @@
JvmtiExport::post_class_load((JavaThread *) THREAD, k());
}
- TRACE_KLASS_DEFINITION(k, THREAD);
class_define_event(k);
}
--- a/hotspot/src/share/vm/code/nmethod.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/code/nmethod.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -41,7 +41,7 @@
#include "oops/methodData.hpp"
#include "oops/oop.inline.hpp"
#include "prims/jvmtiImpl.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "runtime/os.hpp"
#include "runtime/sharedRuntime.hpp"
--- a/hotspot/src/share/vm/compiler/compileBroker.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/compiler/compileBroker.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -42,7 +42,7 @@
#include "prims/nativeLookup.hpp"
#include "prims/whitebox.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/compilationPolicy.hpp"
#include "runtime/init.hpp"
#include "runtime/interfaceSupport.hpp"
@@ -1755,7 +1755,7 @@
assert(task->compile_id() != CICrashAt, "just as planned");
if (event.should_commit()) {
event.set_method(task->method());
- event.set_compileID(task->compile_id());
+ event.set_compileId(task->compile_id());
event.set_compileLevel(task->comp_level());
event.set_succeded(task->is_success());
event.set_isOsr(task->osr_bci() != CompileBroker::standard_entry_bci);
@@ -2399,4 +2399,3 @@
}
}
}
-
--- a/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/cms/concurrentMarkSweepGeneration.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -61,7 +61,7 @@
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
#include "prims/jvmtiExport.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/globals_extension.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/java.hpp"
--- a/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -50,7 +50,7 @@
#include "memory/resourceArea.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/handles.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/java.hpp"
--- a/hotspot/src/share/vm/gc/g1/collectionSetChooser.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/collectionSetChooser.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
#include "gc/g1/collectionSetChooser.hpp"
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/shared/space.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
// Even though we don't use the GC efficiency in our heuristics as
// much as we used to, we still order according to GC efficiency. This
--- a/hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/heapRegionRemSet.hpp"
#include "gc/shared/workgroup.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/thread.inline.hpp"
--- a/hotspot/src/share/vm/gc/g1/g1CardLiveData.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1CardLiveData.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -30,7 +30,7 @@
#include "gc/shared/workgroup.hpp"
#include "logging/log.hpp"
#include "memory/universe.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/globals.hpp"
#include "runtime/os.hpp"
#include "utilities/bitMap.inline.hpp"
--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -74,7 +74,7 @@
#include "memory/iterator.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/init.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "runtime/vmThread.hpp"
--- a/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -52,7 +52,7 @@
#include "memory/allocation.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/java.hpp"
#include "runtime/prefetch.inline.hpp"
--- a/hotspot/src/share/vm/gc/g1/g1EvacStats.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1EvacStats.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
#define SHARE_VM_GC_G1_G1EVACSTATS_INLINE_HPP
#include "gc/g1/g1EvacStats.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
inline void G1EvacStats::add_direct_allocated(size_t value) {
Atomic::add_ptr(value, &_direct_allocated);
--- a/hotspot/src/share/vm/gc/g1/g1HotCardCache.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1HotCardCache.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
#include "gc/g1/dirtyCardQueue.hpp"
#include "gc/g1/g1CollectedHeap.inline.hpp"
#include "gc/g1/g1HotCardCache.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
G1HotCardCache::G1HotCardCache(G1CollectedHeap *g1h):
_g1h(g1h), _hot_cache(NULL), _use_cache(false), _card_counts(g1h) {}
--- a/hotspot/src/share/vm/gc/g1/g1MarkSweep.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1MarkSweep.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
#include "oops/instanceRefKlass.hpp"
#include "oops/oop.inline.hpp"
#include "prims/jvmtiExport.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/fprofiler.hpp"
#include "runtime/synchronizer.hpp"
--- a/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1SATBCardTableModRefBS.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -30,7 +30,7 @@
#include "gc/shared/memset_with_concurrent_readers.hpp"
#include "logging/log.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "runtime/thread.inline.hpp"
--- a/hotspot/src/share/vm/gc/g1/g1StringDedup.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedup.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -31,7 +31,7 @@
#include "gc/g1/g1StringDedupStat.hpp"
#include "gc/g1/g1StringDedupTable.hpp"
#include "gc/g1/g1StringDedupThread.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
bool G1StringDedup::_enabled = false;
--- a/hotspot/src/share/vm/gc/g1/g1StringDedup.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedup.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -84,7 +84,6 @@
#include "memory/allocation.hpp"
#include "oops/oop.hpp"
-#include "runtime/atomic.hpp"
class OopClosure;
class BoolObjectClosure;
--- a/hotspot/src/share/vm/gc/g1/g1StringDedupQueue.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupQueue.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -30,7 +30,7 @@
#include "gc/shared/gcLocker.hpp"
#include "logging/log.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/mutexLocker.hpp"
#include "utilities/stack.inline.hpp"
--- a/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/g1StringDedupThread.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -31,7 +31,7 @@
#include "gc/g1/suspendibleThreadSet.hpp"
#include "logging/log.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
G1StringDedupThread* G1StringDedupThread::_thread = NULL;
--- a/hotspot/src/share/vm/gc/g1/heapRegion.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/heapRegion.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -39,7 +39,7 @@
#include "memory/iterator.hpp"
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.inline.hpp"
int HeapRegion::LogOfHRGrainBytes = 0;
--- a/hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/heapRegion.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -30,7 +30,7 @@
#include "gc/g1/heapRegion.hpp"
#include "gc/shared/space.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
inline HeapWord* G1ContiguousSpace::allocate_impl(size_t min_word_size,
size_t desired_word_size,
--- a/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/heapRegionRemSet.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -33,7 +33,7 @@
#include "memory/allocation.hpp"
#include "memory/padded.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "utilities/bitMap.inline.hpp"
#include "utilities/globalDefinitions.hpp"
#include "utilities/growableArray.hpp"
--- a/hotspot/src/share/vm/gc/g1/heapRegionTracer.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/heapRegionTracer.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -39,7 +39,7 @@
e.set_to(to);
e.set_start(start);
e.set_used(used);
- e.set_allocContext(allocationContext);
+ e.set_allocationContext(allocationContext);
e.commit();
}
}
--- a/hotspot/src/share/vm/gc/g1/sparsePRT.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/g1/sparsePRT.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -30,7 +30,7 @@
#include "gc/shared/cardTableModRefBS.hpp"
#include "gc/shared/space.inline.hpp"
#include "memory/allocation.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/mutexLocker.hpp"
// Check that the size of the SparsePRTEntry is evenly divisible by the maximum
--- a/hotspot/src/share/vm/gc/parallel/gcTaskThread.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/parallel/gcTaskThread.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -30,7 +30,7 @@
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/resourceArea.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/handles.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/os.hpp"
--- a/hotspot/src/share/vm/gc/parallel/mutableNUMASpace.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/parallel/mutableNUMASpace.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,6 +1,5 @@
-
/*
- * Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +27,7 @@
#include "gc/shared/collectedHeap.hpp"
#include "gc/shared/spaceDecorator.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/thread.inline.hpp"
MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment) {
--- a/hotspot/src/share/vm/gc/parallel/mutableSpace.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/parallel/mutableSpace.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
#include "gc/parallel/mutableSpace.hpp"
#include "gc/shared/spaceDecorator.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/thread.hpp"
#include "utilities/macros.hpp"
--- a/hotspot/src/share/vm/gc/parallel/parMarkBitMap.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/parallel/parMarkBitMap.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
#include "gc/parallel/psCompactionManager.inline.hpp"
#include "gc/parallel/psParallelCompact.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
#include "services/memTracker.hpp"
#include "utilities/bitMap.inline.hpp"
--- a/hotspot/src/share/vm/gc/parallel/psCompactionManager.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/parallel/psCompactionManager.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -38,7 +38,7 @@
#include "oops/instanceMirrorKlass.inline.hpp"
#include "oops/objArrayKlass.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
PSOldGen* ParCompactionManager::_old_gen = NULL;
ParCompactionManager** ParCompactionManager::_manager_array = NULL;
--- a/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/parallel/psParallelCompact.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -57,7 +57,7 @@
#include "oops/methodData.hpp"
#include "oops/objArrayKlass.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/fprofiler.hpp"
#include "runtime/safepoint.hpp"
#include "runtime/vmThread.hpp"
--- a/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -46,7 +46,7 @@
#include "memory/resourceArea.hpp"
#include "oops/instanceRefKlass.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/java.hpp"
#include "runtime/prefetch.inline.hpp"
#include "runtime/thread.inline.hpp"
--- a/hotspot/src/share/vm/gc/shared/allocTracer.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/shared/allocTracer.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -29,18 +29,18 @@
#include "utilities/globalDefinitions.hpp"
void AllocTracer::send_allocation_outside_tlab_event(KlassHandle klass, size_t alloc_size) {
- EventAllocObjectOutsideTLAB event;
+ EventObjectAllocationOutsideTLAB event;
if (event.should_commit()) {
- event.set_class(klass());
+ event.set_objectClass(klass());
event.set_allocationSize(alloc_size);
event.commit();
}
}
void AllocTracer::send_allocation_in_new_tlab_event(KlassHandle klass, size_t tlab_size, size_t alloc_size) {
- EventAllocObjectInNewTLAB event;
+ EventObjectAllocationInNewTLAB event;
if (event.should_commit()) {
- event.set_class(klass());
+ event.set_objectClass(klass());
event.set_allocationSize(alloc_size);
event.set_tlabSize(tlab_size);
event.commit();
--- a/hotspot/src/share/vm/gc/shared/cardTableRS.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/shared/cardTableRS.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -29,7 +29,7 @@
#include "gc/shared/space.inline.hpp"
#include "memory/allocation.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/java.hpp"
#include "runtime/os.hpp"
#include "utilities/macros.hpp"
--- a/hotspot/src/share/vm/gc/shared/gcLocker.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/shared/gcLocker.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
#include "gc/shared/gcLocker.inline.hpp"
#include "memory/resourceArea.hpp"
#include "logging/log.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/thread.inline.hpp"
volatile jint GCLocker::_jni_lock_count = 0;
--- a/hotspot/src/share/vm/gc/shared/gcTraceSend.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/shared/gcTraceSend.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -43,7 +43,7 @@
typedef uintptr_t TraceAddress;
void GCTracer::send_garbage_collection_event() const {
- EventGCGarbageCollection event(UNTIMED);
+ EventGarbageCollection event(UNTIMED);
if (event.should_commit()) {
event.set_gcId(GCId::current());
event.set_name(_shared_gc_info.name());
@@ -91,7 +91,7 @@
}
void ParallelOldTracer::send_parallel_old_event() const {
- EventGCParallelOld e(UNTIMED);
+ EventParallelOldGarbageCollection e(UNTIMED);
if (e.should_commit()) {
e.set_gcId(GCId::current());
e.set_densePrefix((TraceAddress)_parallel_old_gc_info.dense_prefix());
@@ -102,7 +102,7 @@
}
void YoungGCTracer::send_young_gc_event() const {
- EventGCYoungGarbageCollection e(UNTIMED);
+ EventYoungGarbageCollection e(UNTIMED);
if (e.should_commit()) {
e.set_gcId(GCId::current());
e.set_tenuringThreshold(_tenuring_threshold);
@@ -127,7 +127,7 @@
EventPromoteObjectInNewPLAB event;
if (event.should_commit()) {
event.set_gcId(GCId::current());
- event.set_class(klass);
+ event.set_objectClass(klass);
event.set_objectSize(obj_size);
event.set_tenured(tenured);
event.set_tenuringAge(age);
@@ -142,7 +142,7 @@
EventPromoteObjectOutsidePLAB event;
if (event.should_commit()) {
event.set_gcId(GCId::current());
- event.set_class(klass);
+ event.set_objectClass(klass);
event.set_objectSize(obj_size);
event.set_tenured(tenured);
event.set_tenuringAge(age);
@@ -151,7 +151,7 @@
}
void OldGCTracer::send_old_gc_event() const {
- EventGCOldGarbageCollection e(UNTIMED);
+ EventOldGarbageCollection e(UNTIMED);
if (e.should_commit()) {
e.set_gcId(GCId::current());
e.set_starttime(_shared_gc_info.start_timestamp());
@@ -173,7 +173,7 @@
EventPromotionFailed e;
if (e.should_commit()) {
e.set_gcId(GCId::current());
- e.set_data(to_trace_struct(pf_info));
+ e.set_promotionFailed(to_trace_struct(pf_info));
e.set_thread(pf_info.thread_trace_id());
e.commit();
}
@@ -190,7 +190,7 @@
#if INCLUDE_ALL_GCS
void G1NewTracer::send_g1_young_gc_event() {
- EventGCG1GarbageCollection e(UNTIMED);
+ EventG1GarbageCollection e(UNTIMED);
if (e.should_commit()) {
e.set_gcId(GCId::current());
e.set_type(_g1_young_gc_info.type());
@@ -201,7 +201,7 @@
}
void G1MMUTracer::send_g1_mmu_event(double timeSlice, double gcTime, double maxTime) {
- EventGCG1MMU e;
+ EventG1MMU e;
if (e.should_commit()) {
e.set_gcId(GCId::current());
e.set_timeSlice(timeSlice);
@@ -212,15 +212,15 @@
}
void G1NewTracer::send_evacuation_info_event(EvacuationInfo* info) {
- EventEvacuationInfo e;
+ EventEvacuationInformation e;
if (e.should_commit()) {
e.set_gcId(GCId::current());
e.set_cSetRegions(info->collectionset_regions());
e.set_cSetUsedBefore(info->collectionset_used_before());
e.set_cSetUsedAfter(info->collectionset_used_after());
e.set_allocationRegions(info->allocation_regions());
- e.set_allocRegionsUsedBefore(info->alloc_regions_used_before());
- e.set_allocRegionsUsedAfter(info->alloc_regions_used_before() + info->bytes_copied());
+ e.set_allocationRegionsUsedBefore(info->alloc_regions_used_before());
+ e.set_allocationRegionsUsedAfter(info->alloc_regions_used_before() + info->bytes_copied());
e.set_bytesCopied(info->bytes_copied());
e.set_regionsFreed(info->regions_freed());
e.commit();
@@ -231,13 +231,14 @@
EventEvacuationFailed e;
if (e.should_commit()) {
e.set_gcId(GCId::current());
- e.set_data(to_trace_struct(ef_info));
+ e.set_evacuationFailed(to_trace_struct(ef_info));
e.commit();
}
}
-static TraceStructG1EvacStats create_g1_evacstats(unsigned gcid, const G1EvacSummary& summary) {
- TraceStructG1EvacStats s;
+static TraceStructG1EvacuationStatistics
+create_g1_evacstats(unsigned gcid, const G1EvacSummary& summary) {
+ TraceStructG1EvacuationStatistics s;
s.set_gcId(gcid);
s.set_allocated(summary.allocated() * HeapWordSize);
s.set_wasted(summary.wasted() * HeapWordSize);
@@ -252,17 +253,17 @@
}
void G1NewTracer::send_young_evacuation_statistics(const G1EvacSummary& summary) const {
- EventGCG1EvacuationYoungStatistics surv_evt;
+ EventG1EvacuationYoungStatistics surv_evt;
if (surv_evt.should_commit()) {
- surv_evt.set_stats(create_g1_evacstats(GCId::current(), summary));
+ surv_evt.set_statistics(create_g1_evacstats(GCId::current(), summary));
surv_evt.commit();
}
}
void G1NewTracer::send_old_evacuation_statistics(const G1EvacSummary& summary) const {
- EventGCG1EvacuationOldStatistics old_evt;
+ EventG1EvacuationOldStatistics old_evt;
if (old_evt.should_commit()) {
- old_evt.set_stats(create_g1_evacstats(GCId::current(), summary));
+ old_evt.set_statistics(create_g1_evacstats(GCId::current(), summary));
old_evt.commit();
}
}
@@ -273,7 +274,7 @@
size_t last_allocation_size,
double last_allocation_duration,
double last_marking_length) {
- EventGCG1BasicIHOP evt;
+ EventG1BasicIHOP evt;
if (evt.should_commit()) {
evt.set_gcId(GCId::current());
evt.set_threshold(threshold);
@@ -295,7 +296,7 @@
double predicted_allocation_rate,
double predicted_marking_length,
bool prediction_active) {
- EventGCG1AdaptiveIHOP evt;
+ EventG1AdaptiveIHOP evt;
if (evt.should_commit()) {
evt.set_gcId(GCId::current());
evt.set_threshold(threshold);
--- a/hotspot/src/share/vm/gc/shared/objectCountEventSender.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/shared/objectCountEventSender.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -40,7 +40,7 @@
EventObjectCountAfterGC event(UNTIMED);
event.set_gcId(GCId::current());
- event.set_class(entry->klass());
+ event.set_objectClass(entry->klass());
event.set_count(entry->count());
event.set_totalSize(entry->words() * BytesPerWord);
event.set_endtime(timestamp);
--- a/hotspot/src/share/vm/gc/shared/plab.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/shared/plab.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
#include "gc/shared/collectedHeap.inline.hpp"
#include "gc/shared/plab.hpp"
#include "memory/allocation.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
inline HeapWord* PLAB::allocate_aligned(size_t word_sz, unsigned short alignment_in_bytes) {
HeapWord* res = CollectedHeap::align_allocation_or_fail(_top, _end, alignment_in_bytes);
--- a/hotspot/src/share/vm/gc/shared/space.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/shared/space.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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,7 +35,7 @@
#include "gc/shared/spaceDecorator.hpp"
#include "memory/universe.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/java.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "runtime/prefetch.inline.hpp"
--- a/hotspot/src/share/vm/gc/shared/taskqueue.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/shared/taskqueue.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
#include "gc/shared/taskqueue.hpp"
#include "oops/oop.inline.hpp"
#include "logging/log.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
#include "runtime/thread.inline.hpp"
#include "utilities/debug.hpp"
--- a/hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/shared/taskqueue.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
#include "gc/shared/taskqueue.hpp"
#include "memory/allocation.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "utilities/debug.hpp"
#include "utilities/stack.inline.hpp"
--- a/hotspot/src/share/vm/gc/shared/workgroup.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/gc/shared/workgroup.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -28,7 +28,7 @@
#include "gc/shared/workerManager.hpp"
#include "memory/allocation.hpp"
#include "memory/allocation.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
#include "runtime/semaphore.hpp"
#include "runtime/thread.inline.hpp"
--- a/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -39,7 +39,7 @@
#include "oops/oop.inline.hpp"
#include "prims/jvmtiExport.hpp"
#include "prims/jvmtiThreadState.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/handles.inline.hpp"
--- a/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -48,7 +48,7 @@
#include "oops/symbol.hpp"
#include "prims/jvmtiExport.hpp"
#include "prims/nativeLookup.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/compilationPolicy.hpp"
#include "runtime/deoptimization.hpp"
--- a/hotspot/src/share/vm/jvmci/jvmciEnv.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/jvmci/jvmciEnv.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -342,7 +342,7 @@
Symbol* sig_sym = cpool->signature_ref_at(index);
if (cpool->has_preresolution()
- || (holder() == SystemDictionary::MethodHandle_klass() &&
+ || ((holder() == SystemDictionary::MethodHandle_klass() || holder() == SystemDictionary::VarHandle_klass()) &&
MethodHandles::is_signature_polymorphic_name(holder(), name_sym))) {
// Short-circuit lookups for JSR 292-related call sites.
// That is, do not rely only on name-based lookups, because they may fail
--- a/hotspot/src/share/vm/logging/logDecorations.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/logging/logDecorations.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -53,10 +53,6 @@
LogDecorations(LogLevelType level, const LogTagSet& tagset, const LogDecorators& decorators);
- LogLevelType level() const {
- return _level;
- }
-
void set_level(LogLevelType level) {
_level = level;
}
--- a/hotspot/src/share/vm/logging/logOutputList.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/logging/logOutputList.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
#include "logging/logLevel.hpp"
#include "logging/logOutputList.hpp"
#include "memory/allocation.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "utilities/globalDefinitions.hpp"
--- a/hotspot/src/share/vm/logging/logOutputList.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/logging/logOutputList.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
#include "logging/logLevel.hpp"
#include "memory/allocation.hpp"
-#include "runtime/atomic.hpp"
#include "utilities/globalDefinitions.hpp"
class LogOutput;
@@ -61,6 +60,11 @@
void add_output(LogOutput* output, LogLevelType level);
void update_output_level(LogOutputNode* node, LogLevelType level);
+ // Bookkeeping functions to keep track of number of active readers/iterators for the list.
+ jint increase_readers();
+ jint decrease_readers();
+ void wait_until_no_readers() const;
+
public:
LogOutputList() : _active_readers(0) {
for (size_t i = 0; i < LogLevel::Count; i++) {
@@ -84,11 +88,6 @@
// Set (add/update/remove) the output to the specified level.
void set_output_level(LogOutput* output, LogLevelType level);
- // Bookkeeping functions to keep track of number of active readers/iterators for the list.
- jint increase_readers();
- jint decrease_readers();
- void wait_until_no_readers() const;
-
class Iterator VALUE_OBJ_CLASS_SPEC {
friend class LogOutputList;
private:
--- a/hotspot/src/share/vm/logging/logTag.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/logging/logTag.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -35,8 +35,9 @@
LOG_TAG(add) \
LOG_TAG(age) \
LOG_TAG(alloc) \
+ LOG_TAG(annotation) \
LOG_TAG(arguments) \
- LOG_TAG(annotation) \
+ LOG_TAG(attach) \
LOG_TAG(barrier) \
LOG_TAG(biasedlocking) \
LOG_TAG(bot) \
--- a/hotspot/src/share/vm/memory/allocation.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/memory/allocation.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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,7 +29,7 @@
#include "memory/metaspaceShared.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
#include "runtime/task.hpp"
#include "runtime/threadCritical.hpp"
--- a/hotspot/src/share/vm/memory/allocation.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/memory/allocation.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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 @@
#ifndef SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP
#define SHARE_VM_MEMORY_ALLOCATION_INLINE_HPP
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
#include "services/memTracker.hpp"
#include "utilities/globalDefinitions.hpp"
--- a/hotspot/src/share/vm/memory/metaspace.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/memory/metaspace.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -37,7 +37,7 @@
#include "memory/metaspaceTracer.hpp"
#include "memory/resourceArea.hpp"
#include "memory/universe.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/globals.hpp"
#include "runtime/init.hpp"
#include "runtime/java.hpp"
--- a/hotspot/src/share/vm/memory/universe.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/memory/universe.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -56,7 +56,7 @@
#include "oops/oop.inline.hpp"
#include "oops/typeArrayKlass.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/commandLineFlagConstraintList.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/fprofiler.hpp"
@@ -1129,8 +1129,6 @@
verify_flags |= Verify_MetaspaceAux;
} else if (strcmp(token, "jni_handles") == 0) {
verify_flags |= Verify_JNIHandles;
- } else if (strcmp(token, "c-heap") == 0) {
- verify_flags |= Verify_CHeap;
} else if (strcmp(token, "codecache_oops") == 0) {
verify_flags |= Verify_CodeCacheOops;
} else {
@@ -1208,10 +1206,6 @@
log_debug(gc, verify)("JNIHandles");
JNIHandles::verify();
}
- if (should_verify_subset(Verify_CHeap)) {
- log_debug(gc, verify)("C-heap");
- os::check_heap();
- }
if (should_verify_subset(Verify_CodeCacheOops)) {
log_debug(gc, verify)("CodeCache Oops");
CodeCache::verify_oops();
--- a/hotspot/src/share/vm/memory/universe.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/memory/universe.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -480,8 +480,7 @@
Verify_ClassLoaderDataGraph = 64,
Verify_MetaspaceAux = 128,
Verify_JNIHandles = 256,
- Verify_CHeap = 512,
- Verify_CodeCacheOops = 1024,
+ Verify_CodeCacheOops = 512,
Verify_All = -1
};
static void initialize_verify_flags();
--- a/hotspot/src/share/vm/oops/compiledICHolder.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/oops/compiledICHolder.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
#include "oops/compiledICHolder.hpp"
#include "oops/klass.hpp"
#include "oops/method.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
volatile int CompiledICHolder::_live_count;
volatile int CompiledICHolder::_live_not_claimed_count;
--- a/hotspot/src/share/vm/oops/cpCache.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/oops/cpCache.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -32,7 +32,7 @@
#include "oops/objArrayOop.inline.hpp"
#include "oops/oop.inline.hpp"
#include "prims/methodHandles.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "utilities/macros.hpp"
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -56,7 +56,7 @@
#include "prims/jvmtiRedefineClasses.hpp"
#include "prims/jvmtiThreadState.hpp"
#include "prims/methodComparator.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/fieldDescriptor.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/javaCalls.hpp"
--- a/hotspot/src/share/vm/oops/klass.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/oops/klass.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -36,7 +36,7 @@
#include "oops/instanceKlass.hpp"
#include "oops/klass.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "trace/traceMacros.hpp"
#include "utilities/macros.hpp"
--- a/hotspot/src/share/vm/oops/klassVtable.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/oops/klassVtable.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -60,7 +60,7 @@
void klassVtable::compute_vtable_size_and_num_mirandas(
int* vtable_length_ret, int* num_new_mirandas,
GrowableArray<Method*>* all_mirandas, const Klass* super,
- Array<Method*>* methods, AccessFlags class_flags,
+ Array<Method*>* methods, AccessFlags class_flags, u2 major_version,
Handle classloader, Symbol* classname, Array<Klass*>* local_interfaces,
TRAPS) {
NoSafepointVerifier nsv;
@@ -77,7 +77,7 @@
assert(methods->at(i)->is_method(), "must be a Method*");
methodHandle mh(THREAD, methods->at(i));
- if (needs_new_vtable_entry(mh, super, classloader, classname, class_flags, THREAD)) {
+ if (needs_new_vtable_entry(mh, super, classloader, classname, class_flags, major_version, THREAD)) {
vtable_length += vtableEntry::size(); // we need a new entry
}
}
@@ -256,10 +256,15 @@
// In class hierarchies where the accessibility is not increasing (i.e., going from private ->
// package_private -> public/protected), the vtable might actually be smaller than our initial
- // calculation.
- assert(initialized <= _length, "vtable initialization failed");
- for(;initialized < _length; initialized++) {
- put_method_at(NULL, initialized);
+ // calculation, for classfile versions for which we do not do transitive override
+ // calculations.
+ if (ik()->major_version() >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) {
+ assert(initialized == _length, "vtable initialization failed");
+ } else {
+ assert(initialized <= _length, "vtable initialization failed");
+ for(;initialized < _length; initialized++) {
+ table()[initialized].clear();
+ }
}
NOT_PRODUCT(verify(tty, true));
}
@@ -298,9 +303,9 @@
ResourceMark rm(THREAD);
outputStream* logst = Log(vtables)::trace_stream();
char* sig = target_method()->name_and_sig_as_C_string();
- logst->print("transitive overriding superclass %s with %s::%s index %d, original flags: ",
+ logst->print("transitive overriding superclass %s with %s index %d, original flags: ",
supersuperklass->internal_name(),
- _klass->internal_name(), sig, vtable_index);
+ sig, vtable_index);
super_method->print_linkage_flags(logst);
logst->print("overriders flags: ");
target_method->print_linkage_flags(logst);
@@ -330,11 +335,11 @@
outputStream* logst = Log(vtables)::trace_stream();
char* sig = target_method()->name_and_sig_as_C_string();
if (overrides) {
- logst->print("overriding with %s::%s index %d, original flags: ",
- target_klass->internal_name(), sig, i);
+ logst->print("overriding with %s index %d, original flags: ",
+ sig, i);
} else {
- logst->print("NOT overriding with %s::%s index %d, original flags: ",
- target_klass->internal_name(), sig, i);
+ logst->print("NOT overriding with %s index %d, original flags: ",
+ sig, i);
}
super_method->print_linkage_flags(logst);
logst->print("overriders flags: ");
@@ -566,6 +571,7 @@
Handle classloader,
Symbol* classname,
AccessFlags class_flags,
+ u2 major_version,
TRAPS) {
if (class_flags.is_interface()) {
// Interfaces do not use vtables, except for java.lang.Object methods,
@@ -646,8 +652,12 @@
}
}
- // Start with lookup result and continue to search up
- k = superk->super(); // haven't found an override match yet; continue to look
+ // Start with lookup result and continue to search up, for versions supporting transitive override
+ if (major_version >= VTABLE_TRANSITIVE_OVERRIDE_VERSION) {
+ k = superk->super(); // haven't found an override match yet; continue to look
+ } else {
+ break;
+ }
}
// if the target method is public or protected it may have a matching
@@ -1500,15 +1510,22 @@
void vtableEntry::verify(klassVtable* vt, outputStream* st) {
NOT_PRODUCT(FlagSetting fs(IgnoreLockingAssertions, true));
- assert(method() != NULL, "must have set method");
- method()->verify();
- // we sub_type, because it could be a miranda method
- if (!vt->klass()->is_subtype_of(method()->method_holder())) {
+ KlassHandle vtklass_h = vt->klass();
+ Klass* vtklass = vtklass_h();
+ if (vtklass->is_instance_klass() &&
+ (InstanceKlass::cast(vtklass)->major_version() >= klassVtable::VTABLE_TRANSITIVE_OVERRIDE_VERSION)) {
+ assert(method() != NULL, "must have set method");
+ }
+ if (method() != NULL) {
+ method()->verify();
+ // we sub_type, because it could be a miranda method
+ if (!vtklass_h->is_subtype_of(method()->method_holder())) {
#ifndef PRODUCT
- print();
+ print();
#endif
- fatal("vtableEntry " PTR_FORMAT ": method is from subclass", p2i(this));
- }
+ fatal("vtableEntry " PTR_FORMAT ": method is from subclass", p2i(this));
+ }
+ }
}
#ifndef PRODUCT
--- a/hotspot/src/share/vm/oops/klassVtable.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/oops/klassVtable.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -90,6 +90,7 @@
const Klass* super,
Array<Method*>* methods,
AccessFlags class_flags,
+ u2 major_version,
Handle classloader,
Symbol* classname,
Array<Klass*>* local_interfaces,
@@ -115,8 +116,14 @@
protected:
friend class vtableEntry;
+
+ public:
+ // Transitive overridng rules for class files < JDK1_7 use the older JVMS rules.
+ // Overriding is determined as we create the vtable, so we use the class file version
+ // of the class whose vtable we are calculating.
+ enum { VTABLE_TRANSITIVE_OVERRIDE_VERSION = 51 } ;
+
private:
- enum { VTABLE_TRANSITIVE_OVERRIDE_VERSION = 51 } ;
void copy_vtable_to(vtableEntry* start);
int initialize_from_super(KlassHandle super);
int index_of(Method* m, int len) const; // same as index_of, but search only up to len
@@ -126,6 +133,7 @@
Handle classloader,
Symbol* classname,
AccessFlags access_flags,
+ u2 major_version,
TRAPS);
bool update_inherited_vtable(InstanceKlass* klass, methodHandle target_method, int super_vtable_len, int default_index, bool checkconstraints, TRAPS);
--- a/hotspot/src/share/vm/oops/method.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/oops/method.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -54,6 +54,7 @@
#include "runtime/compilationPolicy.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/handles.inline.hpp"
+#include "runtime/init.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "runtime/relocator.hpp"
#include "runtime/sharedRuntime.hpp"
@@ -1015,7 +1016,14 @@
// so making them eagerly shouldn't be too expensive.
AdapterHandlerEntry* adapter = AdapterHandlerLibrary::get_adapter(mh);
if (adapter == NULL ) {
- THROW_MSG_NULL(vmSymbols::java_lang_VirtualMachineError(), "Out of space in CodeCache for adapters");
+ if (!is_init_completed()) {
+ // Don't throw exceptions during VM initialization because java.lang.* classes
+ // might not have been initialized, causing problems when constructing the
+ // Java exception object.
+ vm_exit_during_initialization("Out of space in CodeCache for adapters");
+ } else {
+ THROW_MSG_NULL(vmSymbols::java_lang_VirtualMachineError(), "Out of space in CodeCache for adapters");
+ }
}
if (mh->is_shared()) {
--- a/hotspot/src/share/vm/oops/oop.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/oops/oop.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -36,7 +36,7 @@
#include "oops/klass.inline.hpp"
#include "oops/markOop.inline.hpp"
#include "oops/oop.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "runtime/os.hpp"
#include "utilities/macros.hpp"
--- a/hotspot/src/share/vm/oops/symbol.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/oops/symbol.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -29,7 +29,7 @@
#include "memory/allocation.inline.hpp"
#include "memory/resourceArea.hpp"
#include "oops/symbol.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
Symbol::Symbol(const u1* name, int length, int refcount) {
--- a/hotspot/src/share/vm/oops/symbol.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/oops/symbol.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -26,8 +26,8 @@
#define SHARE_VM_OOPS_SYMBOL_HPP
#include "memory/allocation.hpp"
-#include "runtime/atomic.hpp"
#include "utilities/exceptions.hpp"
+#include "utilities/macros.hpp"
#include "utilities/utf8.hpp"
// A Symbol is a canonicalized string.
--- a/hotspot/src/share/vm/opto/bytecodeInfo.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/opto/bytecodeInfo.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -508,7 +508,7 @@
#if INCLUDE_TRACE
EventCompilerInlining event;
if (event.should_commit()) {
- event.set_compileID(C->compile_id());
+ event.set_compileId(C->compile_id());
event.set_message(inline_msg);
event.set_succeeded(success);
event.set_bci(caller_bci);
--- a/hotspot/src/share/vm/opto/compile.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/opto/compile.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -729,7 +729,7 @@
if (event.should_commit()) {
event.set_starttime(C->_latest_stage_start_counter);
event.set_phase((u1) cpt);
- event.set_compileID(C->_compile_id);
+ event.set_compileId(C->_compile_id);
event.set_phaseLevel(level);
event.commit();
}
@@ -748,7 +748,7 @@
if (event.should_commit()) {
event.set_starttime(C->_latest_stage_start_counter);
event.set_phase((u1) PHASE_END);
- event.set_compileID(C->_compile_id);
+ event.set_compileId(C->_compile_id);
event.set_phaseLevel(level);
event.commit();
}
--- a/hotspot/src/share/vm/opto/runtime.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/opto/runtime.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -60,7 +60,7 @@
#include "opto/runtime.hpp"
#include "opto/subnode.hpp"
#include "prims/jvmtiThreadState.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/fprofiler.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/interfaceSupport.hpp"
--- a/hotspot/src/share/vm/prims/jni.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/jni.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -59,7 +59,7 @@
#include "prims/jvm_misc.hpp"
#include "prims/jvmtiExport.hpp"
#include "prims/jvmtiThreadState.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/compilationPolicy.hpp"
#include "runtime/fieldDescriptor.hpp"
#include "runtime/fprofiler.hpp"
--- a/hotspot/src/share/vm/prims/jvm.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/jvm.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -54,7 +54,7 @@
#include "prims/privilegedStack.hpp"
#include "prims/stackwalk.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/init.hpp"
#include "runtime/interfaceSupport.hpp"
--- a/hotspot/src/share/vm/prims/jvmti.xml Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/jvmti.xml Mon Sep 12 22:04:48 2016 +0000
@@ -7152,15 +7152,19 @@
returns <code>JNI_FALSE</code>) the class can be neither
redefined nor retransformed.
<p/>
- Primitive classes (for example, <code>java.lang.Integer.TYPE</code>)
- and array classes are never modifiable.
+ Primitive classes (for example, <code>java.lang.Integer.TYPE</code>),
+ array classes, and some implementation defined classes are never modifiable.
<p/>
</description>
<origin>new</origin>
<capabilities>
<capability id="can_redefine_any_class">
- If possessed then all classes (except primitive and array classes)
- are modifiable.
+ If possessed then all classes (except primitive, array, and some implementation defined
+ classes) are modifiable (redefine or retransform).
+ </capability>
+ <capability id="can_retransform_any_class">
+ If possessed then all classes (except primitive, array, and some implementation defined
+ classes) are modifiable with <functionlink id="RetransformClasses"/>.
</capability>
<capability id="can_redefine_classes">
No effect on the result of the function.
@@ -9900,7 +9904,7 @@
</capabilityfield>
<capabilityfield id="can_redefine_any_class">
<description>
- Can modify (retransform or redefine) any non-primitive non-array class.
+ Can modify (retransform or redefine) any modifiable class.
See <functionlink id="IsModifiableClass"/>.
</description>
</capabilityfield>
@@ -10024,7 +10028,8 @@
</capabilityfield>
<capabilityfield id="can_retransform_any_class" since="1.1">
<description>
- <functionlink id="RetransformClasses"/> can be called on any class
+ <functionlink id="RetransformClasses"/> can be called on any modifiable class.
+ See <functionlink id="IsModifiableClass"/>.
(<fieldlink id="can_retransform_classes" struct="jvmtiCapabilities"/>
must also be set)
</description>
@@ -12494,8 +12499,8 @@
Otherwise, this event may be sent before the VM is initialized (the start
<functionlink id="GetPhase">phase</functionlink>).
Some classes might not be compatible
- with the function (eg. ROMized classes) and this event will not be
- generated for these classes.
+ with the function (eg. ROMized classes or implementation defined classes) and this event will
+ not be generated for these classes.
<p/>
The agent must allocate the space for the modified
class file data buffer
@@ -14498,6 +14503,10 @@
- Add new capability can_generate_early_class_hook_events
- Add new function GetNamedModule
</change>
+ <change date="16 August 2016" version="9.0.0">
+ Clarified can_redefine_any_classes, can_retransform_any_classes and IsModifiableClass API to
+ disallow some implementation defined classes.
+ </change>
</changehistory>
</specification>
--- a/hotspot/src/share/vm/prims/jvmtiEnv.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiEnv.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -283,7 +283,7 @@
return JVMTI_ERROR_INVALID_CLASS;
}
- if (java_lang_Class::is_primitive(k_mirror)) {
+ if (!VM_RedefineClasses::is_modifiable_class(k_mirror)) {
return JVMTI_ERROR_UNMODIFIABLE_CLASS;
}
@@ -294,9 +294,6 @@
if (status & (JVMTI_CLASS_STATUS_ERROR)) {
return JVMTI_ERROR_INVALID_CLASS;
}
- if (status & (JVMTI_CLASS_STATUS_ARRAY)) {
- return JVMTI_ERROR_UNMODIFIABLE_CLASS;
- }
instanceKlassHandle ikh(current_thread, k_oop);
if (ikh->get_cached_class_file_bytes() == NULL) {
--- a/hotspot/src/share/vm/prims/jvmtiImpl.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiImpl.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -36,7 +36,7 @@
#include "prims/jvmtiEventController.inline.hpp"
#include "prims/jvmtiImpl.hpp"
#include "prims/jvmtiRedefineClasses.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/handles.hpp"
#include "runtime/handles.inline.hpp"
--- a/hotspot/src/share/vm/prims/jvmtiRawMonitor.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiRawMonitor.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, 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,7 +24,7 @@
#include "precompiled.hpp"
#include "prims/jvmtiRawMonitor.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/orderAccess.inline.hpp"
#include "runtime/thread.inline.hpp"
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -130,7 +130,7 @@
}
oop mirror = JNIHandles::resolve_non_null(_class_defs[i].klass);
- // classes for primitives and arrays cannot be redefined
+ // classes for primitives and arrays and vm anonymous classes cannot be redefined
// check here so following code can assume these classes are InstanceKlass
if (!is_modifiable_class(mirror)) {
_res = JVMTI_ERROR_UNMODIFIABLE_CLASS;
@@ -250,9 +250,14 @@
if (java_lang_Class::is_primitive(klass_mirror)) {
return false;
}
- Klass* the_class_oop = java_lang_Class::as_Klass(klass_mirror);
+ Klass* k = java_lang_Class::as_Klass(klass_mirror);
// classes for arrays cannot be redefined
- if (the_class_oop == NULL || !the_class_oop->is_instance_klass()) {
+ if (k == NULL || !k->is_instance_klass()) {
+ return false;
+ }
+
+ // Cannot redefine or retransform an anonymous class.
+ if (InstanceKlass::cast(k)->is_anonymous()) {
return false;
}
return true;
--- a/hotspot/src/share/vm/prims/jvmtiTagMap.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiTagMap.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -3119,6 +3119,11 @@
}
}
+ // Follow oops from compiled nmethod
+ if (jvf->cb() != NULL && jvf->cb()->is_nmethod()) {
+ blk->set_context(thread_tag, tid, depth, method);
+ jvf->cb()->as_nmethod()->oops_do(blk);
+ }
} else {
blk->set_context(thread_tag, tid, depth, method);
if (is_top_frame) {
--- a/hotspot/src/share/vm/prims/unsafe.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/prims/unsafe.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -32,7 +32,7 @@
#include "prims/jni.h"
#include "prims/jvm.h"
#include "prims/unsafe.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/globals.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/orderAccess.inline.hpp"
@@ -1047,7 +1047,7 @@
if (event.should_commit()) {
oop obj = thread->current_park_blocker();
- event.set_klass((obj != NULL) ? obj->klass() : NULL);
+ event.set_parkedClass((obj != NULL) ? obj->klass() : NULL);
event.set_timeout(time);
event.set_address((obj != NULL) ? (TYPE_ADDRESS) cast_from_oop<uintptr_t>(obj) : 0);
event.commit();
--- a/hotspot/src/share/vm/runtime/atomic.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/atomic.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2016, 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 @@
#define SHARE_VM_RUNTIME_ATOMIC_HPP
#include "memory/allocation.hpp"
+#include "utilities/macros.hpp"
enum cmpxchg_memory_order {
memory_order_relaxed,
@@ -119,24 +120,120 @@
inline static void* cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value, cmpxchg_memory_order order = memory_order_conservative);
};
-// To use Atomic::inc(jshort* dest) and Atomic::dec(jshort* dest), the address must be specially
-// aligned, such that (*dest) occupies the upper 16 bits of an aligned 32-bit word. The best way to
-// achieve is to place your short value next to another short value, which doesn't need atomic ops.
-//
-// Example
-// ATOMIC_SHORT_PAIR(
-// volatile short _refcount, // needs atomic operation
-// unsigned short _length // number of UTF8 characters in the symbol (does not need atomic op)
-// );
+// platform specific in-line definitions - must come before shared definitions
+
+#include OS_CPU_HEADER(atomic)
-#ifdef VM_LITTLE_ENDIAN
- #define ATOMIC_SHORT_PAIR(atomic_decl, non_atomic_decl) \
- non_atomic_decl; \
- atomic_decl
-#else
- #define ATOMIC_SHORT_PAIR(atomic_decl, non_atomic_decl) \
- atomic_decl; \
- non_atomic_decl
+// shared in-line definitions
+
+// size_t casts...
+#if (SIZE_MAX != UINTPTR_MAX)
+#error size_t is not WORD_SIZE, interesting platform, but missing implementation here
#endif
+inline size_t Atomic::add(size_t add_value, volatile size_t* dest) {
+ return (size_t) add_ptr((intptr_t) add_value, (volatile intptr_t*) dest);
+}
+
+inline void Atomic::inc(volatile size_t* dest) {
+ inc_ptr((volatile intptr_t*) dest);
+}
+
+inline void Atomic::dec(volatile size_t* dest) {
+ dec_ptr((volatile intptr_t*) dest);
+}
+
+#ifndef VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+/*
+ * This is the default implementation of byte-sized cmpxchg. It emulates jbyte-sized cmpxchg
+ * in terms of jint-sized cmpxchg. Platforms may override this by defining their own inline definition
+ * as well as defining VM_HAS_SPECIALIZED_CMPXCHG_BYTE. This will cause the platform specific
+ * implementation to be used instead.
+ */
+inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest,
+ jbyte compare_value, cmpxchg_memory_order order) {
+ STATIC_ASSERT(sizeof(jbyte) == 1);
+ volatile jint* dest_int =
+ static_cast<volatile jint*>(align_ptr_down(dest, sizeof(jint)));
+ size_t offset = pointer_delta(dest, dest_int, 1);
+ jint cur = *dest_int;
+ jbyte* cur_as_bytes = reinterpret_cast<jbyte*>(&cur);
+
+ // current value may not be what we are looking for, so force it
+ // to that value so the initial cmpxchg will fail if it is different
+ cur_as_bytes[offset] = compare_value;
+
+ // always execute a real cmpxchg so that we get the required memory
+ // barriers even on initial failure
+ do {
+ // value to swap in matches current value ...
+ jint new_value = cur;
+ // ... except for the one jbyte we want to update
+ reinterpret_cast<jbyte*>(&new_value)[offset] = exchange_value;
+
+ jint res = cmpxchg(new_value, dest_int, cur, order);
+ if (res == cur) break; // success
+
+ // at least one jbyte in the jint changed value, so update
+ // our view of the current jint
+ cur = res;
+ // if our jbyte is still as cur we loop and try again
+ } while (cur_as_bytes[offset] == compare_value);
+
+ return cur_as_bytes[offset];
+}
+
+#endif // VM_HAS_SPECIALIZED_CMPXCHG_BYTE
+
+inline unsigned Atomic::xchg(unsigned int exchange_value, volatile unsigned int* dest) {
+ assert(sizeof(unsigned int) == sizeof(jint), "more work to do");
+ return (unsigned int)Atomic::xchg((jint)exchange_value, (volatile jint*)dest);
+}
+
+inline unsigned Atomic::cmpxchg(unsigned int exchange_value,
+ volatile unsigned int* dest, unsigned int compare_value,
+ cmpxchg_memory_order order) {
+ assert(sizeof(unsigned int) == sizeof(jint), "more work to do");
+ return (unsigned int)Atomic::cmpxchg((jint)exchange_value, (volatile jint*)dest,
+ (jint)compare_value, order);
+}
+
+inline jlong Atomic::add(jlong add_value, volatile jlong* dest) {
+ jlong old = load(dest);
+ jlong new_value = old + add_value;
+ while (old != cmpxchg(new_value, dest, old)) {
+ old = load(dest);
+ new_value = old + add_value;
+ }
+ return old;
+}
+
+inline void Atomic::inc(volatile short* dest) {
+ // Most platforms do not support atomic increment on a 2-byte value. However,
+ // if the value occupies the most significant 16 bits of an aligned 32-bit
+ // word, then we can do this with an atomic add of 0x10000 to the 32-bit word.
+ //
+ // The least significant parts of this 32-bit word will never be affected, even
+ // in case of overflow/underflow.
+ //
+ // Use the ATOMIC_SHORT_PAIR macro (see macros.hpp) to get the desired alignment.
+#ifdef VM_LITTLE_ENDIAN
+ assert((intx(dest) & 0x03) == 0x02, "wrong alignment");
+ (void)Atomic::add(0x10000, (volatile int*)(dest-1));
+#else
+ assert((intx(dest) & 0x03) == 0x00, "wrong alignment");
+ (void)Atomic::add(0x10000, (volatile int*)(dest));
+#endif
+}
+
+inline void Atomic::dec(volatile short* dest) {
+#ifdef VM_LITTLE_ENDIAN
+ assert((intx(dest) & 0x03) == 0x02, "wrong alignment");
+ (void)Atomic::add(-0x10000, (volatile int*)(dest-1));
+#else
+ assert((intx(dest) & 0x03) == 0x00, "wrong alignment");
+ (void)Atomic::add(-0x10000, (volatile int*)(dest));
+#endif
+}
+
#endif // SHARE_VM_RUNTIME_ATOMIC_HPP
--- a/hotspot/src/share/vm/runtime/atomic.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
- * Copyright (c) 2012, 2016, 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_RUNTIME_ATOMIC_INLINE_HPP
-#define SHARE_VM_RUNTIME_ATOMIC_INLINE_HPP
-
-#include "runtime/atomic.hpp"
-#include "utilities/macros.hpp"
-
-#include OS_CPU_HEADER_INLINE(atomic)
-
-// size_t casts...
-#if (SIZE_MAX != UINTPTR_MAX)
-#error size_t is not WORD_SIZE, interesting platform, but missing implementation here
-#endif
-
-inline size_t Atomic::add(size_t add_value, volatile size_t* dest) {
- return (size_t) add_ptr((intptr_t) add_value, (volatile intptr_t*) dest);
-}
-
-inline void Atomic::inc(volatile size_t* dest) {
- inc_ptr((volatile intptr_t*) dest);
-}
-
-inline void Atomic::dec(volatile size_t* dest) {
- dec_ptr((volatile intptr_t*) dest);
-}
-
-#ifndef VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-/*
- * This is the default implementation of byte-sized cmpxchg. It emulates jbyte-sized cmpxchg
- * in terms of jint-sized cmpxchg. Platforms may override this by defining their own inline definition
- * as well as defining VM_HAS_SPECIALIZED_CMPXCHG_BYTE. This will cause the platform specific
- * implementation to be used instead.
- */
-inline jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte *dest, jbyte comparand, cmpxchg_memory_order order)
-{
- assert(sizeof(jbyte) == 1, "assumption.");
- uintptr_t dest_addr = (uintptr_t)dest;
- uintptr_t offset = dest_addr % sizeof(jint);
- volatile jint* dest_int = (volatile jint*)(dest_addr - offset);
- jint cur = *dest_int;
- jbyte* cur_as_bytes = (jbyte*)(&cur);
- jint new_val = cur;
- jbyte* new_val_as_bytes = (jbyte*)(&new_val);
- new_val_as_bytes[offset] = exchange_value;
- while (cur_as_bytes[offset] == comparand) {
- jint res = cmpxchg(new_val, dest_int, cur, order);
- if (res == cur) break;
- cur = res;
- new_val = cur;
- new_val_as_bytes[offset] = exchange_value;
- }
- return cur_as_bytes[offset];
-}
-#endif // VM_HAS_SPECIALIZED_CMPXCHG_BYTE
-
-inline unsigned Atomic::xchg(unsigned int exchange_value, volatile unsigned int* dest) {
- assert(sizeof(unsigned int) == sizeof(jint), "more work to do");
- return (unsigned int)Atomic::xchg((jint)exchange_value, (volatile jint*)dest);
-}
-
-inline unsigned Atomic::cmpxchg(unsigned int exchange_value,
- volatile unsigned int* dest, unsigned int compare_value,
- cmpxchg_memory_order order) {
- assert(sizeof(unsigned int) == sizeof(jint), "more work to do");
- return (unsigned int)Atomic::cmpxchg((jint)exchange_value, (volatile jint*)dest,
- (jint)compare_value, order);
-}
-
-inline jlong Atomic::add(jlong add_value, volatile jlong* dest) {
- jlong old = load(dest);
- jlong new_value = old + add_value;
- while (old != cmpxchg(new_value, dest, old)) {
- old = load(dest);
- new_value = old + add_value;
- }
- return old;
-}
-
-inline void Atomic::inc(volatile short* dest) {
- // Most platforms do not support atomic increment on a 2-byte value. However,
- // if the value occupies the most significant 16 bits of an aligned 32-bit
- // word, then we can do this with an atomic add of 0x10000 to the 32-bit word.
- //
- // The least significant parts of this 32-bit word will never be affected, even
- // in case of overflow/underflow.
- //
- // Use the ATOMIC_SHORT_PAIR macro to get the desired alignment.
-#ifdef VM_LITTLE_ENDIAN
- assert((intx(dest) & 0x03) == 0x02, "wrong alignment");
- (void)Atomic::add(0x10000, (volatile int*)(dest-1));
-#else
- assert((intx(dest) & 0x03) == 0x00, "wrong alignment");
- (void)Atomic::add(0x10000, (volatile int*)(dest));
-#endif
-}
-
-inline void Atomic::dec(volatile short* dest) {
-#ifdef VM_LITTLE_ENDIAN
- assert((intx(dest) & 0x03) == 0x02, "wrong alignment");
- (void)Atomic::add(-0x10000, (volatile int*)(dest-1));
-#else
- assert((intx(dest) & 0x03) == 0x00, "wrong alignment");
- (void)Atomic::add(-0x10000, (volatile int*)(dest));
-#endif
-}
-
-#endif // SHARE_VM_RUNTIME_ATOMIC_INLINE_HPP
--- a/hotspot/src/share/vm/runtime/biasedLocking.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/biasedLocking.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -28,7 +28,7 @@
#include "oops/klass.inline.hpp"
#include "oops/markOop.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/basicLock.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/task.hpp"
--- a/hotspot/src/share/vm/runtime/globals.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/globals.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -975,8 +975,8 @@
static void trace_flag_changed(const char* name, const T old_value, const T new_value, const Flag::Flags origin) {
E e;
e.set_name(name);
- e.set_old_value(old_value);
- e.set_new_value(new_value);
+ e.set_oldValue(old_value);
+ e.set_newValue(new_value);
e.set_origin(origin);
e.commit();
}
--- a/hotspot/src/share/vm/runtime/globals.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -2242,7 +2242,7 @@
"in a comma separated string. Sub-systems are: " \
"threads, heap, symbol_table, string_table, codecache, " \
"dictionary, classloader_data_graph, metaspace, jni_handles, " \
- "c-heap, codecache_oops") \
+ "codecache_oops") \
\
diagnostic(bool, GCParallelVerificationEnabled, true, \
"Enable parallel memory system verification") \
@@ -3008,16 +3008,6 @@
notproduct(intx, ZombieALotInterval, 5, \
"Number of exits until ZombieALot kicks in") \
\
- diagnostic(intx, MallocVerifyInterval, 0, \
- "If non-zero, verify C heap after every N calls to " \
- "malloc/realloc/free") \
- range(0, max_intx) \
- \
- diagnostic(intx, MallocVerifyStart, 0, \
- "If non-zero, start verifying C heap after Nth call to " \
- "malloc/realloc/free") \
- range(0, max_intx) \
- \
diagnostic(uintx, MallocMaxTestWords, 0, \
"If non-zero, maximum number of words that malloc/realloc can " \
"allocate (for testing only)") \
--- a/hotspot/src/share/vm/runtime/handles.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/handles.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
#include "memory/allocation.inline.hpp"
#include "oops/constantPool.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/thread.inline.hpp"
--- a/hotspot/src/share/vm/runtime/interfaceSupport.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/interfaceSupport.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
#include "gc/shared/collectedHeap.inline.hpp"
#include "gc/shared/genCollectedHeap.hpp"
#include "memory/resourceArea.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/init.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/orderAccess.inline.hpp"
--- a/hotspot/src/share/vm/runtime/mutex.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/mutex.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/mutex.hpp"
#include "runtime/orderAccess.inline.hpp"
@@ -1148,7 +1148,16 @@
}
Monitor::~Monitor() {
- assert((UNS(_owner)|UNS(_LockWord.FullWord)|UNS(_EntryList)|UNS(_WaitSet)|UNS(_OnDeck)) == 0, "");
+#ifdef ASSERT
+ uintptr_t owner = UNS(_owner);
+ uintptr_t lockword = UNS(_LockWord.FullWord);
+ uintptr_t entrylist = UNS(_EntryList);
+ uintptr_t waitset = UNS(_WaitSet);
+ uintptr_t ondeck = UNS(_OnDeck);
+ assert((owner|lockword|entrylist|waitset|ondeck) == 0,
+ "_owner(" INTPTR_FORMAT ")|_LockWord(" INTPTR_FORMAT ")|_EntryList(" INTPTR_FORMAT ")|_WaitSet("
+ INTPTR_FORMAT ")|_OnDeck(" INTPTR_FORMAT ") != 0", owner, lockword, entrylist, waitset, ondeck);
+#endif
}
void Monitor::ClearMonitor(Monitor * m, const char *name) {
--- a/hotspot/src/share/vm/runtime/objectMonitor.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/objectMonitor.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
#include "memory/resourceArea.hpp"
#include "oops/markOop.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/mutexLocker.hpp"
@@ -390,7 +390,7 @@
}
if (event.should_commit()) {
- event.set_klass(((oop)this->object())->klass());
+ event.set_monitorClass(((oop)this->object())->klass());
event.set_previousOwner((TYPE_THREAD)_previous_owner_tid);
event.set_address((TYPE_ADDRESS)(uintptr_t)(this->object_addr()));
event.commit();
@@ -1381,7 +1381,7 @@
jlong timeout,
bool timedout) {
assert(event != NULL, "invariant");
- event->set_klass(((oop)this->object())->klass());
+ event->set_monitorClass(((oop)this->object())->klass());
event->set_timeout(timeout);
event->set_address((TYPE_ADDRESS)this->object_addr());
event->set_notifier(notifier_tid);
--- a/hotspot/src/share/vm/runtime/orderAccess.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/orderAccess.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
#ifndef SHARE_VM_RUNTIME_ORDERACCESS_INLINE_HPP
#define SHARE_VM_RUNTIME_ORDERACCESS_INLINE_HPP
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/orderAccess.hpp"
#include "utilities/macros.hpp"
--- a/hotspot/src/share/vm/runtime/os.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/os.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -44,7 +44,7 @@
#include "prims/jvm_misc.hpp"
#include "prims/privilegedStack.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/interfaceSupport.hpp"
#include "runtime/java.hpp"
@@ -596,8 +596,6 @@
}
#endif
- NOT_PRODUCT(if (MallocVerifyInterval > 0) check_heap());
-
// For the test flag -XX:MallocMaxTestWords
if (has_reached_max_malloc_test_peak(size)) {
return NULL;
@@ -658,7 +656,6 @@
// NMT support
void* membase = MemTracker::malloc_base(memblock);
verify_memory(membase);
- NOT_PRODUCT(if (MallocVerifyInterval > 0) check_heap());
if (size == 0) {
return NULL;
}
@@ -695,7 +692,6 @@
}
void* membase = MemTracker::record_free(memblock);
verify_memory(membase);
- NOT_PRODUCT(if (MallocVerifyInterval > 0) check_heap());
GuardedMemory guarded(membase);
size_t size = guarded.get_user_size();
--- a/hotspot/src/share/vm/runtime/os.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/os.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -709,7 +709,6 @@
static void* realloc (void *memblock, size_t size, MEMFLAGS flag);
static void free (void *memblock);
- static bool check_heap(bool force = false); // verify C heap integrity
static char* strdup(const char *, MEMFLAGS flags = mtInternal); // Like strdup
// Like strdup, but exit VM when strdup() returns NULL
static char* strdup_check_oom(const char*, MEMFLAGS flags = mtInternal);
--- a/hotspot/src/share/vm/runtime/safepoint.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -39,7 +39,7 @@
#include "memory/universe.inline.hpp"
#include "oops/oop.inline.hpp"
#include "oops/symbol.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/compilationPolicy.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/frame.inline.hpp"
@@ -173,7 +173,7 @@
// block itself when it attempts transitions to a new state.
//
{
- EventSafepointStateSync sync_event;
+ EventSafepointStateSynchronization sync_event;
int initial_running = 0;
_state = _synchronizing;
--- a/hotspot/src/share/vm/runtime/sharedRuntime.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/sharedRuntime.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -49,7 +49,7 @@
#include "prims/methodHandles.hpp"
#include "prims/nativeLookup.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/compilationPolicy.hpp"
#include "runtime/handles.inline.hpp"
--- a/hotspot/src/share/vm/runtime/sweeper.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/sweeper.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -30,7 +30,7 @@
#include "compiler/compileBroker.hpp"
#include "memory/resourceArea.hpp"
#include "oops/method.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/compilationPolicy.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/orderAccess.inline.hpp"
@@ -485,7 +485,7 @@
if (event.should_commit()) {
event.set_starttime(sweep_start_counter);
event.set_endtime(sweep_end_counter);
- event.set_sweepIndex(_traversals);
+ event.set_sweepId(_traversals);
event.set_sweptCount(swept_count);
event.set_flushedCount(flushed_count);
event.set_zombifiedCount(zombified_count);
--- a/hotspot/src/share/vm/runtime/synchronizer.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/synchronizer.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -30,7 +30,7 @@
#include "memory/resourceArea.hpp"
#include "oops/markOop.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/interfaceSupport.hpp"
@@ -1819,7 +1819,7 @@
const ObjectSynchronizer::InflateCause cause) {
#if INCLUDE_TRACE
assert(event.should_commit(), "check outside");
- event.set_klass(obj->klass());
+ event.set_monitorClass(obj->klass());
event.set_address((TYPE_ADDRESS)(uintptr_t)(void*)obj);
event.set_cause((u1)cause);
event.commit();
--- a/hotspot/src/share/vm/runtime/thread.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/thread.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -57,7 +57,7 @@
#include "prims/jvmtiThreadState.hpp"
#include "prims/privilegedStack.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/commandLineFlagConstraintList.hpp"
#include "runtime/commandLineFlagWriteableList.hpp"
--- a/hotspot/src/share/vm/runtime/thread.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/thread.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
#define SHARE_VM_RUNTIME_THREAD_INLINE_HPP_SCOPE
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/os.inline.hpp"
#include "runtime/thread.hpp"
--- a/hotspot/src/share/vm/runtime/vmThread.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/runtime/vmThread.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -279,7 +279,6 @@
HandleMark hm(VMThread::vm_thread());
// Among other things, this ensures that Eden top is correct.
Universe::heap()->prepare_for_verify();
- os::check_heap();
// Silent verification so as not to pollute normal output,
// unless we really asked for it.
Universe::verify();
--- a/hotspot/src/share/vm/services/mallocTracker.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/services/mallocTracker.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,6 @@
#include "precompiled.hpp"
#include "runtime/atomic.hpp"
-#include "runtime/atomic.inline.hpp"
#include "services/mallocSiteTable.hpp"
#include "services/mallocTracker.hpp"
#include "services/mallocTracker.inline.hpp"
--- a/hotspot/src/share/vm/services/memTracker.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/services/memTracker.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -75,7 +75,6 @@
#else
-#include "runtime/atomic.hpp"
#include "runtime/threadCritical.hpp"
#include "services/mallocTracker.hpp"
#include "services/virtualMemoryTracker.hpp"
--- a/hotspot/src/share/vm/services/threadService.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/services/threadService.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -31,7 +31,7 @@
#include "oops/instanceKlass.hpp"
#include "oops/objArrayOop.inline.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/handles.inline.hpp"
#include "runtime/init.hpp"
#include "runtime/thread.hpp"
--- a/hotspot/src/share/vm/services/virtualMemoryTracker.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/services/virtualMemoryTracker.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -23,7 +23,7 @@
*/
#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/os.hpp"
#include "runtime/threadCritical.hpp"
#include "services/memTracker.hpp"
--- a/hotspot/src/share/vm/shark/sharkRuntime.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/shark/sharkRuntime.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
*/
#include "precompiled.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/biasedLocking.hpp"
#include "runtime/deoptimization.hpp"
#include "runtime/thread.hpp"
--- a/hotspot/src/share/vm/trace/traceDataTypes.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/trace/traceDataTypes.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -32,7 +32,6 @@
enum {
CONTENT_TYPE_NONE = 0,
CONTENT_TYPE_CLASS = 20,
- CONTENT_TYPE_UTF8 = 21,
CONTENT_TYPE_THREAD = 22,
CONTENT_TYPE_STACKTRACE = 23,
CONTENT_TYPE_BYTES = 24,
--- a/hotspot/src/share/vm/trace/traceMacros.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/trace/traceMacros.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -30,7 +30,6 @@
#define EVENT_THREAD_EXIT(thread)
#define EVENT_THREAD_DESTRUCT(thread)
#define TRACE_KLASS_CREATION(k, p, t)
-#define TRACE_KLASS_DEFINITION(k, t)
#define TRACE_INIT_KLASS_ID(k)
#define TRACE_REMOVE_KLASS_ID(k)
--- a/hotspot/src/share/vm/trace/traceevents.xml Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/trace/traceevents.xml Mon Sep 12 22:04:48 2016 +0000
@@ -76,111 +76,112 @@
<event id="ThreadPark" path="java/thread_park" label="Java Thread Park"
has_thread="true" has_stacktrace="true" is_instant="false">
- <value type="CLASS" field="klass" label="Class Parked On"/>
+ <value type="CLASS" field="parkedClass" label="Class Parked On"/>
<value type="MILLIS" field="timeout" label="Park Timeout"/>
- <value type="ADDRESS" field="address" label="Address of Object Parked" relation="JAVA_MONITOR_ADDRESS"/>
+ <value type="ADDRESS" field="address" label="Address of Object Parked" relation="JavaMonitorAddress"/>
</event>
<event id="JavaMonitorEnter" path="java/monitor_enter" label="Java Monitor Blocked"
has_thread="true" has_stacktrace="true" is_instant="false">
- <value type="CLASS" field="klass" label="Monitor Class"/>
+ <value type="CLASS" field="monitorClass" label="Monitor Class"/>
<value type="THREAD" field="previousOwner" label="Previous Monitor Owner"/>
- <value type="ADDRESS" field="address" label="Monitor Address" relation="JAVA_MONITOR_ADDRESS"/>
+ <value type="ADDRESS" field="address" label="Monitor Address" relation="JavaMonitorAddress"/>
</event>
<event id="JavaMonitorWait" path="java/monitor_wait" label="Java Monitor Wait" description="Waiting on a Java monitor"
has_thread="true" has_stacktrace="true" is_instant="false">
- <value type="CLASS" field="klass" label="Monitor Class" description="Class of object waited on"/>
+ <value type="CLASS" field="monitorClass" label="Monitor Class" description="Class of object waited on"/>
<value type="THREAD" field="notifier" label="Notifier Thread" description="Notifying Thread"/>
<value type="MILLIS" field="timeout" label="Timeout" description="Maximum wait time"/>
<value type="BOOLEAN" field="timedOut" label="Timed Out" description="Wait has been timed out"/>
- <value type="ADDRESS" field="address" label="Monitor Address" description="Address of object waited on" relation="JAVA_MONITOR_ADDRESS"/>
+ <value type="ADDRESS" field="address" label="Monitor Address" description="Address of object waited on" relation="JavaMonitorAddress"/>
</event>
<event id="JavaMonitorInflate" path="java/monitor_inflate" label="Java Monitor Inflated"
has_thread="true" has_stacktrace="true" is_instant="false">
- <value type="CLASS" field="klass" label="Monitor Class"/>
- <value type="ADDRESS" field="address" label="Monitor Address" relation="JAVA_MONITOR_ADDRESS"/>
- <value type="INFLATECAUSE" field="cause" label="Cause" description="Cause of inflation"/>
+ <value type="CLASS" field="monitorClass" label="Monitor Class"/>
+ <value type="ADDRESS" field="address" label="Monitor Address" relation="JavaMonitorAddress"/>
+ <value type="INFLATECAUSE" field="cause" label="Monitor Inflation Cause" description="Cause of inflation"/>
</event>
- <event id="ReservedStackActivation" path="java/reserved_stack_activation" label="Reserved Stack Activation" description="Activation of Reserved Stack Area caused by stack overflow with ReservedStackAccess annotated method in call stack"
- has_thread="true" has_stacktrace="true" is_instant="true">
+ <event id="ReservedStackActivation" path="vm/runtime/reserved_stack_activation" label="Reserved Stack Activation"
+ description="Activation of Reserved Stack Area caused by stack overflow with ReservedStackAccess annotated method in call stack"
+ has_thread="true" has_stacktrace="true" is_instant="true">
<value type="METHOD" field="method" label="Java Method"/>
</event>
<event id="ClassLoad" path="vm/class/load" label="Class Load"
- has_thread="true" has_stacktrace="true" is_instant="false">
+ has_thread="true" has_stacktrace="true" is_instant="false">
<value type="CLASS" field="loadedClass" label="Loaded Class"/>
<value type="CLASS" field="definingClassLoader" label="Defining Class Loader"/>
<value type="CLASS" field="initiatingClassLoader" label="Initiating Class Loader"/>
</event>
<event id="ClassDefine" path="vm/class/define" label="Class Define"
- has_thread="true" has_stacktrace="true" is_instant="true">
+ has_thread="true" has_stacktrace="true" is_instant="true">
<value type="CLASS" field="definedClass" label="Defined Class"/>
<value type="CLASS" field="definingClassLoader" label="Defining Class Loader"/>
</event>
<event id="ClassUnload" path="vm/class/unload" label="Class Unload"
- has_thread="true" is_instant="true">
+ has_thread="true" is_instant="true">
<value type="CLASS" field="unloadedClass" label="Unloaded Class"/>
<value type="CLASS" field="definingClassLoader" label="Defining Class Loader"/>
</event>
<event id="IntFlagChanged" path="vm/flag/int_changed" label="Int Flag Changed"
- is_instant="true">
- <value type="UTF8" field="name" label="Name" />
- <value type="INTEGER" field="old_value" label="Old Value" />
- <value type="INTEGER" field="new_value" label="New Value" />
+ is_instant="true">
+ <value type="STRING" field="name" label="Name" />
+ <value type="INTEGER" field="oldValue" label="Old Value" />
+ <value type="INTEGER" field="newValue" label="New Value" />
<value type="FLAGVALUEORIGIN" field="origin" label="Origin" />
</event>
<event id="UnsignedIntFlagChanged" path="vm/flag/uint_changed" label="Unsigned Int Flag Changed"
- is_instant="true">
- <value type="UTF8" field="name" label="Name" />
- <value type="UINT" field="old_value" label="Old Value" />
- <value type="UINT" field="new_value" label="New Value" />
+ is_instant="true">
+ <value type="STRING" field="name" label="Name" />
+ <value type="UINT" field="oldValue" label="Old Value" />
+ <value type="UINT" field="newValue" label="New Value" />
<value type="FLAGVALUEORIGIN" field="origin" label="Origin" />
</event>
<event id="LongFlagChanged" path="vm/flag/long_changed" label="Long Flag Changed"
- is_instant="true">
- <value type="UTF8" field="name" label="Name" />
- <value type="LONG" field="old_value" label="Old Value" />
- <value type="LONG" field="new_value" label="New Value" />
+ is_instant="true">
+ <value type="STRING" field="name" label="Name" />
+ <value type="LONG" field="oldValue" label="Old Value" />
+ <value type="LONG" field="newValue" label="New Value" />
<value type="FLAGVALUEORIGIN" field="origin" label="Origin" />
</event>
<event id="UnsignedLongFlagChanged" path="vm/flag/ulong_changed" label="Unsigned Long Flag Changed"
- is_instant="true">
- <value type="UTF8" field="name" label="Name" />
- <value type="ULONG" field="old_value" label="Old Value" />
- <value type="ULONG" field="new_value" label="New Value" />
+ is_instant="true">
+ <value type="STRING" field="name" label="Name" />
+ <value type="ULONG" field="oldValue" label="Old Value" />
+ <value type="ULONG" field="newValue" label="New Value" />
<value type="FLAGVALUEORIGIN" field="origin" label="Origin" />
</event>
<event id="DoubleFlagChanged" path="vm/flag/double_changed" label="Double Flag Changed"
- is_instant="true">
- <value type="UTF8" field="name" label="Name" />
- <value type="DOUBLE" field="old_value" label="Old Value" />
- <value type="DOUBLE" field="new_value" label="New Value" />
+ is_instant="true">
+ <value type="STRING" field="name" label="Name" />
+ <value type="DOUBLE" field="oldValue" label="Old Value" />
+ <value type="DOUBLE" field="newValue" label="New Value" />
<value type="FLAGVALUEORIGIN" field="origin" label="Origin" />
</event>
<event id="BooleanFlagChanged" path="vm/flag/boolean_changed" label="Boolean Flag Changed"
- is_instant="true">
- <value type="UTF8" field="name" label="Name" />
- <value type="BOOLEAN" field="old_value" label="Old Value" />
- <value type="BOOLEAN" field="new_value" label="New Value" />
+ is_instant="true">
+ <value type="STRING" field="name" label="Name" />
+ <value type="BOOLEAN" field="oldValue" label="Old Value" />
+ <value type="BOOLEAN" field="newValue" label="New Value" />
<value type="FLAGVALUEORIGIN" field="origin" label="Origin" />
</event>
<event id="StringFlagChanged" path="vm/flag/string_changed" label="String Flag Changed"
- is_instant="true">
- <value type="UTF8" field="name" label="Name" />
- <value type="UTF8" field="old_value" label="Old Value" />
- <value type="UTF8" field="new_value" label="New Value" />
+ is_instant="true">
+ <value type="STRING" field="name" label="Name" />
+ <value type="STRING" field="oldValue" label="Old Value" />
+ <value type="STRING" field="newValue" label="New Value" />
<value type="FLAGVALUEORIGIN" field="origin" label="Origin" />
</event>
@@ -200,7 +201,7 @@
</struct>
<event id="GCHeapSummary" path="vm/gc/heap/summary" label="Heap Summary" is_instant="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="GCWHEN" field="when" label="When" />
<structvalue type="VirtualSpace" field="heapSpace" label="Heap Space"/>
<value type="BYTES64" field="heapUsed" label="Heap Used" description="Bytes allocated by objects in the heap"/>
@@ -213,7 +214,7 @@
</struct>
<event id="MetaspaceSummary" path="vm/gc/heap/metaspace_summary" label="Metaspace Summary" is_instant="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="GCWHEN" field="when" label="When" />
<value type="BYTES64" field="gcThreshold" label="GC Threshold" />
<structvalue type="MetaspaceSizes" field="metaspace" label="Total"/>
@@ -244,7 +245,7 @@
</event>
<event id="MetaspaceChunkFreeListSummary" path="vm/gc/metaspace/chunk_free_list_summary" label="Metaspace Chunk Free List Summary" is_instant="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="GCWHEN" field="when" label="When" />
<value type="METADATATYPE" field="metadataType" label="Metadata Type" />
<value type="ULONG" field="specializedChunks" label="Specialized Chunks" />
@@ -258,7 +259,7 @@
</event>
<event id="PSHeapSummary" path="vm/gc/heap/ps_summary" label="Parallel Scavenge Heap Summary" is_instant="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="GCWHEN" field="when" label="When" />
<structvalue type="VirtualSpace" field="oldSpace" label="Old Space"/>
@@ -271,7 +272,7 @@
</event>
<event id="G1HeapSummary" path="vm/gc/heap/g1_summary" label="G1 Heap Summary" is_instant="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="GCWHEN" field="when" label="When" />
<value type="BYTES64" field="edenUsedSize" label="Eden Used Size" />
@@ -280,53 +281,53 @@
<value type="UINT" field="numberOfRegions" label="Number of Regions" />
</event>
- <event id="GCGarbageCollection" path="vm/gc/collector/garbage_collection" label="Garbage Collection"
+ <event id="GarbageCollection" path="vm/gc/collector/garbage_collection" label="Garbage Collection"
description="Garbage collection performed by the JVM">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID" />
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId" />
<value type="GCNAME" field="name" label="Name" description="The name of the Garbage Collector" />
<value type="GCCAUSE" field="cause" label="Cause" description="The reason for triggering this Garbage Collection" />
<value type="TICKSPAN" field="sumOfPauses" label="Sum of Pauses" description="Sum of all the times in which Java execution was paused during the garbage collection" />
<value type="TICKSPAN" field="longestPause" label="Longest Pause" description="Longest individual pause during the garbage collection" />
</event>
- <event id="GCParallelOld" path="vm/gc/collector/parold_garbage_collection" label="Parallel Old Garbage Collection"
+ <event id="ParallelOldGarbageCollection" path="vm/gc/collector/parold_garbage_collection" label="Parallel Old Garbage Collection"
description="Extra information specific to Parallel Old Garbage Collections">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID" />
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId" />
<value type="ADDRESS" field="densePrefix" label="Dense Prefix" description="The address of the dense prefix, used when compacting" />
</event>
- <event id="GCYoungGarbageCollection" path="vm/gc/collector/young_garbage_collection" label="Young Garbage Collection"
+ <event id="YoungGarbageCollection" path="vm/gc/collector/young_garbage_collection" label="Young Garbage Collection"
description="Extra information specific to Young Garbage Collections">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID" />
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId" />
<value type="UINT" field="tenuringThreshold" label="Tenuring Threshold" />
</event>
- <event id="GCOldGarbageCollection" path="vm/gc/collector/old_garbage_collection" label="Old Garbage Collection"
+ <event id="OldGarbageCollection" path="vm/gc/collector/old_garbage_collection" label="Old Garbage Collection"
description="Extra information specific to Old Garbage Collections">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
</event>
- <event id="GCG1GarbageCollection" path="vm/gc/collector/g1_garbage_collection" label="G1 Garbage Collection"
+ <event id="G1GarbageCollection" path="vm/gc/collector/g1_garbage_collection" label="G1 Garbage Collection"
description="Extra information specific to G1 Garbage Collections">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="G1YCTYPE" field="type" label="Type" />
</event>
- <event id="GCG1MMU" path="vm/gc/detailed/g1_mmu_info" label="G1 MMU Information" is_instant="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
- <value type="DOUBLE" field="timeSlice" label="Time slice used to calculate MMU"/>
- <value type="DOUBLE" field="gcTime" label="Time spent on GC during last time slice"/>
- <value type="DOUBLE" field="maxGcTime" label="Max time allowed to be spent on GC during last time slice"/>
+ <event id="G1MMU" path="vm/gc/detailed/g1_mmu_info" label="G1 MMU Information" is_instant="true">
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
+ <value type="DOUBLE" field="timeSlice" label="Time Slice" description="Time slice used to calculate MMU"/>
+ <value type="DOUBLE" field="gcTime" label="GC Time" description="Time spent on GC during last time slice"/>
+ <value type="DOUBLE" field="maxGcTime" label="Max GC Time" description="Max time allowed to be spent on GC during last time slice"/>
</event>
- <event id="EvacuationInfo" path="vm/gc/detailed/evacuation_info" label="Evacuation Information" is_instant="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <event id="EvacuationInformation" path="vm/gc/detailed/evacuation_info" label="Evacuation Information" is_instant="true">
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="UINT" field="cSetRegions" label="Collection Set Regions"/>
<value type="BYTES64" field="cSetUsedBefore" label="Collection Set Before" description="Memory usage before GC in the collection set regions"/>
<value type="BYTES64" field="cSetUsedAfter" label="Collection Set After" description="Memory usage after GC in the collection set regions"/>
<value type="UINT" field="allocationRegions" label="Allocation Regions" description="Regions chosen as allocation regions during evacuation (includes survivors and old space regions)"/>
- <value type="BYTES64" field="allocRegionsUsedBefore" label="Alloc Regions Before" description="Memory usage before GC in allocation regions"/>
- <value type="BYTES64" field="allocRegionsUsedAfter" label="Alloc Regions After" description="Memory usage after GC in allocation regions"/>
+ <value type="BYTES64" field="allocationRegionsUsedBefore" label="Allocation Regions Before" description="Memory usage before GC in allocation regions"/>
+ <value type="BYTES64" field="allocationRegionsUsedAfter" label="Allocation Regions After" description="Memory usage after GC in allocation regions"/>
<value type="BYTES64" field="bytesCopied" label="Bytes Copied"/>
<value type="UINT" field="regionsFreed" label="Regions Freed"/>
</event>
@@ -334,7 +335,7 @@
<event id="GCReferenceStatistics" path="vm/gc/reference/statistics"
label="GC Reference Statistics" is_instant="true"
description="Total count of processed references during GC">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="REFERENCETYPE" field="type" label="Type" />
<value type="ULONG" field="count" label="Total Count" />
</event>
@@ -347,14 +348,14 @@
</struct>
<event id="ObjectCountAfterGC" path="vm/gc/detailed/object_count_after_gc" is_instant="true" label="Object Count after GC">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID" />
- <value type="CLASS" field="class" label="Class" />
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId" />
+ <value type="CLASS" field="objectClass" label="Object Class" />
<value type="LONG" field="count" label="Count" />
<value type="BYTES64" field="totalSize" label="Total Size" />
</event>
- <struct id="G1EvacStats">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <struct id="G1EvacuationStatistics">
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="BYTES64" field="allocated" label="Allocated" description="Total memory allocated by PLABs"/>
<value type="BYTES64" field="wasted" label="Wasted" description="Total memory wasted within PLABs due to alignment or refill"/>
<value type="BYTES64" field="used" label="Used" description="Total memory occupied by objects within PLABs"/>
@@ -366,48 +367,48 @@
<value type="BYTES64" field="failureWaste" label="Wasted (failure)" description="Total memory left unused in regions where evacuation failed"/>
</struct>
- <event id="GCG1EvacuationYoungStatistics" path="vm/gc/detailed/g1_evac_young_stats" label="G1 Evacuation Statistics for Young" is_instant="true"
- description="Memory related evacuation statistics during GC for the young generation">
- <structvalue type="G1EvacStats" field="stats" label="Evacuation statistics"/>
+ <event id="G1EvacuationYoungStatistics" path="vm/gc/detailed/g1_evac_young_stats" label="G1 Evacuation Statistics for Young"
+ is_instant="true" description="Memory related evacuation statistics during GC for the young generation">
+ <structvalue type="G1EvacuationStatistics" field="statistics" label="Evacuation Statistics"/>
</event>
- <event id="GCG1EvacuationOldStatistics" path="vm/gc/detailed/g1_evac_old_stats" label="G1 Evacuation Memory Statistics for Old" is_instant="true"
- description="Memory related evacuation statistics during GC for the old generation">
- <structvalue type="G1EvacStats" field="stats" label="Evacuation statistics"/>
+ <event id="G1EvacuationOldStatistics" path="vm/gc/detailed/g1_evac_old_stats" label="G1 Evacuation Memory Statistics for Old"
+ is_instant="true" description="Memory related evacuation statistics during GC for the old generation">
+ <structvalue type="G1EvacuationStatistics" field="statistics" label="Evacuation Statistics"/>
</event>
- <event id="GCG1BasicIHOP" path="vm/gc/detailed/g1_basic_ihop_status" label="G1 Basic IHOP statistics" is_instant="true"
- description="Basic statistics related to current IHOP calculation">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <event id="G1BasicIHOP" path="vm/gc/detailed/g1_basic_ihop_status" label="G1 Basic IHOP statistics"
+ is_instant="true" description="Basic statistics related to current IHOP calculation">
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="BYTES64" field="threshold" label="Current IHOP threshold" description="Current IHOP threshold in bytes"/>
<value type="PERCENTAGE" field="thresholdPercentage" label="Current IHOP threshold in percent" description="Current IHOP threshold in percent of old gen"/>
- <value type="BYTES64" field="targetOccupancy" label="Target occupancy" description="Target old gen occupancy to reach at the start of mixed GC in bytes"/>
- <value type="BYTES64" field="currentOccupancy" label="Current occupancy" description="Current old gen occupancy in bytes"/>
- <value type="BYTES64" field="lastAllocationSize" label="Last mutator allocation size" description="Mutator allocation during mutator operation since last GC in bytes"/>
- <value type="DOUBLE" field="lastAllocationDuration" label="Last mutator operation duration" description="Time the mutator ran since last GC in seconds"/>
- <value type="DOUBLE" field="lastAllocationRate" label="Last mutator allocation rate" description="Allocation rate of the mutator since last GC in bytes/second"/>
- <value type="DOUBLE" field="lastMarkingLength" label="Last mutator time from initial mark to first mixed GC" description="Last time from the end of the last initial mark to the first mixed GC in seconds"/>
+ <value type="BYTES64" field="targetOccupancy" label="Target Occupancy" description="Target old gen occupancy to reach at the start of mixed GC in bytes"/>
+ <value type="BYTES64" field="currentOccupancy" label="Current Occupancy" description="Current old generation occupancy in bytes"/>
+ <value type="BYTES64" field="lastAllocationSize" label="Last Mutator Allocation" description="Mutator allocation during mutator operation since last GC in bytes"/>
+ <value type="DOUBLE" field="lastAllocationDuration" label="Last Mutator Operation" description="Time the mutator ran since last GC in seconds"/>
+ <value type="DOUBLE" field="lastAllocationRate" label="Last Mutator Allocation Rate" description="Allocation rate of the mutator since last GC in bytes/second"/>
+ <value type="DOUBLE" field="lastMarkingLength" label="Last Marking Length" description="Last time from the end of the last initial mark to the first mixed GC in seconds"/>
</event>
- <event id="GCG1AdaptiveIHOP" path="vm/gc/detailed/g1_adaptive_ihop_status" label="G1 Adaptive IHOP statistics" is_instant="true"
- description="Statistics related to current adaptive IHOP calculation">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
- <value type="BYTES64" field="threshold" label="Current IHOP threshold" description="Current IHOP threshold in bytes"/>
- <value type="PERCENTAGE" field="thresholdPercentage" label="Current IHOP threshold in percent" description="Current IHOP threshold in percent of the internal target occupancy"/>
- <value type="BYTES64" field="internalTargetOccupancy" label="Target occupancy" description="Internal target old gen occupancy to reach at the start of mixed GC in bytes"/>
- <value type="BYTES64" field="currentOccupancy" label="Current occupancy" description="Current old gen occupancy in bytes"/>
- <value type="BYTES64" field="additionalBufferSize" label="Additional buffer size" description="Additional buffer size in bytes"/>
- <value type="DOUBLE" field="predictedAllocationRate" label="Predicted mutator allocation rate" description="Current predicted allocation rate for the mutator in bytes/second"/>
- <value type="DOUBLE" field="predictedMarkingLength" label="Predicted time from initial mark to first mixed GC" description="Current predicted time from the end of the last initial mark to the first mixed GC in seconds"/>
- <value type="BOOLEAN" field="predictionActive" label="Prediction active" description="Indicates whether the adaptive IHOP prediction is active"/>
+ <event id="G1AdaptiveIHOP" path="vm/gc/detailed/g1_adaptive_ihop_status" label="G1 Adaptive IHOP statistics"
+ is_instant="true" description="Statistics related to current adaptive IHOP calculation">
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
+ <value type="BYTES64" field="threshold" label="Threshold" description="Current IHOP threshold in bytes"/>
+ <value type="PERCENTAGE" field="thresholdPercentage" label="Threshold Percentage" description="Current IHOP threshold in percent of the internal target occupancy"/>
+ <value type="BYTES64" field="internalTargetOccupancy" label="Target Occupancy" description="Internal target old generation occupancy to reach at the start of mixed GC in bytes"/>
+ <value type="BYTES64" field="currentOccupancy" label="Current Occupancy" description="Current old generation occupancy in bytes"/>
+ <value type="BYTES64" field="additionalBufferSize" label="Additional Buffer" description="Additional buffer size in bytes"/>
+ <value type="DOUBLE" field="predictedAllocationRate" label="Predicted Allocation Rate" description="Current predicted allocation rate for the mutator in bytes/second"/>
+ <value type="DOUBLE" field="predictedMarkingLength" label="Predicted Marking Length" description="Current predicted time from the end of the last initial mark to the first mixed GC in seconds"/>
+ <value type="BOOLEAN" field="predictionActive" label="Prediction Active" description="Indicates whether the adaptive IHOP prediction is active"/>
</event>
<!-- Promotion events, Supported GCs are Parallel Scavange, G1 and CMS with Parallel New. -->
<event id="PromoteObjectInNewPLAB" path="vm/gc/detailed/object_promotion_in_new_PLAB" label="Promotion in new PLAB"
- description="Object survived scavenge and was copied to a new Promotion Local Allocation Buffer (PLAB). Supported GCs are Parallel Scavange, G1 and CMS with Parallel New. Due to promotion being done in parallel an object might be reported multiple times as the GC threads race to copy all objects."
+ description="Object survived scavenge and was copied to a new Promotion Local Allocation Buffer (PLAB). Supported GCs are Parallel Scavange, G1 and CMS with Parallel New. Due to promotion being done in parallel an object might be reported multiple times as the GC threads race to copy all objects."
has_thread="true" has_stacktrace="false" is_instant="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID" description="ID of GC during which the object was promoted"/>
- <value type="CLASS" field="class" label="Class" description="Class of promoted object"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId" description="Identifier signifying GC during which the object was promoted"/>
+ <value type="CLASS" field="objectClass" label="Object Class" description="Class of promoted object"/>
<value type="BYTES64" field="objectSize" label="Object Size" description="Size of promoted object"/>
<value type="UINT" field="tenuringAge" label="Object Tenuring Age" description="Tenuring age of a surviving object before being copied. The tenuring age of an object is a value between 0-15 and is incremented each scavange the object survives. Newly allocated objects have tenuring age 0."/>
<value type="BOOLEAN" field="tenured" label="Tenured" description="True if object was promoted to Old space, otherwise the object was aged and copied to a Survivor space"/>
@@ -415,10 +416,10 @@
</event>
<event id="PromoteObjectOutsidePLAB" path="vm/gc/detailed/object_promotion_outside_PLAB" label="Promotion outside PLAB"
- description="Object survived scavenge and was copied directly to the heap. Supported GCs are Parallel Scavange, G1 and CMS with Parallel New. Due to promotion being done in parallel an object might be reported multiple times as the GC threads race to copy all objects."
+ description="Object survived scavenge and was copied directly to the heap. Supported GCs are Parallel Scavange, G1 and CMS with Parallel New. Due to promotion being done in parallel an object might be reported multiple times as the GC threads race to copy all objects."
has_thread="true" has_stacktrace="false" is_instant="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID" description="ID of GC during which the object was promoted"/>
- <value type="CLASS" field="class" label="Class" description="Class of promoted object"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId" description="Identifier signifying GC during which the object was promoted"/>
+ <value type="CLASS" field="objectClass" label="Object Class" description="Class of promoted object"/>
<value type="BYTES64" field="objectSize" label="Object Size" description="Size of promoted object"/>
<value type="UINT" field="tenuringAge" label="Object Tenuring Age" description="Tenuring age of a surviving object before being copied. The tenuring age of an object is a value between 0-15 and is incremented each scavange the object survives. Newly allocated objects have tenuring age 0."/>
<value type="BOOLEAN" field="tenured" label="Tenured" description="True if object was promoted to Old space, otherwise the object was aged and copied to a Survivor space"/>
@@ -426,81 +427,76 @@
<event id="PromotionFailed" path="vm/gc/detailed/promotion_failed" label="Promotion Failed" is_instant="true"
description="Promotion of an object failed">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
- <structvalue type="CopyFailed" field="data" label="Data"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
+ <structvalue type="CopyFailed" field="promotionFailed" label="Promotion Failed Data"/>
<value type="THREAD" field="thread" label="Running thread"/>
</event>
<event id="EvacuationFailed" path="vm/gc/detailed/evacuation_failed" label="Evacuation Failed" is_instant="true"
description="Evacuation of an object failed">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
- <structvalue type="CopyFailed" field="data" label="Data"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
+ <structvalue type="CopyFailed" field="evacuationFailed" label="Evacuation Failed Data"/>
</event>
<event id="ConcurrentModeFailure" path="vm/gc/detailed/concurrent_mode_failure" label="Concurrent Mode Failure"
is_instant="true" description="Concurrent Mode failed">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
</event>
<event id="GCPhasePause" path="vm/gc/phases/pause" label="GC Phase Pause" has_thread="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
- <value type="UTF8" field="name" label="Name" />
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
+ <value type="STRING" field="name" label="Name" />
</event>
<event id="GCPhasePauseLevel1" path="vm/gc/phases/pause_level_1" label="GC Phase Pause Level 1" has_thread="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
- <value type="UTF8" field="name" label="Name" />
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
+ <value type="STRING" field="name" label="Name" />
</event>
<event id="GCPhasePauseLevel2" path="vm/gc/phases/pause_level_2" label="GC Phase Pause Level 2" has_thread="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
- <value type="UTF8" field="name" label="Name" />
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
+ <value type="STRING" field="name" label="Name" />
</event>
<event id="GCPhasePauseLevel3" path="vm/gc/phases/pause_level_3" label="GC Phase Pause Level 3" has_thread="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
- <value type="UTF8" field="name" label="Name" />
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
+ <value type="STRING" field="name" label="Name" />
</event>
<event id="GCPhaseConcurrent" path="vm/gc/phases/concurrent" label="GC Phase Concurrent" has_thread="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
- <value type="UTF8" field="name" label="Name" />
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
+ <value type="STRING" field="name" label="Name" />
</event>
<event id="AllocationRequiringGC" path="vm/gc/detailed/allocation_requiring_gc" label="Allocation Requiring GC"
has_thread="true" has_stacktrace="true" is_instant="true">
- <value type="UINT" field="gcId" label="Pending GC ID" relation="GC_ID" />
+ <value type="UINT" field="gcId" label="Pending GC Identifier" relation="GcId" />
<value type="BYTES64" field="size" label="Allocation Size" />
</event>
<event id="TenuringDistribution" path="vm/gc/detailed/tenuring_distribution" label="Tenuring Distribution"
is_instant="true">
- <value type="UINT" field="gcId" label="GC ID" relation="GC_ID"/>
+ <value type="UINT" field="gcId" label="GC Identifier" relation="GcId"/>
<value type="UINT" field="age" label="Age" />
<value type="BYTES64" field="size" label="Size" />
</event>
<event id="G1HeapRegionTypeChange" path="vm/gc/detailed/g1_heap_region_type_change" label="G1 Heap Region Type Change"
- description="Information about a G1 heap region type change." is_instant="true">
+ description="Information about a G1 heap region type change" is_instant="true">
<value type="UINT" field="index" label="Index" />
- <value type="G1HEAPREGIONTYPE" field="from" label="From Type" />
- <value type="G1HEAPREGIONTYPE" field="to" label="To Type" />
+ <value type="G1HEAPREGIONTYPE" field="from" label="From" />
+ <value type="G1HEAPREGIONTYPE" field="to" label="To" />
<value type="ADDRESS" field="start" label="Start" />
<value type="BYTES64" field="used" label="Used" />
- <value type="UINT" field="allocContext" label="Allocation Context" />
- </event>
-
- <event id="VMError" path="vm/runtime/vm_error" label="VM Error"
- description="VM shutdown due to an error" has_stacktrace="true" has_thread="true">
- <value type="BOOLEAN" field="out_of_java_memory" label="Java Out Of Memory"/>
+ <value type="UINT" field="allocationContext" label="Allocation Context" />
</event>
<!-- Compiler events -->
<event id="Compilation" path="vm/compiler/compilation" label="Compilation"
- has_thread="true" is_requestable="false" is_constant="false">
+ has_thread="true" is_requestable="false" is_constant="false">
<value type="METHOD" field="method" label="Java Method"/>
- <value type="UINT" field="compileID" label="Compilation ID" relation="COMP_ID"/>
+ <value type="UINT" field="compileId" label="Compilation Identifier" relation="CompileId"/>
<value type="USHORT" field="compileLevel" label="Compilation Level"/>
<value type="BOOLEAN" field="succeded" label="Succeeded"/>
<value type="BOOLEAN" field="isOsr" label="On Stack Replacement"/>
@@ -509,39 +505,39 @@
</event>
<event id="CompilerPhase" path="vm/compiler/phase" label="Compiler Phase"
- has_thread="true" is_requestable="false" is_constant="false">
+ has_thread="true" is_requestable="false" is_constant="false">
<value type="COMPILERPHASETYPE" field="phase" label="Compile Phase"/>
- <value type="UINT" field="compileID" label="Compilation ID" relation="COMP_ID"/>
+ <value type="UINT" field="compileId" label="Compilation Identifier" relation="CompileId"/>
<value type="USHORT" field="phaseLevel" label="Phase Level"/>
</event>
- <event id="CompilerFailure" path="vm/compiler/failure" label="Compilation Failure"
- has_thread="true" is_requestable="false" is_constant="false" is_instant="true">
- <value type="UTF8" field="failure" label="Message"/>
- <value type="UINT" field="compileID" label="Compilation ID" relation="COMP_ID"/>
+ <event id="CompilationFailure" path="vm/compiler/failure" label="Compilation Failure"
+ has_thread="true" is_requestable="false" is_constant="false" is_instant="true">
+ <value type="STRING" field="failureMessage" label="Failure Message"/>
+ <value type="UINT" field="compileId" label="Compilation Identifier" relation="CompileId"/>
</event>
- <struct id="CiMethod">
- <value type="UTF8" field="class" label="Class name"/>
- <value type="UTF8" field="name" label="Method name"/>
- <value type="UTF8" field="signature" label="Method signature"/>
+ <struct id="CalleeMethod">
+ <value type="STRING" field="type" label="Class"/>
+ <value type="STRING" field="name" label="Method Name"/>
+ <value type="STRING" field="descriptor" label="Method Descriptor"/>
</struct>
<event id="CompilerInlining" path="vm/compiler/optimization/inlining" label="Method Inlining"
- has_thread="true" is_instant="true">
- <value type="UINT" field="compileID" label="Compilation ID" relation="COMP_ID"/>
+ has_thread="true" is_instant="true">
+ <value type="UINT" field="compileId" label="Compilation Identifier" relation="CompileId"/>
<value type="METHOD" field="caller" label="Caller Method"/>
- <structvalue type="CiMethod" field="callee" label="Callee Method"/>
+ <structvalue type="CalleeMethod" field="callee" label="Callee Method"/>
<value type="BOOLEAN" field="succeeded" label="Succeeded"/>
- <value type="UTF8" field="message" label="Message"/>
+ <value type="STRING" field="message" label="Message"/>
<value type="INTEGER" field="bci" label="Byte Code Index"/>
</event>
<!-- Code sweeper events -->
<event id="SweepCodeCache" path="vm/code_sweeper/sweep" label="Sweep Code Cache"
- has_thread="true" is_requestable="false" is_constant="false">
- <value type="INTEGER" field="sweepIndex" label="Sweep Index" relation="SWEEP_ID"/>
+ has_thread="true" is_requestable="false" is_constant="false">
+ <value type="INTEGER" field="sweepId" label="Sweep Identifier" relation="SweepId"/>
<value type="UINT" field="sweptCount" label="Methods Swept"/>
<value type="UINT" field="flushedCount" label="Methods Flushed"/>
<value type="UINT" field="zombifiedCount" label="Methods Zombified"/>
@@ -550,7 +546,7 @@
<!-- Code cache events -->
<event id="CodeCacheFull" path="vm/code_cache/full" label="Code Cache Full"
- has_thread="true" is_requestable="false" is_constant="false" is_instant="true">
+ has_thread="true" is_requestable="false" is_constant="false" is_instant="true">
<value type="CODEBLOBTYPE" field="codeBlobType" label="Code Heap"/>
<value type="ADDRESS" field="startAddress" label="Start Address"/>
<value type="ADDRESS" field="commitedTopAddress" label="Commited Top"/>
@@ -564,14 +560,14 @@
<event id="SafepointBegin" path="vm/runtime/safepoint/begin" label="Safepoint Begin"
description="Safepointing begin" has_thread="true">
- <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+ <value type="INTEGER" field="safepointId" label="Safepoint Identifier" relation="SafepointId"/>
<value type="INTEGER" field="totalThreadCount" label="Total Threads" description="The total number of threads at the start of safe point"/>
<value type="INTEGER" field="jniCriticalThreadCount" label="JNI Critical Threads" description="The number of threads in JNI critical sections"/>
</event>
- <event id="SafepointStateSync" path="vm/runtime/safepoint/statesync" label="Safepoint State Sync"
+ <event id="SafepointStateSynchronization" path="vm/runtime/safepoint/statesync" label="Safepoint State Synchronization"
description="Synchronize run state of threads" has_thread="true">
- <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+ <value type="INTEGER" field="safepointId" label="Safepoint Identifier" relation="SafepointId"/>
<value type="INTEGER" field="initialThreadCount" label="Initial Threads" description="The number of threads running at the beginning of state check"/>
<value type="INTEGER" field="runningThreadCount" label="Running Threads" description="The number of threads still running"/>
<value type="INTEGER" field="iterations" label="Iterations" description="Number of state check iterations"/>
@@ -579,46 +575,46 @@
<event id="SafepointWaitBlocked" path="vm/runtime/safepoint/waitblocked" label="Safepoint Wait Blocked"
description="Safepointing begin waiting on running threads to block" has_thread="true">
- <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+ <value type="INTEGER" field="safepointId" label="Safepoint Identifier" relation="SafepointId"/>
<value type="INTEGER" field="runningThreadCount" label="Running Threads" description="The number running of threads wait for safe point"/>
</event>
<event id="SafepointCleanup" path="vm/runtime/safepoint/cleanup" label="Safepoint Cleanup"
description="Safepointing begin running cleanup tasks" has_thread="true">
- <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+ <value type="INTEGER" field="safepointId" label="Safepoint Identifier" relation="SafepointId"/>
</event>
<event id="SafepointCleanupTask" path="vm/runtime/safepoint/cleanuptask" label="Safepoint Cleanup Task"
description="Safepointing begin running cleanup tasks" has_thread="true">
- <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
- <value type="UTF8" field="name" label="Task Name" description="The task name"/>
+ <value type="INTEGER" field="safepointId" label="Safepoint Identifier" relation="SafepointId"/>
+ <value type="STRING" field="name" label="Task Name" description="The task name"/>
</event>
<event id="SafepointEnd" path="vm/runtime/safepoint/end" label="Safepoint End"
description="Safepointing end" has_thread="true">
- <value type="INTEGER" field="safepointId" label="Safepoint ID" relation="SAFEPOINT_ID"/>
+ <value type="INTEGER" field="safepointId" label="Safepoint Identifier" relation="SafepointId"/>
</event>
<event id="ExecuteVMOperation" path="vm/runtime/execute_vm_operation" label="VM Operation"
- description="Execution of a VM Operation" has_thread="true">
+ description="Execution of a VM Operation" has_thread="true">
<value type="VMOPERATIONTYPE" field="operation" label="Operation" />
- <value type="BOOLEAN" field="safepoint" label="At Safepoint" description="If the operation occured at a safepoint."/>
- <value type="BOOLEAN" field="blocking" label="Caller Blocked" description="If the calling thread was blocked until the operation was complete."/>
- <value type="THREAD" field="caller" label="Caller" transition="FROM" description="Thread requesting operation. If non-blocking, will be set to 0 indicating thread is unknown."/>
- <value type="INTEGER" field="safepointId" label="Safepoint ID" description="The safepoint (if any) under which this operation was completed." relation="SAFEPOINT_ID"/>
+ <value type="BOOLEAN" field="safepoint" label="At Safepoint" description="If the operation occured at a safepoint"/>
+ <value type="BOOLEAN" field="blocking" label="Caller Blocked" description="If the calling thread was blocked until the operation was complete"/>
+ <value type="THREAD" field="caller" label="Caller" transition="FROM" description="Thread requesting operation. If non-blocking, will be set to 0 indicating thread is unknown"/>
+ <value type="INTEGER" field="safepointId" label="Safepoint Identifier" description="The safepoint (if any) under which this operation was completed" relation="SafepointId"/>
</event>
<!-- Allocation events -->
- <event id="AllocObjectInNewTLAB" path="java/object_alloc_in_new_TLAB" label="Allocation in new TLAB"
- description="Allocation in new Thread Local Allocation Buffer" has_thread="true" has_stacktrace="true" is_instant="true">
- <value type="CLASS" field="class" label="Class" description="Class of allocated object"/>
+ <event id="ObjectAllocationInNewTLAB" path="java/object_alloc_in_new_TLAB" label="Allocation in new TLAB"
+ description="Allocation in new Thread Local Allocation Buffer" has_thread="true" has_stacktrace="true" is_instant="true">
+ <value type="CLASS" field="objectClass" label="Object Class" description="Class of allocated object"/>
<value type="BYTES64" field="allocationSize" label="Allocation Size"/>
<value type="BYTES64" field="tlabSize" label="TLAB Size"/>
</event>
- <event id="AllocObjectOutsideTLAB" path="java/object_alloc_outside_TLAB" label="Allocation outside TLAB"
- description="Allocation outside Thread Local Allocation Buffers" has_thread="true" has_stacktrace="true" is_instant="true">
- <value type="CLASS" field="class" label="Class" description="Class of allocated object"/>
+ <event id="ObjectAllocationOutsideTLAB" path="java/object_alloc_outside_TLAB" label="Allocation outside TLAB"
+ description="Allocation outside Thread Local Allocation Buffers" has_thread="true" has_stacktrace="true" is_instant="true">
+ <value type="CLASS" field="objectClass" label="Object Class" description="Class of allocated object"/>
<value type="BYTES64" field="allocationSize" label="Allocation Size"/>
</event>
</events>
--- a/hotspot/src/share/vm/trace/tracerelationdecls.xml Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/trace/tracerelationdecls.xml Mon Sep 12 22:04:48 2016 +0000
@@ -27,9 +27,9 @@
<!DOCTYPE relation_decls SYSTEM "trace.dtd">
<relation_decls>
- <relation_decl id="GC_ID" uri="vm/gc/id"/>
- <relation_decl id="COMP_ID" uri="vm/compiler/id"/>
- <relation_decl id="SWEEP_ID" uri="vm/code_sweeper/id"/>
- <relation_decl id="JAVA_MONITOR_ADDRESS" uri="java/monitor/address"/>
- <relation_decl id="SAFEPOINT_ID" uri="vm/runtime/safepoint/id"/>
+ <relation_decl id="GcId" uri="vm/gc/id"/>
+ <relation_decl id="CompileId" uri="vm/compiler/id"/>
+ <relation_decl id="SweepId" uri="vm/code_sweeper/id"/>
+ <relation_decl id="JavaMonitorAddress" uri="java/monitor/address"/>
+ <relation_decl id="SafepointId" uri="vm/runtime/safepoint/id"/>
</relation_decls>
--- a/hotspot/src/share/vm/trace/tracetypes.xml Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/trace/tracetypes.xml Mon Sep 12 22:04:48 2016 +0000
@@ -43,7 +43,7 @@
Example: (GcMode)
<content_type id="GCMode" hr_name="GC mode" type="U1" jvm_type="GCMODE">
- <value type="UTF8" field="desc" description="Description"/>
+ <value type="STRING" field="desc" description="Description"/>
</content_type>
This creates a content type CONTENT_TYPE_GCMODE
@@ -61,131 +61,131 @@
<content_types>
<content_type id="Thread" hr_name="Thread"
type="U8" builtin_type="THREAD">
- <value type="UTF8" field="osName" label="OS Thread Name"/>
- <value type="LONG" field="osThreadID" label="OS Thread ID"/>
- <value type="UTF8" field="javaName" label="Java Lang Thread Name"/>
- <value type="LONG" field="javaThreadID" label="Java Lang Thread ID"/>
+ <value type="STRING" field="osName" label="OS Thread Name"/>
+ <value type="LONG" field="osThreadId" label="OS Thread Id"/>
+ <value type="STRING" field="javaName" label="Java Thread Name"/>
+ <value type="LONG" field="javaThreadId" label="Java Thread Id"/>
<value type="THREADGROUP" field="group" label="Java Thread Group"/>
</content_type>
<content_type id="ThreadGroup" hr_name="Thread group"
type="U8" jvm_type="THREADGROUP">
<value type="THREADGROUP" field="parent" label="Parent"/>
- <value type="UTF8" field="name" label="Name"/>
+ <value type="STRING" field="name" label="Name"/>
</content_type>
<content_type id="Class" hr_name="Java class"
type="U8" builtin_type="CLASS">
- <value type="CLASS" field="loaderClass" label="ClassLoader"/>
+ <value type="CLASS" field="classLoaderType" label="Class Loader"/>
<value type="SYMBOL" field="name" label="Name"/>
<value type="PACKAGE" field="package" label="Package"/>
- <value type="SHORT" field="modifiers" label="Access modifiers"/>
+ <value type="INTEGER" field="modifiers" label="Access Modifiers"/>
</content_type>
<content_type id="Method" hr_name="Java method"
type="U8" jvm_type="METHOD">
- <value type="CLASS" field="class" label="Class"/>
+ <value type="CLASS" field="type" label="Type"/>
<value type="SYMBOL" field="name" label="Name"/>
- <value type="SYMBOL" field="signature" label="Signature"/>
- <value type="SHORT" field="modifiers" label="Access modifiers"/>
+ <value type="SYMBOL" field="descriptor" label="Descriptor"/>
+ <value type="INTEGER" field="modifiers" label="Access Modifiers"/>
<value type="BOOLEAN" field="hidden" label="Hidden"/>
</content_type>
- <content_type id="UTFConstant" hr_name="UTF constant"
+ <content_type id="Symbol" hr_name="Symbol"
type="U8" jvm_type="SYMBOL">
- <value type="UTF8" field="utf8" label="UTF8 data"/>
+ <value type="STRING" field="string" label="String"/>
</content_type>
<content_type id="ThreadState" hr_name="Java Thread State"
type="U8" jvm_type="THREADSTATE">
- <value type="UTF8" field="name" label="Name"/>
+ <value type="STRING" field="name" label="Name"/>
</content_type>
<content_type id="GCName" hr_name="GC Name"
type="U8" jvm_type="GCNAME">
- <value type="UTF8" field="name" label="name" />
+ <value type="STRING" field="name" label="Name" />
</content_type>
<content_type id="GCCause" hr_name="GC Cause"
type="U8" jvm_type="GCCAUSE">
- <value type="UTF8" field="cause" label="cause" />
+ <value type="STRING" field="cause" label="Cause" />
</content_type>
<content_type id="GCWhen" hr_name="GC When"
type="U8" jvm_type="GCWHEN">
- <value type="UTF8" field="when" label="when" />
+ <value type="STRING" field="when" label="When" />
</content_type>
<content_type id="G1HeapRegionType" hr_name="G1 Heap Region Type"
type="U8" jvm_type="G1HEAPREGIONTYPE">
- <value type="UTF8" field="type" label="type" />
+ <value type="STRING" field="type" label="Type" />
</content_type>
<content_type id="G1YCType" hr_name="G1 YC Type"
type="U8" jvm_type="G1YCTYPE">
- <value type="UTF8" field="type" label="type" />
+ <value type="STRING" field="type" label="Type" />
</content_type>
<content_type id="GCThresholdUpdater" hr_name="GC Treshold Updater"
type="U8" jvm_type="GCTHRESHOLDUPDATER">
- <value type="UTF8" field="updater" label="updater" />
+ <value type="STRING" field="updater" label="Updater" />
</content_type>
<content_type id="ReferenceType" hr_name="Reference Type"
type="U8" jvm_type="REFERENCETYPE">
- <value type="UTF8" field="type" label="type" />
+ <value type="STRING" field="type" label="Type" />
</content_type>
<content_type id="MetadataType" hr_name="Metadata Type"
type="U8" jvm_type="METADATATYPE">
- <value type="UTF8" field="type" label="type" />
+ <value type="STRING" field="type" label="Type" />
</content_type>
<content_type id="MetaspaceObjectType" hr_name="Metaspace Object Type"
type="U8" jvm_type="METASPACEOBJTYPE">
- <value type="UTF8" field="type" label="type" />
+ <value type="STRING" field="type" label="Type" />
</content_type>
- <content_type id="NARROW_OOP_MODE" hr_name="Narrow Oop Mode"
+ <content_type id="NarrowOopMode" hr_name="Narrow oop Mode"
type="U8" jvm_type="NARROWOOPMODE">
- <value type="UTF8" field="mode" label="mode" />
+ <value type="STRING" field="mode" label="Mode" />
</content_type>
<content_type id="VMOperationType" hr_name="VM Operation Type"
type="U8" jvm_type="VMOPERATIONTYPE">
- <value type="UTF8" field="type" label="type" />
+ <value type="STRING" field="type" label="Type" />
</content_type>
<content_type id="CompilerPhaseType" hr_name="Compiler Phase Type"
type="U8" jvm_type="COMPILERPHASETYPE">
- <value type="UTF8" field="phase" label="phase" />
+ <value type="STRING" field="phase" label="Phase" />
</content_type>
<content_type id="FlagValueOrigin" hr_name="Flag Value Origin"
type="U8" jvm_type="FLAGVALUEORIGIN">
- <value type="UTF8" field="origin" label="origin" />
+ <value type="STRING" field="origin" label="Origin" />
</content_type>
<content_type id="CodeBlobType" hr_name="Code Blob Type"
type="U8" jvm_type="CODEBLOBTYPE">
- <value type="UTF8" field="type" label="type" />
+ <value type="STRING" field="type" label="Type" />
</content_type>
<content_type id="InflateCause" hr_name="Inflation Cause"
type="U8" jvm_type="INFLATECAUSE">
- <value type="UTF8" field="cause" label="cause" />
+ <value type="STRING" field="cause" label="Cause" />
</content_type>
<content_type id="Module" hr_name="Module"
- type="U8" jvm_type="MODULE">
+ type="U8" jvm_type="MODULE">
<value type="SYMBOL" field="name" label="Name"/>
<value type="SYMBOL" field="version" label="Version"/>
<value type="SYMBOL" field="location" label="Location"/>
- <value type="CLASS" field="classLoader" label="ClassLoader"/>
+ <value type="CLASS" field="classLoader" label="Class Loader"/>
</content_type>
<content_type id="Package" hr_name="Package"
- type="U8" jvm_type="PACKAGE">
+ type="U8" jvm_type="PACKAGE">
<value type="SYMBOL" field="name" label="Name"/>
<value type="MODULE" field="module" label="Module"/>
<value type="BOOLEAN" field="exported" label="Exported"/>
@@ -288,8 +288,9 @@
<primary_type symbol="PERCENTAGE" datatype="FLOAT" contenttype="PERCENTAGE"
type="float" sizeop="sizeof(float)"/>
- <!-- UTF8-encoded string, max length Integer.MAX_VALUE -->
- <primary_type symbol="UTF8" datatype="UTF8" contenttype="NONE"
+ <!-- STRING is a virtual type - depending on encoding
+ it will have polymorphic content -->
+ <primary_type symbol="STRING" datatype="STRING" contenttype="NONE"
type="const char*" sizeop="sizeof_utf(%)"/>
<!-- Symbol* constant. Note that this may currently ONLY be used by
@@ -306,7 +307,7 @@
type="const ModuleEntry*" sizeop="sizeof(u8)"/>
<primary_type symbol="PACKAGE" datatype="U8" contenttype="PACKAGE"
- type="const PackageEntry*" sizeop="sizeof(u8)"/>
+ type="const PackageEntry*" sizeop="sizeof(u8)"/>
<!-- A Method *. The method is marked as "used" and will eventually be
written into the recording constant pool. -->
@@ -325,8 +326,7 @@
<!-- Threadgroup THIS TYPE MAY NOT BE USED IN NORMAL EVENTS (ATM). Only
for thread constant pool // KK TODO: u8 should be ObjectP -->
<primary_type symbol="THREADGROUP" datatype="U8" contenttype="THREADGROUP"
- type="u8"
- sizeop="sizeof(u8)"/>
+ type="u8" sizeop="sizeof(u8)"/>
<!-- FRAMETYPE enum -->
<primary_type symbol="FRAMETYPE" datatype="U8" contenttype="FRAMETYPE"
@@ -361,39 +361,39 @@
type="u8" sizeop="sizeof(u8)" />
<!-- REFERENCETYPE -->
- <primary_type symbol="REFERENCETYPE" datatype="U8"
- contenttype="REFERENCETYPE" type="u8" sizeop="sizeof(u8)" />
+ <primary_type symbol="REFERENCETYPE" datatype="U8" contenttype="REFERENCETYPE"
+ type="u8" sizeop="sizeof(u8)" />
<!-- METADATATYPE -->
- <primary_type symbol="METADATATYPE" datatype="U8"
- contenttype="METADATATYPE" type="u8" sizeop="sizeof(u8)" />
+ <primary_type symbol="METADATATYPE" datatype="U8" contenttype="METADATATYPE"
+ type="u8" sizeop="sizeof(u8)" />
<!-- METADATAOBJTYPE -->
- <primary_type symbol="METASPACEOBJTYPE" datatype="U8"
- contenttype="METASPACEOBJTYPE" type="u8" sizeop="sizeof(u8)" />
+ <primary_type symbol="METASPACEOBJTYPE" datatype="U8" contenttype="METASPACEOBJTYPE"
+ type="u8" sizeop="sizeof(u8)" />
<!-- NARROWOOPMODE -->
- <primary_type symbol="NARROWOOPMODE" datatype="U8"
- contenttype="NARROWOOPMODE" type="u8" sizeop="sizeof(u8)" />
+ <primary_type symbol="NARROWOOPMODE" datatype="U8" contenttype="NARROWOOPMODE"
+ type="u8" sizeop="sizeof(u8)" />
<!-- COMPILERPHASETYPE -->
- <primary_type symbol="COMPILERPHASETYPE" datatype="U8"
- contenttype="COMPILERPHASETYPE" type="u8" sizeop="sizeof(u8)" />
+ <primary_type symbol="COMPILERPHASETYPE" datatype="U8" contenttype="COMPILERPHASETYPE"
+ type="u8" sizeop="sizeof(u8)" />
<!-- VMOPERATIONTYPE -->
<primary_type symbol="VMOPERATIONTYPE" datatype="U8" contenttype="VMOPERATIONTYPE"
type="u8" sizeop="sizeof(u8)" />
<!-- FLAGVALUEORIGIN -->
- <primary_type symbol="FLAGVALUEORIGIN" datatype="U8"
- contenttype="FLAGVALUEORIGIN" type="u8" sizeop="sizeof(u8)" />
+ <primary_type symbol="FLAGVALUEORIGIN" datatype="U8" contenttype="FLAGVALUEORIGIN"
+ type="u8" sizeop="sizeof(u8)" />
<!-- CODEBLOBTYPE -->
- <primary_type symbol="CODEBLOBTYPE" datatype="U8"
- contenttype="CODEBLOBTYPE" type="u8" sizeop="sizeof(u8)" />
+ <primary_type symbol="CODEBLOBTYPE" datatype="U8" contenttype="CODEBLOBTYPE"
+ type="u8" sizeop="sizeof(u8)" />
<!-- INFLATECAUSE -->
- <primary_type symbol="INFLATECAUSE" datatype="U8"
- contenttype="INFLATECAUSE" type="u8" sizeop="sizeof(u8)" />
+ <primary_type symbol="INFLATECAUSE" datatype="U8" contenttype="INFLATECAUSE"
+ type="u8" sizeop="sizeof(u8)" />
</primary_types>
</types>
--- a/hotspot/src/share/vm/utilities/accessFlags.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/utilities/accessFlags.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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,7 +24,7 @@
#include "precompiled.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "utilities/accessFlags.hpp"
void AccessFlags::atomic_set_bits(jint bits) {
--- a/hotspot/src/share/vm/utilities/bitMap.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/utilities/bitMap.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
#include "precompiled.hpp"
#include "memory/allocation.inline.hpp"
#include "memory/resourceArea.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "utilities/bitMap.inline.hpp"
#include "utilities/copy.hpp"
#include "utilities/debug.hpp"
@@ -376,77 +376,99 @@
par_put_range_within_word(bit_index(end_full_word), end, value);
}
+inline bm_word_t tail_mask(idx_t tail_bits) {
+ assert(tail_bits != 0, "precondition"); // Works, but shouldn't be called.
+ assert(tail_bits < (idx_t)BitsPerWord, "precondition");
+ return (bm_word_t(1) << tail_bits) - 1;
+}
+
+// Get the low tail_bits of value, which is the last partial word of a map.
+inline bm_word_t tail_of_map(bm_word_t value, idx_t tail_bits) {
+ return value & tail_mask(tail_bits);
+}
+
+// Compute the new last word of a map with a non-aligned length.
+// new_value has the new trailing bits of the map in the low tail_bits.
+// old_value is the last word of the map, including bits beyond the end.
+// Returns old_value with the low tail_bits replaced by the corresponding
+// bits in new_value.
+inline bm_word_t merge_tail_of_map(bm_word_t new_value,
+ bm_word_t old_value,
+ idx_t tail_bits) {
+ bm_word_t mask = tail_mask(tail_bits);
+ return (new_value & mask) | (old_value & ~mask);
+}
+
bool BitMap::contains(const BitMap& other) const {
assert(size() == other.size(), "must have same size");
const bm_word_t* dest_map = map();
const bm_word_t* other_map = other.map();
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size_in_words(); index++) {
- bm_word_t word_union = dest_map[index] | other_map[index];
- // If this has more bits set than dest_map[index], then other is not a
- // subset.
- if (word_union != dest_map[index]) return false;
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
+ // false if other bitmap has bits set which are clear in this bitmap.
+ if ((~dest_map[index] & other_map[index]) != 0) return false;
}
- return true;
+ idx_t rest = bit_in_word(size());
+ // true unless there is a partial-word tail in which the other
+ // bitmap has bits set which are clear in this bitmap.
+ return (rest == 0) || tail_of_map(~dest_map[limit] & other_map[limit], rest) == 0;
}
bool BitMap::intersects(const BitMap& other) const {
assert(size() == other.size(), "must have same size");
const bm_word_t* dest_map = map();
const bm_word_t* other_map = other.map();
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size_in_words(); index++) {
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
if ((dest_map[index] & other_map[index]) != 0) return true;
}
- // Otherwise, no intersection.
- return false;
+ idx_t rest = bit_in_word(size());
+ // false unless there is a partial-word tail with non-empty intersection.
+ return (rest > 0) && tail_of_map(dest_map[limit] & other_map[limit], rest) != 0;
}
void BitMap::set_union(const BitMap& other) {
assert(size() == other.size(), "must have same size");
bm_word_t* dest_map = map();
const bm_word_t* other_map = other.map();
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size_in_words(); index++) {
- dest_map[index] = dest_map[index] | other_map[index];
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
+ dest_map[index] |= other_map[index];
+ }
+ idx_t rest = bit_in_word(size());
+ if (rest > 0) {
+ bm_word_t orig = dest_map[limit];
+ dest_map[limit] = merge_tail_of_map(orig | other_map[limit], orig, rest);
}
}
-
void BitMap::set_difference(const BitMap& other) {
assert(size() == other.size(), "must have same size");
bm_word_t* dest_map = map();
const bm_word_t* other_map = other.map();
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size_in_words(); index++) {
- dest_map[index] = dest_map[index] & ~(other_map[index]);
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
+ dest_map[index] &= ~other_map[index];
+ }
+ idx_t rest = bit_in_word(size());
+ if (rest > 0) {
+ bm_word_t orig = dest_map[limit];
+ dest_map[limit] = merge_tail_of_map(orig & ~other_map[limit], orig, rest);
}
}
-
void BitMap::set_intersection(const BitMap& other) {
assert(size() == other.size(), "must have same size");
bm_word_t* dest_map = map();
const bm_word_t* other_map = other.map();
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size; index++) {
- dest_map[index] = dest_map[index] & other_map[index];
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
+ dest_map[index] &= other_map[index];
}
-}
-
-
-void BitMap::set_intersection_at_offset(const BitMap& other, idx_t offset) {
- assert(other.size() >= offset, "offset not in range");
- assert(other.size() - offset >= size(), "other not large enough");
- // XXX Ideally, we would remove this restriction.
- guarantee((offset % (sizeof(bm_word_t) * BitsPerByte)) == 0,
- "Only handle aligned cases so far.");
- bm_word_t* dest_map = map();
- const bm_word_t* other_map = other.map();
- idx_t offset_word_ind = word_index(offset);
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size; index++) {
- dest_map[index] = dest_map[index] & other_map[offset_word_ind + index];
+ idx_t rest = bit_in_word(size());
+ if (rest > 0) {
+ bm_word_t orig = dest_map[limit];
+ dest_map[limit] = merge_tail_of_map(orig & other_map[limit], orig, rest);
}
}
@@ -455,88 +477,111 @@
bool changed = false;
bm_word_t* dest_map = map();
const bm_word_t* other_map = other.map();
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size; index++) {
- idx_t temp = dest_map[index] | other_map[index];
- changed = changed || (temp != dest_map[index]);
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
+ bm_word_t orig = dest_map[index];
+ bm_word_t temp = orig | other_map[index];
+ changed = changed || (temp != orig);
dest_map[index] = temp;
}
+ idx_t rest = bit_in_word(size());
+ if (rest > 0) {
+ bm_word_t orig = dest_map[limit];
+ bm_word_t temp = merge_tail_of_map(orig | other_map[limit], orig, rest);
+ changed = changed || (temp != orig);
+ dest_map[limit] = temp;
+ }
return changed;
}
-
bool BitMap::set_difference_with_result(const BitMap& other) {
assert(size() == other.size(), "must have same size");
bool changed = false;
bm_word_t* dest_map = map();
const bm_word_t* other_map = other.map();
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size; index++) {
- bm_word_t temp = dest_map[index] & ~(other_map[index]);
- changed = changed || (temp != dest_map[index]);
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
+ bm_word_t orig = dest_map[index];
+ bm_word_t temp = orig & ~other_map[index];
+ changed = changed || (temp != orig);
dest_map[index] = temp;
}
+ idx_t rest = bit_in_word(size());
+ if (rest > 0) {
+ bm_word_t orig = dest_map[limit];
+ bm_word_t temp = merge_tail_of_map(orig & ~other_map[limit], orig, rest);
+ changed = changed || (temp != orig);
+ dest_map[limit] = temp;
+ }
return changed;
}
-
bool BitMap::set_intersection_with_result(const BitMap& other) {
assert(size() == other.size(), "must have same size");
bool changed = false;
bm_word_t* dest_map = map();
const bm_word_t* other_map = other.map();
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size; index++) {
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
bm_word_t orig = dest_map[index];
bm_word_t temp = orig & other_map[index];
changed = changed || (temp != orig);
- dest_map[index] = temp;
+ dest_map[index] = temp;
+ }
+ idx_t rest = bit_in_word(size());
+ if (rest > 0) {
+ bm_word_t orig = dest_map[limit];
+ bm_word_t temp = merge_tail_of_map(orig & other_map[limit], orig, rest);
+ changed = changed || (temp != orig);
+ dest_map[limit] = temp;
}
return changed;
}
-
void BitMap::set_from(const BitMap& other) {
assert(size() == other.size(), "must have same size");
bm_word_t* dest_map = map();
const bm_word_t* other_map = other.map();
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size; index++) {
- dest_map[index] = other_map[index];
+ idx_t copy_words = word_index(size());
+ Copy::disjoint_words((HeapWord*)other_map, (HeapWord*)dest_map, copy_words);
+ idx_t rest = bit_in_word(size());
+ if (rest > 0) {
+ dest_map[copy_words] = merge_tail_of_map(other_map[copy_words],
+ dest_map[copy_words],
+ rest);
}
}
-
-bool BitMap::is_same(const BitMap& other) {
+bool BitMap::is_same(const BitMap& other) const {
assert(size() == other.size(), "must have same size");
- bm_word_t* dest_map = map();
+ const bm_word_t* dest_map = map();
const bm_word_t* other_map = other.map();
- idx_t size = size_in_words();
- for (idx_t index = 0; index < size; index++) {
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
if (dest_map[index] != other_map[index]) return false;
}
- return true;
+ idx_t rest = bit_in_word(size());
+ return (rest == 0) || (tail_of_map(dest_map[limit] ^ other_map[limit], rest) == 0);
}
bool BitMap::is_full() const {
- const bm_word_t* word = map();
- idx_t rest = size();
- for (; rest >= (idx_t) BitsPerWord; rest -= BitsPerWord) {
- if (*word != ~(bm_word_t)0) return false;
- word++;
+ const bm_word_t* words = map();
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
+ if (~words[index] != 0) return false;
}
- return rest == 0 || (*word | ~right_n_bits((int)rest)) == ~(bm_word_t)0;
+ idx_t rest = bit_in_word(size());
+ return (rest == 0) || (tail_of_map(~words[limit], rest) == 0);
}
-
bool BitMap::is_empty() const {
- const bm_word_t* word = map();
- idx_t rest = size();
- for (; rest >= (idx_t) BitsPerWord; rest -= BitsPerWord) {
- if (*word != 0) return false;
- word++;
+ const bm_word_t* words = map();
+ idx_t limit = word_index(size());
+ for (idx_t index = 0; index < limit; ++index) {
+ if (words[index] != 0) return false;
}
- return rest == 0 || (*word & right_n_bits((int)rest)) == 0;
+ idx_t rest = bit_in_word(size());
+ return (rest == 0) || (tail_of_map(words[limit], rest) == 0);
}
void BitMap::clear_large() {
--- a/hotspot/src/share/vm/utilities/bitMap.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/utilities/bitMap.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -284,18 +284,9 @@
bool set_difference_with_result(const BitMap& bits);
bool set_intersection_with_result(const BitMap& bits);
- // Requires the submap of "bits" starting at offset to be at least as
- // large as "this". Modifies "this" to be the intersection of its
- // current contents and the submap of "bits" starting at "offset" of the
- // same length as "this."
- // (For expedience, currently requires the offset to be aligned to the
- // bitsize of a uintptr_t. This should go away in the future though it
- // will probably remain a good case to optimize.)
- void set_intersection_at_offset(const BitMap& bits, idx_t offset);
-
void set_from(const BitMap& bits);
- bool is_same(const BitMap& bits);
+ bool is_same(const BitMap& bits) const;
// Test if all bits are set or cleared
bool is_full() const;
--- a/hotspot/src/share/vm/utilities/bitMap.inline.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/utilities/bitMap.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
#ifndef SHARE_VM_UTILITIES_BITMAP_INLINE_HPP
#define SHARE_VM_UTILITIES_BITMAP_INLINE_HPP
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "utilities/bitMap.hpp"
inline void BitMap::set_bit(idx_t bit) {
--- a/hotspot/src/share/vm/utilities/debug.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/utilities/debug.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -38,7 +38,7 @@
#include "oops/oop.inline.hpp"
#include "prims/privilegedStack.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/frame.hpp"
#include "runtime/java.hpp"
#include "runtime/os.hpp"
--- a/hotspot/src/share/vm/utilities/globalDefinitions.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/utilities/globalDefinitions.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -327,11 +327,12 @@
// and then additions like
// ... top() + size ...
// are safe because we know that top() is at least size below end().
-inline size_t pointer_delta(const void* left,
- const void* right,
+inline size_t pointer_delta(const volatile void* left,
+ const volatile void* right,
size_t element_size) {
return (((uintptr_t) left) - ((uintptr_t) right)) / element_size;
}
+
// A version specialized for HeapWord*'s.
inline size_t pointer_delta(const HeapWord* left, const HeapWord* right) {
return pointer_delta(left, right, sizeof(HeapWord));
@@ -516,6 +517,10 @@
return (void*)align_size_down((intptr_t)ptr, (intptr_t)alignment);
}
+inline volatile void* align_ptr_down(volatile void* ptr, size_t alignment) {
+ return (volatile void*)align_size_down((intptr_t)ptr, (intptr_t)alignment);
+}
+
// Align metaspace objects by rounding up to natural word boundary
inline intptr_t align_metadata_size(intptr_t size) {
--- a/hotspot/src/share/vm/utilities/histogram.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/utilities/histogram.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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,7 +24,7 @@
#include "precompiled.hpp"
#include "oops/oop.inline.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "utilities/histogram.hpp"
#ifdef ASSERT
--- a/hotspot/src/share/vm/utilities/macros.hpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/utilities/macros.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -486,4 +486,24 @@
#define OS_CPU_HEADER(basename) XSTR(OS_CPU_HEADER_STEM(basename).hpp)
#define OS_CPU_HEADER_INLINE(basename) XSTR(OS_CPU_HEADER_STEM(basename).inline.hpp)
+// To use Atomic::inc(jshort* dest) and Atomic::dec(jshort* dest), the address must be specially
+// aligned, such that (*dest) occupies the upper 16 bits of an aligned 32-bit word. The best way to
+// achieve is to place your short value next to another short value, which doesn't need atomic ops.
+//
+// Example
+// ATOMIC_SHORT_PAIR(
+// volatile short _refcount, // needs atomic operation
+// unsigned short _length // number of UTF8 characters in the symbol (does not need atomic op)
+// );
+
+#ifdef VM_LITTLE_ENDIAN
+ #define ATOMIC_SHORT_PAIR(atomic_decl, non_atomic_decl) \
+ non_atomic_decl; \
+ atomic_decl
+#else
+ #define ATOMIC_SHORT_PAIR(atomic_decl, non_atomic_decl) \
+ atomic_decl; \
+ non_atomic_decl
+#endif
+
#endif // SHARE_VM_UTILITIES_MACROS_HPP
--- a/hotspot/src/share/vm/utilities/vmError.cpp Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/src/share/vm/utilities/vmError.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -31,7 +31,7 @@
#include "logging/logConfiguration.hpp"
#include "prims/whitebox.hpp"
#include "runtime/arguments.hpp"
-#include "runtime/atomic.inline.hpp"
+#include "runtime/atomic.hpp"
#include "runtime/frame.inline.hpp"
#include "runtime/init.hpp"
#include "runtime/os.hpp"
--- a/hotspot/test/TEST.groups Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/TEST.groups Mon Sep 12 22:04:48 2016 +0000
@@ -407,6 +407,11 @@
runtime/SelectionResolution \
-:hotspot_fast_runtime
+hotspot_runtime_minimalvm = \
+ runtime/MinimalVM \
+ runtime/ErrorHandling \
+ runtime/logging
+
#All tests that depends on nashorn extension.
#
needs_nashorn = \
--- a/hotspot/test/compiler/arguments/BMISupportedCPUTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arguments/BMISupportedCPUTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
package compiler.arguments;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
/**
--- a/hotspot/test/compiler/arguments/BMIUnsupportedCPUTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arguments/BMIUnsupportedCPUTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
package compiler.arguments;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
--- a/hotspot/test/compiler/arguments/CheckCICompilerCount.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arguments/CheckCICompilerCount.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @test CheckCheckCICompilerCount
* @bug 8130858 8132525 8162881
* @summary Check that correct range of values for CICompilerCount are allowed depending on whether tiered is enabled or not
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @run driver compiler.arguments.CheckCICompilerCount
@@ -33,8 +33,8 @@
package compiler.arguments;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class CheckCICompilerCount {
private static final String[][] NON_TIERED_ARGUMENTS = {
--- a/hotspot/test/compiler/arguments/CheckCompileThresholdScaling.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arguments/CheckCompileThresholdScaling.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @test CheckCompileThresholdScaling
* @bug 8059604
* @summary Add CompileThresholdScaling flag to control when methods are first compiled (with +/-TieredCompilation)
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver compiler.arguments.CheckCompileThresholdScaling
@@ -33,8 +33,8 @@
package compiler.arguments;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class CheckCompileThresholdScaling {
--- a/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnSupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @bug 8031321
* @summary Verify processing of UseBMI1Instructions option on CPU with
* BMI1 feature support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.arguments.TestUseBMI1InstructionsOnSupportedCPU
- * compiler.arguments.BMISupportedCPUTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arguments/TestUseBMI1InstructionsOnUnsupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @bug 8031321
* @summary Verify processing of UseBMI1Instructions option on CPU without
* BMI1 feature support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.arguments.TestUseBMI1InstructionsOnUnsupportedCPU
- * compiler.arguments.BMIUnsupportedCPUTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnSupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,11 @@
* @bug 8031321
* @summary Verify processing of UseCountLeadingZerosInstruction option
* on CPU with LZCNT support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.arguments.TestUseCountLeadingZerosInstructionOnSupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arguments/TestUseCountLeadingZerosInstructionOnUnsupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,11 @@
* @bug 8031321
* @summary Verify processing of UseCountLeadingZerosInstruction option
* on CPU without LZCNT support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.arguments.TestUseCountLeadingZerosInstructionOnUnsupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnSupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,11 @@
* @bug 8031321
* @summary Verify processing of UseCountTrailingZerosInstruction option
* on CPU with TZCNT (BMI1 feature) support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.arguments.TestUseCountTrailingZerosInstructionOnSupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arguments/TestUseCountTrailingZerosInstructionOnUnsupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,11 @@
* @bug 8031321
* @summary Verify processing of UseCountTrailingZerosInstruction option
* on CPU without TZCNT instruction (BMI1 feature) support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.arguments.TestUseCountTrailingZerosInstructionOnUnsupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +26,12 @@
* @bug 8072016
* @summary Infinite deoptimization/recompilation cycles in case of arraycopy with tightly coupled allocation
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.arraycopy.TestArrayCopyNoInitDeopt
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
- * jdk.test.lib.Platform
* @run main/othervm -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=020
* compiler.arraycopy.TestArrayCopyNoInitDeopt
--- a/hotspot/test/compiler/c2/PolynomialRoot.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/c2/PolynomialRoot.java Mon Sep 12 22:04:48 2016 +0000
@@ -13,7 +13,7 @@
* @test
* @bug 8005956
* @summary C2: assert(!def_outside->member(r)) failed: Use of external LRG overlaps the same LRG defined in this block
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/c2/Test5057225.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/c2/Test5057225.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 5057225
* @summary Remove useless I2L conversions
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run main/othervm -Xcomp
* -XX:CompileCommand=compileonly,compiler.c2.Test5057225::doload
--- a/hotspot/test/compiler/c2/Test6603011.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/c2/Test6603011.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 6603011
* @summary long/int division by constant
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run main/othervm -Xcomp -Xbatch -XX:-Inline compiler.c2.Test6603011
*/
--- a/hotspot/test/compiler/c2/Test6800154.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/c2/Test6800154.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 6800154
* @summary Add comments to long_by_long_mulhi() for better understandability
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run main/othervm -Xcomp
* -XX:CompileCommand=compileonly,compiler.c2.Test6800154::divcomp
--- a/hotspot/test/compiler/c2/Test6805724.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/c2/Test6805724.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @summary ModLNode::Ideal() generates functionally incorrect graph
* when divisor is any (2^k-1) constant.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run main/othervm -Xcomp
* -XX:CompileCommand=compileonly,compiler.c2.Test6805724::fcomp
--- a/hotspot/test/compiler/c2/Test6857159.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/c2/Test6857159.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 6857159
* @summary local schedule failed with checkcast of Thread.currentThread()
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
@@ -35,8 +35,8 @@
package compiler.c2;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class Test6857159 {
public static void main(String[] args) throws Throwable {
--- a/hotspot/test/compiler/c2/Test7068051.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/c2/Test7068051.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 7068051
* @summary SIGSEGV in PhaseIdealLoop::build_loop_late_post on T5440
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
@@ -36,7 +36,7 @@
package compiler.c2;
import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import java.io.IOException;
import java.io.InputStream;
--- a/hotspot/test/compiler/c2/Test7177917.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/c2/Test7177917.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @bug 7177917
* @summary Micro-benchmark for Math.pow() and Math.exp()
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run main compiler.c2.Test7177917
*/
--- a/hotspot/test/compiler/c2/cr6589834/Test_ia32.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/c2/cr6589834/Test_ia32.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, 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,15 +26,13 @@
* @bug 6589834
* @summary Safepoint placed between stack pointer increment and decrement leads
* to interpreter's stack corruption after deoptimization.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
*
- * @build ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.*
- * compiler.c2.cr6589834.Test_ia32
- * compiler.c2.cr6589834.InlinedArrayCloneTestCase
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/c2/stemmer/Stemmer.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/c2/stemmer/Stemmer.java Mon Sep 12 22:04:48 2016 +0000
@@ -3,7 +3,7 @@
* @bug 7070134
* @summary Hotspot crashes with sigsegv from PorterStemmer
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run driver jdk.test.lib.FileInstaller words words
* @run main/othervm -Xbatch compiler.c2.stemmer.Stemmer words
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,12 +24,11 @@
/*
* @test
* @summary check calls from compiled to compiled using InvokeDynamic
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.org.objectweb.asm
*
- * @build compiler.calls.common.InvokeDynamic
- * compiler.calls.common.InvokeDynamicPatcher
+ * @build sun.hotspot.WhiteBox
* @run main compiler.calls.common.InvokeDynamicPatcher
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,12 +24,11 @@
/*
* @test
* @summary check calls from compiled to interpreted using InvokeDynamic
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.org.objectweb.asm
*
- * @build compiler.calls.common.InvokeDynamic
- * @build compiler.calls.common.InvokeDynamicPatcher
+ * @build sun.hotspot.WhiteBox
* @run main compiler.calls.common.InvokeDynamicPatcher
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeDynamic2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,12 +24,11 @@
/*
* @test
* @summary check calls from compiled to native using InvokeDynamic
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.org.objectweb.asm
*
- * @build compiler.calls.common.InvokeDynamic
- * compiler.calls.common.InvokeDynamicPatcher
+ * @build sun.hotspot.WhiteBox
* @run main compiler.calls.common.InvokeDynamicPatcher
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @modules java.base/jdk.internal.misc
* @summary check calls from compiled to compiled using InvokeInterface
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeInterface
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to interpreted using InvokeInterface
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeInterface
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeInterface2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to native using InvokeInterface
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeInterface
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to compiled using InvokeSpecial
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeSpecial
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to interpreted using InvokeSpecial
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeSpecial
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeSpecial2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to native using InvokeSpecial
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeSpecial
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to compiled using InvokeStatic
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeStatic
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to interpreted using InvokeStatic
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeStatic
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeStatic2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to native using InvokeStatic
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeStatic
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to compiled using InvokeVirtual
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeVirtual
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to interpreted using InvokeVirtual
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeVirtual
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromCompiled/CompiledInvokeVirtual2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from compiled to native using InvokeVirtual
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeVirtual
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,12 +24,11 @@
/*
* @test
* @summary check calls from interpreted to compiled using InvokeDynamic
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.org.objectweb.asm
*
- * @build compiler.calls.common.InvokeDynamic
- * compiler.calls.common.InvokeDynamicPatcher
+ * @build sun.hotspot.WhiteBox
* @run main compiler.calls.common.InvokeDynamicPatcher
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,12 +24,11 @@
/*
* @test
* @summary check calls from interpreted to interpreted using InvokeDynamic
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.org.objectweb.asm
*
- * @build compiler.calls.common.InvokeDynamic
- * compiler.calls.common.InvokeDynamicPatcher
+ * @build sun.hotspot.WhiteBox
* @run main compiler.calls.common.InvokeDynamicPatcher
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeDynamic2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,12 +24,11 @@
/*
* @test
* @summary check calls from interpreted to native using InvokeDynamic
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.org.objectweb.asm
*
- * @build compiler.calls.common.InvokeDynamic
- * compiler.calls.common.InvokeDynamicPatcher
+ * @build sun.hotspot.WhiteBox
* @run main compiler.calls.common.InvokeDynamicPatcher
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from interpreted to compiled using InvokeInterface
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeInterface
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from interpreted to interpreted using InvokeInterface
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeInterface
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeInterface2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from interpreted to native using InvokeInterface
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeInterface
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
- * @build compiler.calls.common.InvokeSpecial
+ * @library /test/lib /
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from interpreted to interpreted using InvokeSpecial
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeSpecial
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeSpecial2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test
* @summary check calls from interpreted to native using InvokeSpecial
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
* @build compiler.calls.common.InvokeSpecial
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from interpreted to compiled using InvokeStatic
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeStatic
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from interpreted to interpreted using InvokeStatic
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeStatic
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeStatic2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from interpreted to native using InvokeStatic
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeStatic
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from interpreted to compiled using InvokeVirtual
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeVirtual
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from interpreted to interpreted using InvokeVirtual
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeVirtual
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromInterpreted/InterpretedInvokeVirtual2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from interpreted to native using InvokeVirtual
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeVirtual
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from native to compiled using InvokeSpecial
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeSpecial
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from native to interpreted using InvokeSpecial
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeSpecial
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeSpecial2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from native to native using InvokeSpecial
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeSpecial
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from native to compiled using InvokeStatic
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeStatic
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from native to interpreted using InvokeStatic
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeStatic
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeStatic2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from native to native using InvokeStatic
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeStatic
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2CompiledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from native to compiled using InvokeVirtual
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeVirtual
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2InterpretedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,8 +25,8 @@
* @test
* @summary check calls from native to interpreted using InvokeVirtual
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
- * @build compiler.calls.common.InvokeVirtual
+ * @library /test/lib /
+ * @build sun.hotspot.WhiteBox
*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/calls/fromNative/NativeInvokeVirtual2NativeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @summary check calls from native to native using InvokeVirtual
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
- * @build compiler.calls.common.InvokeVirtual
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/classUnloading/anonymousClass/TestAnonymousClassUnloading.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
* @test TestAnonymousClassUnloading
* @bug 8054402
* @summary "Tests unloading of anonymous classes."
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
*
* @run main/othervm/bootclasspath -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/classUnloading/methodUnloading/TestMethodUnloading.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,9 +26,9 @@
* @bug 8029443
* @summary Tests the unloading of methods to to class unloading
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.classUnloading.methodUnloading.TestMethodUnloading
+ * @build sun.hotspot.WhiteBox
* compiler.classUnloading.methodUnloading.WorkerClass
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/CheckReservedInitialCodeCacheSizeArgOrder.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 8013496
* @summary Test checks that the order in which ReversedCodeCacheSize and
* InitialCodeCacheSize are passed to the VM is irrelevant.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
@@ -35,8 +35,8 @@
package compiler.codecache;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class CheckReservedInitialCodeCacheSizeArgOrder {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/compiler/codecache/CheckSegmentedCodeCache.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/CheckSegmentedCodeCache.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,11 +25,11 @@
* @test CheckSegmentedCodeCache
* @bug 8015774
* @summary Checks VM options related to the segmented code cache
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.codecache.CheckSegmentedCodeCache
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -39,9 +39,9 @@
package compiler.codecache;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
import sun.hotspot.WhiteBox;
public class CheckSegmentedCodeCache {
--- a/hotspot/test/compiler/codecache/CheckUpperLimit.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/CheckUpperLimit.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8015635
* @summary Test ensures that the ReservedCodeCacheSize is at most MAXINT
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
@@ -34,8 +34,8 @@
package compiler.codecache;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class CheckUpperLimit {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/compiler/codecache/OverflowCodeCacheTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/OverflowCodeCacheTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,11 @@
* @test OverflowCodeCacheTest
* @bug 8059550
* @summary testing of code cache segments overflow
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.codecache.OverflowCodeCacheTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/cli/TestSegmentedCodeCacheOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,20 +25,19 @@
* @test
* @bug 8015774
* @summary Verify SegmentedCodeCache option's processing
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
*
- * @build jdk.test.lib.*
* @run driver compiler.codecache.cli.TestSegmentedCodeCacheOption
*/
package compiler.codecache.cli;
import compiler.codecache.cli.common.CodeCacheOptions;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import sun.hotspot.code.BlobType;
--- a/hotspot/test/compiler/codecache/cli/codeheapsize/CodeCacheFreeSpaceRunner.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/cli/codeheapsize/CodeCacheFreeSpaceRunner.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
import compiler.codecache.cli.common.CodeCacheCLITestCase;
import compiler.codecache.cli.common.CodeCacheOptions;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import sun.hotspot.code.BlobType;
--- a/hotspot/test/compiler/codecache/cli/codeheapsize/JVMStartupRunner.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/cli/codeheapsize/JVMStartupRunner.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
import compiler.codecache.cli.common.CodeCacheCLITestCase;
import compiler.codecache.cli.common.CodeCacheOptions;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Utils;
import jdk.test.lib.cli.CommandLineOptionTest;
import sun.hotspot.code.BlobType;
--- a/hotspot/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/cli/codeheapsize/TestCodeHeapSizeOptions.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,13 +25,12 @@
* @test
* @bug 8015774
* @summary Verify processing of options related to code heaps sizing.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
*
- * @build compiler.codecache.cli.codeheapsize.TestCodeHeapSizeOptions jdk.test.lib.*
* @run driver/timeout=240 compiler.codecache.cli.codeheapsize.TestCodeHeapSizeOptions
*/
--- a/hotspot/test/compiler/codecache/cli/printcodecache/PrintCodeCacheRunner.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/cli/printcodecache/PrintCodeCacheRunner.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import compiler.codecache.cli.common.CodeCacheCLITestCase;
import compiler.codecache.cli.common.CodeCacheInfoFormatter;
import compiler.codecache.cli.common.CodeCacheOptions;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import sun.hotspot.code.BlobType;
--- a/hotspot/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/cli/printcodecache/TestPrintCodeCacheOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,13 +25,12 @@
* @test
* @bug 8015774
* @summary Verify that PrintCodeCache option print correct information.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
*
- * @build jdk.test.lib.* compiler.codecache.cli.common.*
* @run main/timeout=240 compiler.codecache.cli.printcodecache.TestPrintCodeCacheOption
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/codecache/dtrace/DtraceResultsAnalyzer.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2014, 2016, 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 compiler.codecache.dtrace;
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+public interface DtraceResultsAnalyzer {
+ public void analyze(OutputAnalyzer oa, String logFilePath);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/compiler/codecache/dtrace/DtraceRunner.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright (c) 2014, 2016, 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 compiler.codecache.dtrace;
+
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class DtraceRunner {
+
+ private static final String DTRACE_DEFAULT_PATH = "/usr/sbin/dtrace";
+ private static final String DTRACE_PATH_PROPERTY
+ = "com.oracle.test.dtrace.path";
+ private static final String OUTPUT_FILE_DTRACE_OPTION = "o";
+ private static final String RUN_COMMAND_DTRACE_OPTION = "c";
+ private static final String RUN_SCRIPT_DTRACE_OPTION = "s";
+ private static final String ALLOW_ZERO_PROBE_DESCRIPTION_DTRACE_OPTION = "Z";
+ private static final String DTRACE_OPTION_PREFIX = "-";
+ public static final String PERMIT_DESTRUCTIVE_ACTIONS_DTRACE_OPTION = "w";
+ public static final String DTRACE_OUT_LOG = "dtrace.out";
+
+ private final String dtraceExecutable;
+
+ public DtraceRunner() {
+ dtraceExecutable = getDtracePath();
+ }
+
+ private List<String> getLaunchCmd(String java, String javaOpts,
+ String execClass, String testArgs, String dtraceScript,
+ String dtraceAddOpts) {
+ Asserts.assertTrue(!java.matches("\\s"), "Current dtrace implementation"
+ + " can't handle whitespaces in application path");
+ List<String> result = new ArrayList<>();
+ result.add(dtraceExecutable);
+ result.add(DTRACE_OPTION_PREFIX + System.getProperty("sun.arch.data.model"));
+ result.add(DTRACE_OPTION_PREFIX
+ + ALLOW_ZERO_PROBE_DESCRIPTION_DTRACE_OPTION
+ + ((dtraceAddOpts == null) ? "" : dtraceAddOpts)
+ + RUN_SCRIPT_DTRACE_OPTION); // run_script should be last one
+ result.add(dtraceScript);
+ result.add(DTRACE_OPTION_PREFIX + OUTPUT_FILE_DTRACE_OPTION);
+ result.add(DTRACE_OUT_LOG);
+ result.add(DTRACE_OPTION_PREFIX + RUN_COMMAND_DTRACE_OPTION);
+ result.add(java + " " + javaOpts + " " + execClass + " " + testArgs);
+ return result;
+ }
+
+ private void backupLogFile(File file) {
+ if (file.exists()) {
+ file.renameTo(new File(file.getPath() + ".bak"));
+ }
+ }
+
+ public void runDtrace(String java, String javaOpts, String execClass,
+ String testArgs, String dtraceScript, String dtraceAddOpts,
+ DtraceResultsAnalyzer analyzer) {
+ backupLogFile(new File(DTRACE_OUT_LOG));
+ ProcessBuilder pbuilder = new ProcessBuilder(
+ getLaunchCmd(java, javaOpts, execClass, testArgs,
+ dtraceScript, dtraceAddOpts));
+ OutputAnalyzer oa;
+ try {
+ oa = new OutputAnalyzer(pbuilder.start());
+ } catch (IOException e) {
+ throw new Error("TESTBUG: Can't start process", e);
+ }
+ analyzer.analyze(oa, DTRACE_OUT_LOG);
+ }
+
+ public static boolean dtraceAvailable() {
+ String path = getDtracePath();
+ if (path == null) {
+ return false;
+ }
+ // now we'll launch dtrace to trace itself just to be sure it works
+ // and have all additional previleges set
+ ProcessBuilder pbuilder = new ProcessBuilder(path, path);
+ try {
+ OutputAnalyzer oa = new OutputAnalyzer(pbuilder.start());
+ if (oa.getExitValue() != 0) {
+ return false;
+ }
+ } catch (IOException e) {
+ throw new Error("Couldn't launch dtrace", e);
+ }
+ return true;
+ }
+
+ private static String getDtracePath() {
+ String propPath = System.getProperty(DTRACE_PATH_PROPERTY);
+ if (propPath != null && new File(propPath).exists()) {
+ return propPath;
+ } else if (new File(DTRACE_DEFAULT_PATH).exists()) {
+ return DTRACE_DEFAULT_PATH;
+ }
+ return null;
+ }
+}
--- a/hotspot/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/dtrace/SegmentedCodeCacheDtraceTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,9 +27,9 @@
* @summary testing of dtrace for segmented code cache
* @requires os.family=="solaris"
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.codecache.dtrace.SegmentedCodeCacheDtraceTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:.
@@ -42,10 +42,8 @@
import compiler.testlibrary.CompilerUtils;
import jdk.test.lib.Asserts;
import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
-import jdk.test.lib.dtrace.DtraceResultsAnalyzer;
-import jdk.test.lib.dtrace.DtraceRunner;
import java.io.IOException;
import java.lang.reflect.Executable;
--- a/hotspot/test/compiler/codecache/jmx/BeanTypeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/BeanTypeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,9 +26,9 @@
* @summary verify types of code cache memory pool bean
* @modules java.base/jdk.internal.misc
* java.management
- * @library /testlibrary /test/lib
+ * @library /test/lib
*
- * @build compiler.codecache.jmx.BeanTypeTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/jmx/CodeCacheUtils.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/CodeCacheUtils.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -119,6 +119,28 @@
}
}
+ /**
+ * Verifies that 'newValue' is equal to 'oldValue' if usage of the
+ * corresponding code heap is predictable. Checks the weaker condition
+ * 'newValue <= oldValue' if usage is not predictable because intermediate
+ * allocations may happen.
+ *
+ * @param btype BlobType of the code heap to be checked
+ * @param newValue New value to be verified
+ * @param oldValue Old value to be verified
+ * @param msg Error message if verification fails
+ */
+ public static void assertEQorLTE(BlobType btype, long newValue, long oldValue, String msg) {
+ if (CodeCacheUtils.isCodeHeapPredictable(btype)) {
+ // Usage is predictable, check strong == condition
+ Asserts.assertEQ(newValue, oldValue, msg);
+ } else {
+ // Usage is not predictable, check weaker <= condition
+ Asserts.assertLTE(newValue, oldValue, msg);
+ }
+ }
+
+
public static void disableCollectionUsageThresholds() {
BlobType.getAvailable().stream()
.map(BlobType::getMemoryPool)
--- a/hotspot/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/CodeHeapBeanPresenceTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,9 +26,9 @@
* @summary verify CodeHeap bean presence
* @modules java.base/jdk.internal.misc
* java.management
- * @library /testlibrary /test/lib
+ * @library /test/lib
*
- * @build compiler.codecache.jmx.CodeHeapBeanPresenceTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/jmx/GetUsageTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/GetUsageTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,9 +26,9 @@
* @summary testing of getUsage() for segmented code cache
* @modules java.base/jdk.internal.misc
* java.management
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.codecache.jmx.GetUsageTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/InitialAndMaxUsageTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,9 +26,9 @@
* @summary testing of initial and max usage
* @modules java.base/jdk.internal.misc
* java.management
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.codecache.jmx.InitialAndMaxUsageTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:-UseCodeCacheFlushing
--- a/hotspot/test/compiler/codecache/jmx/ManagerNamesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/ManagerNamesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,9 +26,9 @@
* @summary verify getMemoryManageNames calls in case of segmented code cache
* @modules java.base/jdk.internal.misc
* java.management
- * @library /testlibrary /test/lib
+ * @library /test/lib
*
- * @build compiler.codecache.jmx.ManagerNamesTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/MemoryPoolsPresenceTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,9 +26,9 @@
* @summary verify that MemoryManagerMXBean exists for every code cache segment
* @modules java.base/jdk.internal.misc
* java.management
- * @library /testlibrary /test/lib
+ * @library /test/lib
*
- * @build compiler.codecache.jmx.MemoryPoolsPresenceTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/jmx/PeakUsageTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/PeakUsageTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,12 +23,11 @@
/*
* @test PeakUsageTest
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @ignore 8151345
- * @build ompiler.codecache.jmx.PeakUsageTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -69,9 +68,17 @@
bean.resetPeakUsage();
long addr = CodeCacheUtils.WB.allocateCodeBlob(
CodeCacheUtils.ALLOCATION_SIZE, btype.id);
- long newPeakUsage = bean.getPeakUsage().getUsed();
+
try {
- CodeCacheUtils.assertEQorGTE(btype, newPeakUsage, bean.getUsage().getUsed(),
+ /*
+ Always save peakUsage after saving currentUsage. Reversing the order
+ can lead to inconsistent results (currentUsage > peakUsage) because
+ of intermediate allocations.
+ */
+ long currUsage = bean.getUsage().getUsed();
+ long peakUsage = bean.getPeakUsage().getUsed();
+ CodeCacheUtils.assertEQorLTE(btype, currUsage,
+ peakUsage,
"Peak usage does not match usage after allocation for "
+ bean.getName());
} finally {
@@ -79,19 +86,21 @@
CodeCacheUtils.WB.freeCodeBlob(addr);
}
}
- CodeCacheUtils.assertEQorGTE(btype, newPeakUsage, bean.getPeakUsage().getUsed(),
- "Code cache peak usage has changed after usage decreased for "
- + bean.getName());
bean.resetPeakUsage();
- CodeCacheUtils.assertEQorGTE(btype, bean.getPeakUsage().getUsed(),
- bean.getUsage().getUsed(),
+ long currUsage = bean.getUsage().getUsed();
+ long peakUsage = bean.getPeakUsage().getUsed();
+ CodeCacheUtils.assertEQorLTE(btype, currUsage,
+ peakUsage,
"Code cache peak usage is not equal to usage after reset for "
+ bean.getName());
long addr2 = CodeCacheUtils.WB.allocateCodeBlob(
CodeCacheUtils.ALLOCATION_SIZE, btype.id);
try {
- CodeCacheUtils.assertEQorGTE(btype, bean.getPeakUsage().getUsed(),
- bean.getUsage().getUsed(),
+ currUsage = bean.getUsage().getUsed();
+ peakUsage = bean.getPeakUsage().getUsed();
+
+ CodeCacheUtils.assertEQorLTE(btype, currUsage,
+ peakUsage,
"Code cache peak usage is not equal to usage after fresh "
+ "allocation for " + bean.getName());
} finally {
--- a/hotspot/test/compiler/codecache/jmx/PoolsIndependenceTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/PoolsIndependenceTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,9 +26,9 @@
* @summary testing of getUsageThreshold()
* @modules java.base/jdk.internal.misc
* java.management
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.codecache.jmx.PoolsIndependenceTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/jmx/ThresholdNotificationsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/ThresholdNotificationsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +24,11 @@
/*
* @test ThresholdNotificationsTest
* @summary testing of getUsageThreshold()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.codecache.jmx.ThresholdNotificationsTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -Xbootclasspath/a:. -XX:-UseCodeCacheFlushing
--- a/hotspot/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/UsageThresholdExceededSeveralTimesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test UsageThresholdExceededSeveralTimesTest
* @summary verifying that getUsageThresholdCount() returns correct value
* after threshold has been hit several times
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.codecache.jmx.UsageThresholdExceededTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/jmx/UsageThresholdExceededTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/UsageThresholdExceededTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test UsageThresholdExceededTest
* @summary verifying that getUsageThresholdCount() returns correct value
* after threshold has been hit
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.codecache.jmx.UsageThresholdExceededTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/UsageThresholdIncreasedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,11 +25,10 @@
* @test UsageThresholdIncreasedTest
* @summary verifying that threshold hasn't been hit after allocation smaller
* than threshold value and that threshold value can be changed
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- *
- * @build compiler.codecache.jmx.UsageThresholdIncreasedTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/jmx/UsageThresholdNotExceededTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,13 +25,13 @@
* @test UsageThresholdNotExceededTest
* @summary verifying that usage threshold not exceeded while allocating less
* than usage threshold
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
- * @build compiler.codecache.jmx.UsageThresholdNotExceededTest
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -XX:-UseCodeCacheFlushing -XX:-MethodFlushing
* -XX:CompileCommand=compileonly,null::*
--- a/hotspot/test/compiler/codecache/stress/CodeCacheStressRunner.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/stress/CodeCacheStressRunner.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
package compiler.codecache.stress;
-import jdk.test.lib.TimeLimitedRunner;
+import jdk.test.lib.wrappers.TimeLimitedRunner;
import jdk.test.lib.Utils;
public class CodeCacheStressRunner {
--- a/hotspot/test/compiler/codecache/stress/Helper.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/stress/Helper.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import jdk.test.lib.Asserts;
import jdk.test.lib.ByteCodeLoader;
-import jdk.test.lib.InfiniteLoop;
+import jdk.test.lib.wrappers.InfiniteLoop;
import jdk.test.lib.Utils;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/compiler/codecache/stress/OverloadCompileQueueTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/stress/OverloadCompileQueueTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,12 @@
/*
* @test OverloadCompileQueueTest
* @summary stressing code cache by overloading compile queues
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
* @ignore 8071905
- * @build compiler.codecache.stress.OverloadCompileQueueTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/stress/RandomAllocationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/stress/RandomAllocationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,11 @@
* @test RandomAllocationTest
* @key stress
* @summary stressing code cache by allocating randomly sized "dummy" code blobs
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.codecache.stress.RandomAllocationTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codecache/stress/UnexpectedDeoptimizationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,11 @@
* @test UnexpectedDeoptimizationTest
* @key stress
* @summary stressing code cache by forcing unexpected deoptimizations
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.codecache.stress.UnexpectedDeoptimizationTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/codegen/Test6823354.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codegen/Test6823354.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 6823354
* @summary These methods can be instrinsified by using bit scan, bit test, and population count instructions.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run main/othervm -Xcomp
* -XX:CompileCommand=compileonly,compiler.codegen.Test6823354::lzcomp
--- a/hotspot/test/compiler/codegen/Test6896617.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codegen/Test6896617.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 6896617
* @summary Optimize sun.nio.cs.ISO_8859_1$Encode.encodeArrayLoop() with SSE instructions on x86
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.base/sun.nio.cs
* java.management
--- a/hotspot/test/compiler/codegen/Test7100757.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codegen/Test7100757.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 7100757
* @summary The BitSet.nextSetBit() produces incorrect result in 32bit VM on Sparc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/codegen/aes/TestAESMain.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/codegen/aes/TestAESMain.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @bug 7184394
* @key stress
* @summary add intrinsics to use AES instructions
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/compilercontrol/InlineMatcherTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/InlineMatcherTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +26,9 @@
* @bug 8074095
* @summary Testing of compiler/InlineMatcher
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
*
- * @build compiler.compilercontrol.InlineMatcherTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityBase.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,16 +25,12 @@
* @test TestCompilerDirectivesCompatibilityBase
* @bug 8137167
* @summary Test compiler control compatibility with compile command
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
*
- * @build jdk.test.lib.*
- * jdk.test.lib.dcmd.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.TestCompilerDirectivesCompatibilityBase
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOff.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,16 +25,12 @@
* @test TestCompilerDirectivesCompatibilityCommandOff
* @bug 8137167
* @summary Test compiler control compatibility with compile command
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
*
- * @build jdk.test.lib.*
- * jdk.test.lib.dcmd.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.TestCompilerDirectivesCompatibilityCommandOff
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityCommandOn.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,16 +25,12 @@
* @test TestCompilerDirectivesCompatibilityCommandOn
* @bug 8137167
* @summary Test compiler control compatibility with compile command
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
*
- * @build jdk.test.lib.*
- * jdk.test.lib.dcmd.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.TestCompilerDirectivesCompatibilityCommandOn
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/TestCompilerDirectivesCompatibilityFlag.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,16 +24,12 @@
/*
* @test TestCompilerDirectivesCompatibilityFlag
* @bug 8137167
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
*
- * @build jdk.test.lib.*
- * jdk.test.lib.dcmd.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.TestCompilerDirectivesCompatibilityFlag
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run testng/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests CompileCommand=compileonly
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.commandfile.CompileOnlyTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commandfile.CompileOnlyTest
--- a/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests CompileCommand=exclude
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.commandfile.ExcludeTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commandfile.ExcludeTest
--- a/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests CompileCommand=log
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.commandfile.LogTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commandfile.LogTest
--- a/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests CompileCommand=print
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.commandfile.PrintTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commandfile.PrintTest
--- a/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests CompileCommand=compileonly
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.commands.CompileOnlyTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commands.CompileOnlyTest
--- a/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests CompileCommand=exclude
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.commands.ExcludeTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commands.ExcludeTest
--- a/hotspot/test/compiler/compilercontrol/commands/LogTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/commands/LogTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests CompileCommand=log
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.commands.LogTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commands.LogTest
--- a/hotspot/test/compiler/compilercontrol/commands/PrintTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/commands/PrintTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests CompileCommand=print
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.commands.PrintTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commands.PrintTest
--- a/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests directives to be able to compile only specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.directives.CompileOnlyTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.directives.CompileOnlyTest
--- a/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests directives to be able to exclude methods from compilation
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.directives.ExcludeTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.directives.ExcludeTest
--- a/hotspot/test/compiler/compilercontrol/directives/LogTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/directives/LogTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests directives to be able to turn on LogCompilation
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.directives.LogTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.directives.LogTest
--- a/hotspot/test/compiler/compilercontrol/directives/PrintTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/directives/PrintTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests directives to be able to turn on print_assembly
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.directives.PrintTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.directives.PrintTest
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests directives to be able to add and remove directives
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.jcmd.AddAndRemoveTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.AddAndRemoveTest
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests jcmd to be able to add a directive to compile only specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.jcmd.AddCompileOnlyTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.AddCompileOnlyTest
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests jcmd to be able to add a directive to exclude only specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.jcmd.AddExcludeTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.AddExcludeTest
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests jcmd to be able to add a directive to log only specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.jcmd.AddLogTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.AddLogTest
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,14 +27,9 @@
* @summary Tests jcmd to be able to add a directive to print assembly
* only for specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.jcmd.AddPrintAssemblyTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.AddPrintAssemblyTest
--- a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,15 +26,10 @@
* @bug 8137167
* @summary Tests jcmd to be able to clear directives added via options
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
* @ignore 8140405
- * @build compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
--- a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests clear JCMD command
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.jcmd.ClearDirectivesStackTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.ClearDirectivesStackTest
--- a/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,15 +26,10 @@
* @bug 8137167
* @summary Tests jcmd to be able to add a directive to compile only specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @requires vm.flavor != "minimal"
*
- * @build compiler.compilercontrol.jcmd.PrintDirectivesTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.PrintDirectivesTest
--- a/hotspot/test/compiler/compilercontrol/jcmd/StressAddJcmdBase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/jcmd/StressAddJcmdBase.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,8 +28,8 @@
import compiler.compilercontrol.share.method.MethodDescriptor;
import compiler.compilercontrol.share.pool.PoolHelper;
import compiler.compilercontrol.share.scenario.Executor;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.TimeLimitedRunner;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.wrappers.TimeLimitedRunner;
import jdk.test.lib.Utils;
import java.util.ArrayList;
--- a/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,14 +27,9 @@
* @summary Tests jcmd to be able to add a lot of huge directive files with
* parallel executed jcmds until timeout has reached
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
--- a/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Tests LogCompilation executed standalone without log commands or directives
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.logcompilation.LogTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.logcompilation.LogTest
--- a/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +26,9 @@
* @bug 8135068
* @summary Tests CompilerCommand's method matcher
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.matcher.MethodMatcherTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -40,7 +40,7 @@
import compiler.compilercontrol.share.method.MethodDescriptor;
import compiler.compilercontrol.share.method.MethodGenerator;
import compiler.compilercontrol.share.pool.PoolHelper;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import sun.hotspot.WhiteBox;
import java.lang.reflect.Executable;
--- a/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Randomly generates commands with random types
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.mixed.RandomCommandsTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver/timeout=600 compiler.compilercontrol.mixed.RandomCommandsTest
--- a/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,9 @@
* @bug 8137167
* @summary Randomly generates valid commands with random types
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.compilercontrol.mixed.RandomValidCommandsTest
- * compiler.compilercontrol.share.pool.sub.*
- * compiler.compilercontrol.share.pool.subpack.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
- * compiler.compilercontrol.share.actions.*
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver/timeout=600 compiler.compilercontrol.mixed.RandomValidCommandsTest
--- a/hotspot/test/compiler/compilercontrol/parser/DirectiveParserTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/parser/DirectiveParserTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 8137167
* @summary Tests directive json parser
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
* @run driver compiler.compilercontrol.parser.DirectiveParserTest
*/
@@ -35,7 +35,7 @@
import compiler.compilercontrol.share.JSONFile;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
public class DirectiveParserTest {
--- a/hotspot/test/compiler/compilercontrol/parser/DirectiveStressTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/parser/DirectiveStressTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 8137167
* @summary Stress directive json parser
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
* @run driver compiler.compilercontrol.parser.DirectiveStressTest
*/
@@ -38,7 +38,7 @@
import compiler.compilercontrol.share.method.MethodDescriptor;
import compiler.compilercontrol.share.pool.PoolHelper;
import compiler.compilercontrol.share.scenario.DirectiveWriter;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.List;
import java.util.stream.Collectors;
--- a/hotspot/test/compiler/compilercontrol/parser/HugeDirectiveUtil.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/parser/HugeDirectiveUtil.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
import compiler.compilercontrol.share.method.MethodDescriptor;
import compiler.compilercontrol.share.scenario.DirectiveWriter;
import compiler.compilercontrol.share.scenario.Scenario;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
import java.util.EnumSet;
--- a/hotspot/test/compiler/compilercontrol/share/AbstractTestBase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/AbstractTestBase.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import compiler.compilercontrol.share.method.MethodDescriptor;
import compiler.compilercontrol.share.method.MethodGenerator;
import compiler.compilercontrol.share.pool.PoolHelper;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import java.lang.reflect.Executable;
import java.util.List;
--- a/hotspot/test/compiler/compilercontrol/share/actions/BaseAction.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/actions/BaseAction.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,8 +25,8 @@
import compiler.compilercontrol.share.pool.PoolHelper;
import compiler.compilercontrol.share.scenario.State;
-import jdk.test.lib.Pair;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.util.Pair;
+import jdk.test.lib.process.ProcessTools;
import java.io.BufferedReader;
import java.io.IOException;
--- a/hotspot/test/compiler/compilercontrol/share/actions/CompileAction.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/actions/CompileAction.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
import compiler.compilercontrol.share.scenario.State;
import compiler.testlibrary.CompilerUtils;
import jdk.test.lib.Asserts;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.Utils;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/compiler/compilercontrol/share/method/MethodDescriptor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/method/MethodDescriptor.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package compiler.compilercontrol.share.method;
-import jdk.test.lib.Triple;
+import jdk.test.lib.util.Triple;
import java.lang.reflect.Executable;
import java.util.function.Function;
--- a/hotspot/test/compiler/compilercontrol/share/method/MethodGenerator.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/method/MethodGenerator.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,8 +26,8 @@
import compiler.compilercontrol.share.method.MethodDescriptor.PatternType;
import compiler.compilercontrol.share.method.MethodDescriptor.Separator;
import compiler.compilercontrol.share.pool.PoolHelper;
-import jdk.test.lib.Pair;
-import jdk.test.lib.Triple;
+import jdk.test.lib.util.Pair;
+import jdk.test.lib.util.Triple;
import jdk.test.lib.Utils;
import java.lang.reflect.Executable;
--- a/hotspot/test/compiler/compilercontrol/share/pool/MethodHolder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/pool/MethodHolder.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package compiler.compilercontrol.share.pool;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import java.lang.reflect.Executable;
import java.lang.reflect.Method;
--- a/hotspot/test/compiler/compilercontrol/share/pool/PoolHelper.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/pool/PoolHelper.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package compiler.compilercontrol.share.pool;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import java.lang.reflect.Executable;
import java.util.ArrayList;
--- a/hotspot/test/compiler/compilercontrol/share/pool/SubMethodHolder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/pool/SubMethodHolder.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,6 +1,6 @@
package compiler.compilercontrol.share.pool;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
--- a/hotspot/test/compiler/compilercontrol/share/processors/CommandProcessor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/processors/CommandProcessor.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
import compiler.compilercontrol.share.scenario.CompileCommand;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.Iterator;
import java.util.List;
--- a/hotspot/test/compiler/compilercontrol/share/processors/LogProcessor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/processors/LogProcessor.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
import compiler.compilercontrol.share.pool.PoolHelper;
import compiler.compilercontrol.share.scenario.State;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import java.io.File;
import java.io.FileNotFoundException;
--- a/hotspot/test/compiler/compilercontrol/share/processors/PrintDirectivesProcessor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/processors/PrintDirectivesProcessor.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import compiler.compilercontrol.share.method.MethodDescriptor;
import compiler.compilercontrol.share.scenario.CompileCommand;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.ArrayList;
import java.util.Iterator;
--- a/hotspot/test/compiler/compilercontrol/share/processors/PrintProcessor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/processors/PrintProcessor.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
import compiler.compilercontrol.share.method.MethodGenerator;
import compiler.compilercontrol.share.pool.PoolHelper;
import compiler.compilercontrol.share.scenario.State;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import java.lang.management.ManagementFactory;
import java.lang.reflect.Executable;
--- a/hotspot/test/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/scenario/AbstractCommandBuilder.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
import compiler.compilercontrol.share.method.MethodDescriptor;
import compiler.compilercontrol.share.pool.PoolHelper;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import java.lang.reflect.Executable;
import java.util.ArrayList;
--- a/hotspot/test/compiler/compilercontrol/share/scenario/DirectiveBuilder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/scenario/DirectiveBuilder.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
import compiler.compilercontrol.share.method.MethodDescriptor;
import compiler.compilercontrol.share.method.MethodGenerator;
import compiler.compilercontrol.share.pool.PoolHelper;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import java.lang.reflect.Executable;
import java.util.ArrayList;
--- a/hotspot/test/compiler/compilercontrol/share/scenario/Executor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/scenario/Executor.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,8 +25,8 @@
import compiler.compilercontrol.share.actions.BaseAction;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.PidJcmdExecutor;
--- a/hotspot/test/compiler/compilercontrol/share/scenario/JcmdStateBuilder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/scenario/JcmdStateBuilder.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import compiler.compilercontrol.share.method.MethodDescriptor;
import compiler.compilercontrol.share.method.MethodGenerator;
import compiler.compilercontrol.share.pool.PoolHelper;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import java.lang.reflect.Executable;
import java.util.ArrayList;
--- a/hotspot/test/compiler/compilercontrol/share/scenario/Scenario.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/compilercontrol/share/scenario/Scenario.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,8 +30,8 @@
import compiler.compilercontrol.share.processors.PrintDirectivesProcessor;
import compiler.compilercontrol.share.processors.PrintProcessor;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.Pair;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.util.Pair;
import java.lang.reflect.Executable;
import java.util.ArrayList;
--- a/hotspot/test/compiler/cpuflags/RestoreMXCSR.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/cpuflags/RestoreMXCSR.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8020433
* @summary Crash when using -XX:+RestoreMXCSROnJNICalls
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
@@ -34,8 +34,8 @@
package compiler.cpuflags;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class RestoreMXCSR {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +24,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @ignore 8146128
- * @build compiler.cpuflags.TestAESIntrinsicsOnSupportedConfig
- * compiler.codegen.aes.TestAESMain
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -39,9 +38,9 @@
package compiler.cpuflags;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
public class TestAESIntrinsicsOnSupportedConfig extends AESIntrinsicsBase {
--- a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +24,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.cpuflags.TestAESIntrinsicsOnUnsupportedConfig
- * compiler.codegen.aes.TestAESMain
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -39,8 +38,8 @@
package compiler.cpuflags;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.cli.predicate.NotPredicate;
public class TestAESIntrinsicsOnUnsupportedConfig extends AESIntrinsicsBase {
--- a/hotspot/test/compiler/debug/VerifyAdapterSharing.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/debug/VerifyAdapterSharing.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8030783
* @summary Regression test for 8026478
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
@@ -34,8 +34,8 @@
package compiler.debug;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class VerifyAdapterSharing {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/compiler/eliminateAutobox/UnsignedLoads.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/eliminateAutobox/UnsignedLoads.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+EliminateAutoBox
* -XX:CompileOnly=::valueOf,::byteValue,::shortValue,::testUnsignedByte,::testUnsignedShort
--- a/hotspot/test/compiler/floatingpoint/TestPow2.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/floatingpoint/TestPow2.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8063086
* @summary X^2 special case for C2 yields different result than interpreter
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.floatingpoint.TestPow2
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/gcbarriers/PreserveFPRegistersTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/gcbarriers/PreserveFPRegistersTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8148175
* @requires vm.gc=="G1" | vm.gc=="null"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -Xmx300m -XX:+UseG1GC
* compiler.gcbarriers.PreserveFPRegistersTest
--- a/hotspot/test/compiler/inlining/InlineAccessors.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/inlining/InlineAccessors.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,15 +26,15 @@
* @bug 8140650
* @summary Method::is_accessor should cover getters and setters for all types
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run driver compiler.inlining.InlineAccessors
*/
package compiler.inlining;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class InlineAccessors {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/compiler/interpreter/DisableOSRTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/interpreter/DisableOSRTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @bug 8159620
* @summary testing that -XX:-UseOnStackReplacement works with both -XX:(+/-)TieredCompilation
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,9 +25,9 @@
* @test
* @bug 8130832
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
*
- * @build compiler.intrinsics.IntrinsicAvailableTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/intrinsics/IntrinsicDisabledTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/IntrinsicDisabledTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +25,9 @@
* @test
* @bug 8138651
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
*
- * @build compiler.intrinsics.IntrinsicDisabledTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bigInteger/MontgomeryMultiplyTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, Red Hat Inc. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -28,9 +28,9 @@
* @summary Verify that the Montgomery multiply and square intrinsic works and correctly checks their arguments.
* @requires vm.flavor == "server"
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
*
- * @build compiler.intrinsics.bigInteger.MontgomeryMultiplyTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/BMITestRunner.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/BMITestRunner.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,8 +25,8 @@
package compiler.intrinsics.bmi;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
import java.io.IOException;
--- a/hotspot/test/compiler/intrinsics/bmi/TestAndnI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestAndnI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,12 +27,10 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of ANDN instruction
- * @library /testlibrary /test/lib
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.intrinsics.bmi.TestAndnI
- * compiler.intrinsics.bmi.BMITestRunner
- * compiler.intrinsics.bmi.Expr
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestAndnL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestAndnL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of ANDN instruction
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestAndnL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsiI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsiI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of BLSI instruction
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestBlsiI
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsiL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsiL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of BLSI instruction
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestBlsiL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsmskI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsmskI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of BLSMSK instruction
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestBlsmskI
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsmskL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsmskL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of BLSMSK instruction
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestBlsmskL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsrI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsrI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of BLSR instruction
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestBlsrI
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestBlsrL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestBlsrL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of BLSR instruction
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestBlsrL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestLzcntI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestLzcntI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of intrinsic
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestLzcntI
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestLzcntL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestLzcntL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of intrinsic
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestLzcntL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestTzcntI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestTzcntI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of intrinsic
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestTzcntI BMITestRunner Expr
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/TestTzcntL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/TestTzcntL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031321
* @summary Verify that results of computations are the same w/
* and w/o usage of intrinsic
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.TestTzcntL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.AndnTestI
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.AndnTestL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.BlsiTestI
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.BlsiTestL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.BlsmskTestI
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.BlsmskTestL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.BlsrTestI
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.BlsrTestL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.LZcntTestI
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.LZcntTestL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.TZcntTestI
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8031321
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.bmi.verifycode.TZcntTestL
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/klass/CastNullCheckDroppingsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,15 +26,13 @@
* @bug 8054492
* @summary Casting can result in redundant null checks in generated code
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.*
- * @build compiler.intrinsics.klass.CastNullCheckDroppingsTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
- * jdk.test.lib.Platform
* @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -Xmixed -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:CompileThreshold=1000
* -XX:CompileCommand=exclude,compiler.intrinsics.klass.CastNullCheckDroppingsTest::runTest
--- a/hotspot/test/compiler/intrinsics/mathexact/AddExactIConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/AddExactIConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8024924
* @summary Test constant addExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/AddExactILoadTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/AddExactILoadTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8024924
* @summary Test non constant addExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/AddExactILoopDependentTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8024924
* @summary Test non constant addExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/AddExactINonConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/AddExactINonConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8024924
* @summary Test non constant addExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/AddExactIRepeatTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/AddExactIRepeatTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8025657
* @summary Test repeating addExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/AddExactLConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/AddExactLConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test constant addExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/AddExactLNonConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test non constant addExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/DecExactITest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/DecExactITest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test decrementExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/DecExactLTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/DecExactLTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test decrementExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/IncExactITest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/IncExactITest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test incrementExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/IncExactLTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/IncExactLTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test incrementExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/MulExactIConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/MulExactIConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test constant multiplyExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/MulExactILoadTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/MulExactILoadTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test multiplyExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/MulExactILoopDependentTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test loop dependent multiplyExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/MulExactINonConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/MulExactINonConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test non constant multiplyExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/MulExactIRepeatTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/MulExactIRepeatTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test repeating multiplyExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/MulExactLConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/MulExactLConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test constant mulExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/MulExactLNonConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test non constant mulExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/NegExactIConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/NegExactIConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test constant negExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/NegExactILoadTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/NegExactILoadTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test negExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/NegExactILoopDependentTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test negExact loop dependent
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/NegExactINonConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/NegExactINonConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test non constant negExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/NegExactLConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/NegExactLConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test constant negExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/NegExactLNonConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test constant negExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/SubExactICondTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/SubExactICondTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test subtractExact as condition
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/SubExactIConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/SubExactIConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test constant subtractExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/SubExactILoadTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/SubExactILoadTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test non constant subtractExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/SubExactILoopDependentTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test non constant subtractExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/SubExactINonConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/SubExactINonConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test non constant subtractExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/SubExactIRepeatTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/SubExactIRepeatTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8026844
* @summary Test repeating subtractExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/SubExactLConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 8026844
* @bug 8027353
* @summary Test constant subtractExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/SubExactLNonConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 8026844
* @bug 8027353
* @summary Test non constant subtractExact
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.AddExactIntTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.AddExactLongTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.DecrementExactIntTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.DecrementExactLongTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.IncrementExactIntTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.IncrementExactLongTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.MultiplyExactIntTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.MultiplyExactLongTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.NegateExactIntTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.NegateExactLongTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +23,11 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.mathexact.sanity.SubtractExactIntTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +23,10 @@
/*
* @test
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.intrinsics.mathexact.sanity.SubtractExactLongTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/object/TestClone.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/object/TestClone.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @bug 8033626
* @summary assert(ex_map->jvms()->same_calls_as(_exceptions->jvms())) failed: all collected exceptions must come from the same place
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run main/othervm -XX:-TieredCompilation -Xbatch
* -XX:CompileCommand=compileonly,compiler.intrinsics.object.TestClone::f
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8035968
* @summary Verify UseSHA1Intrinsics option processing on supported CPU.
- * @library /testlibrary /test/lib testcases /
+ * @library /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.sha.cli.TestUseSHA1IntrinsicsOptionOnSupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8035968
* @summary Verify UseSHA1Intrinsics option processing on unsupported CPU.
- * @library /testlibrary /test/lib testcases /
+ * @library /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.sha.cli.TestUseSHA1IntrinsicsOptionOnUnsupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8035968
* @summary Verify UseSHA256Intrinsics option processing on supported CPU.
- * @library /testlibrary /test/lib testcases /
+ * @library /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.sha.cli.TestUseSHA256IntrinsicsOptionOnSupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8035968
* @summary Verify UseSHA256Intrinsics option processing on unsupported CPU.
- * @library /testlibrary /test/lib testcases /
+ * @library /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.sha.cli.TestUseSHA256IntrinsicsOptionOnUnsupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8035968
* @summary Verify UseSHA512Intrinsics option processing on supported CPU.
- * @library /testlibrary /test/lib testcases /
+ * @library /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.sha.cli.TestUseSHA512IntrinsicsOptionOnSupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8035968
* @summary Verify UseSHA512Intrinsics option processing on unsupported CPU.
- * @library /testlibrary /test/lib testcases /
+ * @library /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.sha.cli.TestUseSHA512IntrinsicsOptionOnUnsupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +25,11 @@
* @test
* @bug 8035968
* @summary Verify UseSHA option processing on supported CPU.
- * @library /testlibrary /test/lib testcases /
+ * @library /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.intrinsics.sha.cli.TestUseSHAOptionOnSupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +25,10 @@
* @test
* @bug 8035968
* @summary Verify UseSHA option processing on unsupported CPU.
- * @library /testlibrary /test/lib testcases /
+ * @library /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.intrinsics.sha.cli.TestUseSHAOptionOnUnsupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForOtherCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
package compiler.intrinsics.sha.cli.testcases;
import compiler.intrinsics.sha.cli.SHAOptionsBase;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.NotPredicate;
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForSupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
package compiler.intrinsics.sha.cli.testcases;
import compiler.intrinsics.sha.cli.SHAOptionsBase;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedAArch64CPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
package compiler.intrinsics.sha.cli.testcases;
import compiler.intrinsics.sha.cli.SHAOptionsBase;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedSparcCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedSparcCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
package compiler.intrinsics.sha.cli.testcases;
import compiler.intrinsics.sha.cli.SHAOptionsBase;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/GenericTestCaseForUnsupportedX86CPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
package compiler.intrinsics.sha.cli.testcases;
import compiler.intrinsics.sha.cli.SHAOptionsBase;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
import compiler.intrinsics.sha.cli.SHAOptionsBase;
import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import compiler.intrinsics.sha.cli.SHAOptionsBase;
import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
import jdk.test.lib.Asserts;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import compiler.intrinsics.sha.cli.SHAOptionsBase;
import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
import jdk.test.lib.Asserts;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,11 @@
* @test
* @bug 8035968
* @summary Verify that SHA-1 intrinsic is actually used.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.testlibrary.intrinsics.Verifier
- * compiler.intrinsics.sha.sanity.TestSHA1Intrinsics
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,11 @@
* @test
* @bug 8035968
* @summary Verify that SHA-1 multi block intrinsic is actually used.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.testlibrary.intrinsics.Verifier
- * compiler.intrinsics.sha.sanity.TestSHA1MultiBlockIntrinsics
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,11 @@
* @test
* @bug 8035968
* @summary Verify that SHA-256 intrinsic is actually used.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.testlibrary.intrinsics.Verifier
- * compiler.intrinsics.sha.sanity.TestSHA256Intrinsics
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,11 @@
* @test
* @bug 8035968
* @summary Verify that SHA-256 multi block intrinsic is actually used.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.testlibrary.intrinsics.Verifier
- * compiler.intrinsics.sha.sanity.TestSHA256MultiBlockIntrinsics
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,11 @@
* @test
* @bug 8035968
* @summary Verify that SHA-512 intrinsic is actually used.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.testlibrary.intrinsics.Verifier
- * compiler.intrinsics.sha.sanity.TestSHA512Intrinsics
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,11 @@
* @test
* @bug 8035968
* @summary Verify that SHA-512 multi block intrinsic is actually used.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.testlibrary.intrinsics.Verifier
- * compiler.intrinsics.sha.sanity.TestSHA512MultiBlockIntrinsics
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/intrinsics/string/TestHasNegatives.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/string/TestHasNegatives.java Mon Sep 12 22:04:48 2016 +0000
@@ -30,7 +30,6 @@
* @library /compiler/patches
*
* @build java.base/java.lang.Helper
- * @build compiler.intrinsics.string.TestHasNegatives
* @run main compiler.intrinsics.string.TestHasNegatives
*/
--- a/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicMemoryFlow.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicMemoryFlow.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @bug 8144212
* @summary Check for correct memory flow with the String compress/inflate intrinsics.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run main compiler.intrinsics.string.TestStringIntrinsicMemoryFlow
*/
--- a/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/string/TestStringIntrinsicRangeChecks.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,9 +27,8 @@
* @test
* @bug 8155608
* @summary Verifies that string intrinsics throw array out of bounds exceptions.
- * @library /compiler/patches /testlibrary /test/lib
+ * @library /compiler/patches /test/lib
* @build java.base/java.lang.Helper
- * @build compiler.intrinsics.string.TestStringIntrinsicRangeChecks
* @run main/othervm -Xbatch -XX:CompileThreshold=100 -XX:-TieredCompilation compiler.intrinsics.string.TestStringIntrinsicRangeChecks
*/
package compiler.intrinsics.string;
--- a/hotspot/test/compiler/intrinsics/string/TestStringIntrinsics2.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/string/TestStringIntrinsics2.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
* @bug 8145336
* @summary PPC64: fix string intrinsics after CompactStrings change
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
*
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/compiler/intrinsics/unsafe/DirectByteBufferTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/unsafe/DirectByteBufferTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8026049 8151163
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-UseUnalignedAccesses -Djdk.test.lib.random.seed=0 DirectByteBufferTest
* @run main/othervm -Djdk.test.lib.random.seed=0 DirectByteBufferTest
* @summary Verify that direct byte buffers are correctly accessed.
--- a/hotspot/test/compiler/intrinsics/unsafe/HeapByteBufferTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/unsafe/HeapByteBufferTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
* @bug 8026049 8151163
* @summary Verify that byte buffers are correctly accessed.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:-UseUnalignedAccesses -Djdk.test.lib.random.seed=0
* HeapByteBufferTest
--- a/hotspot/test/compiler/intrinsics/unsafe/TestUnsafeMismatchedArrayFieldAccess.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/intrinsics/unsafe/TestUnsafeMismatchedArrayFieldAccess.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @bug 8142386
* @summary Unsafe access to an array is wrongly marked as mismatched
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
*
* @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation
* compiler.intrinsics.unsafe.TestUnsafeMismatchedArrayFieldAccess
--- a/hotspot/test/compiler/jsr292/ConcurrentClassLoadingTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jsr292/ConcurrentClassLoadingTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 8022595
* @summary JSR292: deadlock during class loading of MethodHandles, MethodHandleImpl & MethodHandleNatives
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/jsr292/ContinuousCallSiteTargetChange.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jsr292/ContinuousCallSiteTargetChange.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,15 +24,15 @@
/**
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /
+ * @library /test/lib /
*
* @run driver compiler.jsr292.ContinuousCallSiteTargetChange
*/
package compiler.jsr292;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.lang.invoke.CallSite;
import java.lang.invoke.MethodHandle;
--- a/hotspot/test/compiler/jsr292/MHInlineTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jsr292/MHInlineTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,15 +26,15 @@
* @bug 8062280
* @summary C2: inlining failure due to access checks being too strict
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /
+ * @library /test/lib /
*
* @run main/othervm compiler.jsr292.MHInlineTest
*/
package compiler.jsr292;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
--- a/hotspot/test/compiler/jsr292/NonInlinedCall/Agent.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jsr292/NonInlinedCall/Agent.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +24,7 @@
package compiler.jsr292.NonInlinedCall;
import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import java.io.File;
import java.io.PrintStream;
--- a/hotspot/test/compiler/jsr292/NonInlinedCall/GCTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jsr292/NonInlinedCall/GCTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +24,7 @@
/*
* @test
* @bug 8072008
- * @library /testlibrary /test/lib ../patches
+ * @library /test/lib ../patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.vm.annotation
*
--- a/hotspot/test/compiler/jsr292/NonInlinedCall/InvokeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jsr292/NonInlinedCall/InvokeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +24,12 @@
/*
* @test
* @bug 8072008
- * @library /testlibrary /test/lib / ../patches
+ * @library /test/lib / ../patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.vm.annotation
*
* @build java.base/java.lang.invoke.MethodHandleHelper
* sun.hotspot.WhiteBox
- * compiler.jsr292.NonInlinedCall.InvokeTest
* @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -Xbatch -XX:-TieredCompilation -XX:CICompilerCount=1
--- a/hotspot/test/compiler/jsr292/NonInlinedCall/RedefineTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jsr292/NonInlinedCall/RedefineTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* java.base/jdk.internal.vm.annotation
- * @library /testlibrary /test/lib / ../patches
+ * @library /test/lib / ../patches
* @requires vm.flavor != "minimal"
*
* @build sun.hotspot.WhiteBox
--- a/hotspot/test/compiler/jsr292/PollutedTrapCounts.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jsr292/PollutedTrapCounts.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,15 +25,15 @@
* @test
* @bug 8074551
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*
* @run driver compiler.jsr292.PollutedTrapCounts
*/
package compiler.jsr292;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
--- a/hotspot/test/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/JVM_GetJVMCIRuntimeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.runtime
* @run main/othervm -XX:+UnlockExperimentalVMOptions
--- a/hotspot/test/compiler/jvmci/SecurityRestrictionsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/SecurityRestrictionsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
--- a/hotspot/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/AllocateCompileIdTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -33,9 +33,7 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.AllocateCompileIdTest
- * @build sun.hotspot.WhiteBox
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
@@ -49,7 +47,7 @@
import compiler.jvmci.common.CTVMUtilities;
import jdk.test.lib.Asserts;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.Utils;
import jdk.vm.ci.hotspot.CompilerToVMHelper;
import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod;
--- a/hotspot/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/CanInlineMethodTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -34,9 +34,7 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.CanInlineMethodTest
- * @build sun.hotspot.WhiteBox
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/CollectCountersTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/CollectCountersTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +25,11 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib/
+ * @library / /test/lib/
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.CollectCountersTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run main/othervm -XX:+UnlockExperimentalVMOptions
* -XX:+EnableJVMCI
* -XX:JVMCICounterSize=0
--- a/hotspot/test/compiler/jvmci/compilerToVM/CompileCodeTestCase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/CompileCodeTestCase.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import compiler.jvmci.common.CTVMUtilities;
import compiler.testlibrary.CompilerUtils;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.Utils;
import jdk.vm.ci.code.InstalledCode;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/compiler/jvmci/compilerToVM/DebugOutputTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/DebugOutputTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +25,11 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.DebugOutputTest
* @run main/othervm compiler.jvmci.compilerToVM.DebugOutputTest
*/
@@ -38,8 +37,8 @@
package compiler.jvmci.compilerToVM;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.vm.ci.hotspot.CompilerToVMHelper;
import java.util.Arrays;
--- a/hotspot/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/DisassembleCodeBlobTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -35,9 +35,7 @@
* jdk.vm.ci/jdk.vm.ci.code
*
* @ignore 8139700
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.DisassembleCodeBlobTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/DoNotInlineOrCompileTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -34,9 +34,7 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.DoNotInlineOrCompileTest
- * @build sun.hotspot.WhiteBox
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ExecuteInstalledCodeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,7 +1,7 @@
package compiler.jvmci.compilerToVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.Utils;
import jdk.vm.ci.code.InstalledCode;
import jdk.vm.ci.code.InvalidInstalledCodeException;
@@ -17,7 +17,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @ignore 8139383
* @modules java.base/jdk.internal.misc
@@ -25,9 +25,7 @@
* java.base/jdk.internal.org.objectweb.asm.tree
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.ExecuteInstalledCodeTest
- * @build sun.hotspot.WhiteBox
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/FindUniqueConcreteMethodTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -35,7 +35,6 @@
* jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.FindUniqueConcreteMethodTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.FindUniqueConcreteMethodTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetBytecodeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -34,7 +34,6 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetBytecodeTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetBytecodeTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetClassInitializerTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +25,11 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetClassInitializerTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetClassInitializerTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetConstantPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -36,7 +36,6 @@
* jdk.vm.ci/jdk.vm.ci.code
*
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetConstantPoolTest
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetExceptionTableTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -34,7 +34,6 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetExceptionTableTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetExceptionTableTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetImplementorTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetImplementorTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +25,11 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib/
+ * @library / /test/lib/
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetImplementorTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetImplementorTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetLineNumberTableTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @library ../common/patches
* @modules java.base/jdk.internal.misc
@@ -35,7 +35,6 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetLineNumberTableTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetLineNumberTableTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetLocalVariableTableTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -38,7 +38,6 @@
* @compile -g DummyAbstractClass.java
* @compile -g DummyClass.java
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetLocalVariableTableTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetLocalVariableTableTest
* @clean compiler.jvmci.compilerToVM.*
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetMaxCallTargetOffsetTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +25,11 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib/
+ * @library / /test/lib/
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetMaxCallTargetOffsetTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetMaxCallTargetOffsetTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetNextStackFrameTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -34,7 +34,6 @@
* jdk.vm.ci/jdk.vm.ci.code
* jdk.vm.ci/jdk.vm.ci.meta
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetNextStackFrameTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetNextStackFrameTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodAtSlotTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -35,7 +35,6 @@
* jdk.vm.ci/jdk.vm.ci.code
* jdk.vm.ci/jdk.vm.ci.meta
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetNextStackFrameTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetResolvedJavaMethodAtSlotTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaMethodTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +25,14 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
*
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* jdk.vm.ci/jdk.vm.ci.hotspot.PublicMetaspaceWrapperObject
- * @build compiler.jvmci.compilerToVM.GetResolvedJavaMethodTest
+ * sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetResolvedJavaTypeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
@@ -34,8 +34,7 @@
* @ignore 8158860
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* jdk.vm.ci/jdk.vm.ci.hotspot.PublicMetaspaceWrapperObject
- * @build compiler.jvmci.compilerToVM.GetResolvedJavaTypeTest
- * @build sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetStackTraceElementTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -34,7 +34,6 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetStackTraceElementTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetStackTraceElementTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetSymbolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetSymbolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -34,7 +34,6 @@
* jdk.vm.ci/jdk.vm.ci.code
* jdk.vm.ci/jdk.vm.ci.meta
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetSymbolTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetSymbolTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/GetVtableIndexForInterfaceTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -33,7 +33,6 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.GetVtableIndexForInterfaceTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.GetVtableIndexForInterfaceTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/HasCompiledCodeForOSRTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -34,9 +34,7 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.HasCompiledCodeForOSRTest
- * @build sun.hotspot.WhiteBox
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/HasFinalizableSubclassTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +25,11 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.HasFinalizableSubclassTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.HasFinalizableSubclassTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/InitializeConfigurationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,12 +25,11 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.InitializeConfigurationTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.InitializeConfigurationTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/InvalidateInstalledCodeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -36,9 +36,7 @@
* jdk.vm.ci/jdk.vm.ci.runtime
*
* @ignore 8139700
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.InvalidateInstalledCodeTest
- * @build sun.hotspot.WhiteBox
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/IsMatureTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/IsMatureTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +25,12 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* ../common/patches
* @modules java.base/jdk.internal.misc
* jdk.vm.ci/jdk.vm.ci.hotspot
*
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * compiler.jvmci.compilerToVM.IsMatureTest
* sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/JVM_RegisterJVMCINatives.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.runtime
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassInPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
* @summary Testing compiler.jvmci.CompilerToVM.lookupKlassInPool method
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
@@ -37,9 +37,7 @@
* jdk.vm.ci/jdk.vm.ci.runtime
* jdk.vm.ci/jdk.vm.ci.meta
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.LookupKlassInPoolTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupKlassRefIndexInPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8138708
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
@@ -36,9 +36,7 @@
* jdk.vm.ci/jdk.vm.ci.runtime
* jdk.vm.ci/jdk.vm.ci.meta
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.LookupKlassRefIndexInPoolTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupMethodInPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8138708
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
@@ -36,9 +36,7 @@
* jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.LookupMethodInPoolTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupNameAndTypeRefIndexInPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8138708
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
@@ -36,9 +36,7 @@
* jdk.vm.ci/jdk.vm.ci.runtime
* jdk.vm.ci/jdk.vm.ci.meta
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.LookupNameAndTypeRefIndexInPoolTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupNameInPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8138708
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
@@ -38,7 +38,6 @@
*
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.LookupNameInPoolTest
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupSignatureInPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8138708
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
@@ -38,7 +38,6 @@
*
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.LookupSignatureInPoolTest
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/jvmci/compilerToVM/LookupTypeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/LookupTypeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +25,11 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.LookupTypeTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.LookupTypeTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/MaterializeVirtualObjectTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
* & (vm.compMode != "Xcomp" | vm.opt.TieredCompilation == null | vm.opt.TieredCompilation == true)
* @summary no "-Xcomp -XX:-TieredCompilation" combination allowed until JDK-8140018 is resolved
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -36,9 +36,7 @@
* jdk.vm.ci/jdk.vm.ci.code
* jdk.vm.ci/jdk.vm.ci.meta
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.MaterializeVirtualObjectTest
- * @build sun.hotspot.WhiteBox
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xmixed -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/MethodIsIgnoredBySecurityStackWalkTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.reflect
@@ -35,7 +35,6 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.MethodIsIgnoredBySecurityStackWalkTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.MethodIsIgnoredBySecurityStackWalkTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ReprofileTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64") & (vm.opt.TieredStopAtLevel == null | vm.opt.TieredStopAtLevel == 3)
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -35,9 +35,7 @@
* jdk.vm.ci/jdk.vm.ci.code
* jdk.vm.ci/jdk.vm.ci.meta
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build sun.hotspot.WhiteBox
- * @build compiler.jvmci.compilerToVM.ReprofileTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolveConstantInPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
@@ -35,9 +35,7 @@
* jdk.vm.ci/jdk.vm.ci.runtime
* jdk.vm.ci/jdk.vm.ci.meta
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.ResolveConstantInPoolTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolveFieldInPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8138708
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
@@ -36,9 +36,7 @@
* jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.ResolveFieldInPoolTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolveMethodTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -33,7 +33,6 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.ResolveMethodTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* compiler.jvmci.compilerToVM.ResolveMethodTest
*/
--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolvePossiblyCachedConstantInPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8138708
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
@@ -36,9 +36,7 @@
* jdk.vm.ci/jdk.vm.ci.runtime
* jdk.vm.ci/jdk.vm.ci.meta
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.ResolvePossiblyCachedConstantInPoolTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ResolveTypeInPoolTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
* @summary Testing compiler.jvmci.CompilerToVM.resolveTypeInPool method
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
@@ -36,9 +36,7 @@
* jdk.vm.ci/jdk.vm.ci.runtime
* jdk.vm.ci/jdk.vm.ci.meta
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build sun.hotspot.WhiteBox
- * compiler.jvmci.compilerToVM.ResolveTypeInPoolTest
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ShouldDebugNonSafepointsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +25,11 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary /test/lib/
+ * @library / /test/lib/
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.ShouldDebugNonSafepointsTest
* @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI
* -XX:+UnlockDiagnosticVMOptions
* -XX:+DebugNonSafepoints
--- a/hotspot/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/compilerToVM/ShouldInlineMethodTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -34,9 +34,7 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
*
- * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
- * @build compiler.jvmci.compilerToVM.ShouldInlineMethodTest
- * @build sun.hotspot.WhiteBox
+ * @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/errors/TestInvalidCompilationResult.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,7 +31,6 @@
* jdk.vm.ci/jdk.vm.ci.runtime
* jdk.vm.ci/jdk.vm.ci.common
* @compile CodeInstallerTest.java
- * @build compiler.jvmci.errors.TestInvalidCompilationResult
* @run junit/othervm -da:jdk.vm.ci... -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI compiler.jvmci.errors.TestInvalidCompilationResult
*/
--- a/hotspot/test/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/events/JvmciNotifyBootstrapFinishedEventTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @test
* @bug 8156034
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* java.base/jdk.internal.org.objectweb.asm
@@ -37,7 +37,6 @@
*
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @build compiler.jvmci.common.JVMCIHelpers
- * compiler.jvmci.events.JvmciNotifyBootstrapFinishedEventTest
* @run driver jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/
* @run driver jdk.test.lib.FileInstaller ./JvmciNotifyBootstrapFinishedEventTest.config
* ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener
@@ -46,9 +45,6 @@
* compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory
* compiler.jvmci.common.JVMCIHelpers$EmptyCompilationRequestResult
* compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener
- * compiler.jvmci.events.JvmciNotifyBootstrapFinishedEventTest
- * jdk.test.lib.Asserts
- * jdk.test.lib.Utils
* @run main/othervm -XX:+UnlockExperimentalVMOptions
* -Djvmci.Compiler=EmptyCompiler -Xbootclasspath/a:.
* -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
--- a/hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/events/JvmciNotifyInstallEventTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library / /testlibrary
+ * @library / /test/lib
* @library ../common/patches
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
@@ -38,7 +38,6 @@
*
* @build jdk.vm.ci/jdk.vm.ci.hotspot.CompilerToVMHelper
* @build compiler.jvmci.common.JVMCIHelpers
- * compiler.jvmci.events.JvmciNotifyInstallEventTest
* @run driver jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/
* @run driver jdk.test.lib.FileInstaller ./JvmciNotifyInstallEventTest.config
* ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener
@@ -46,12 +45,7 @@
* compiler.jvmci.common.JVMCIHelpers$EmptyHotspotCompiler
* compiler.jvmci.common.JVMCIHelpers$EmptyCompilerFactory
* compiler.jvmci.common.JVMCIHelpers$EmptyCompilationRequestResult
- * compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener
- * compiler.jvmci.events.JvmciNotifyInstallEventTest
- * compiler.jvmci.common.CTVMUtilities
- * compiler.jvmci.common.testcases.SimpleClass
- * jdk.test.lib.Asserts
- * jdk.test.lib.Utils
+ * compiler.jvmci.common.JVMCIHelpers$EmptyVMEventListener
* @run main/othervm -XX:+UnlockExperimentalVMOptions
* -Xbootclasspath/a:. -Xmixed
* -XX:+UseJVMCICompiler -XX:-BootstrapJVMCI
--- a/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/events/JvmciShutdownEventTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @test
* @bug 8136421
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
@@ -34,7 +34,6 @@
*
* @build compiler.jvmci.common.JVMCIHelpers
* compiler.jvmci.events.JvmciShutdownEventListener
- * compiler.jvmci.events.JvmciShutdownEventTest
* @run driver jdk.test.lib.FileInstaller ../common/services/ ./META-INF/services/
* @run driver jdk.test.lib.FileInstaller ./JvmciShutdownEventTest.config
* ./META-INF/services/jdk.vm.ci.hotspot.services.HotSpotVMEventListener
@@ -49,7 +48,7 @@
package compiler.jvmci.events;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
public class JvmciShutdownEventTest {
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.code.test/src/jdk/vm/ci/code/test/NativeCallTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/**
* @test
* @requires (os.simpleArch == "x64" | os.simpleArch == "sparcv9") & os.arch != "aarch64"
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
* @modules jdk.vm.ci/jdk.vm.ci.hotspot
* jdk.vm.ci/jdk.vm.ci.code
* jdk.vm.ci/jdk.vm.ci.code.site
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/HotSpotConstantReflectionProviderTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,7 +29,7 @@
* jdk.vm.ci/jdk.vm.ci.hotspot
* java.base/jdk.internal.vm.annotation
* java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
+ * @library /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
* @build jdk.vm.ci.hotspot.test.DummyClass
* @run driver ClassFileInstaller jdk.vm.ci.hotspot.test.DummyClass
* @run testng/othervm/timeout=300 -Xbootclasspath/a:.
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MemoryAccessProviderTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @test
* @bug 8152341
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
+ * @library /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.common
* jdk.vm.ci/jdk.vm.ci.runtime
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.hotspot.test/src/jdk/vm/ci/hotspot/test/MethodHandleAccessProviderTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @bug 8152343
* @bug 8161068
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
+ * @library /test/lib /compiler/jvmci/jdk.vm.ci.hotspot.test/src
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* jdk.vm.ci/jdk.vm.ci.hotspot
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/ConstantTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @build jdk.vm.ci.runtime.test.ConstantTest
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.ConstantTest
*/
package jdk.vm.ci.runtime.test;
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/RedefineClassTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @build jdk.vm.ci.runtime.test.RedefineClassTest
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.RedefineClassTest
*/
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestConstantReflectionProvider.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @build jdk.vm.ci.runtime.test.TestConstantReflectionProvider
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestConstantReflectionProvider
*/
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaField.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @build jdk.vm.ci.runtime.test.TestJavaField
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestJavaField
*/
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaMethod.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @build jdk.vm.ci.runtime.test.TestJavaMethod
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestJavaMethod
*/
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestJavaType.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @build jdk.vm.ci.runtime.test.TestJavaType
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestJavaType
*/
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @build jdk.vm.ci.runtime.test.TestMetaAccessProvider
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestMetaAccessProvider
*/
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaField.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @build jdk.vm.ci.runtime.test.TestResolvedJavaField
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestResolvedJavaField
*/
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
* @modules jdk.vm.ci/jdk.vm.ci.meta
* jdk.vm.ci/jdk.vm.ci.runtime
* java.base/jdk.internal.misc
- * @build jdk.vm.ci.runtime.test.TestResolvedJavaMethod
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestResolvedJavaMethod
*/
--- a/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,7 +31,6 @@
* jdk.vm.ci/jdk.vm.ci.runtime
* jdk.vm.ci/jdk.vm.ci.common
* java.base/jdk.internal.misc
- * @build jdk.vm.ci.runtime.test.TestResolvedJavaType
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI jdk.vm.ci.runtime.test.TestResolvedJavaType
*/
--- a/hotspot/test/compiler/jvmci/meta/StableFieldTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/jvmci/meta/StableFieldTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @test
* @bug 8151664
* @requires (vm.simpleArch == "x64" | vm.simpleArch == "sparcv9" | vm.simpleArch == "aarch64")
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* jdk.vm.ci/jdk.vm.ci.hotspot
--- a/hotspot/test/compiler/loopopts/UseCountedLoopSafepoints.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/loopopts/UseCountedLoopSafepoints.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 6869327
* @summary Test that C2 flag UseCountedLoopSafepoints ensures a safepoint is kept in a CountedLoop
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @ignore 8146096
* @run driver compiler.loopopts.UseCountedLoopSafepoints
@@ -34,8 +34,8 @@
package compiler.loopopts;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.util.concurrent.atomic.AtomicLong;
--- a/hotspot/test/compiler/loopopts/superword/TestVectorizationWithInvariant.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/loopopts/superword/TestVectorizationWithInvariant.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @bug 8078497
* @summary Tests correct alignment of vectors with loop invariant offset.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @run main compiler.loopopts.superword.TestVectorizationWithInvariant
*/
--- a/hotspot/test/compiler/onSpinWait/TestOnSpinWait.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/onSpinWait/TestOnSpinWait.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright 2016 Azul Systems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -26,7 +26,7 @@
* @test TestOnSpinWait
* @summary (x86 only) checks that java.lang.Thread.onSpinWait is intrinsified
* @bug 8147844
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @requires os.arch=="x86" | os.arch=="amd64" | os.arch=="x86_64"
* @run driver compiler.onSpinWait.TestOnSpinWait
@@ -34,8 +34,8 @@
package compiler.onSpinWait;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestOnSpinWait {
--- a/hotspot/test/compiler/oracle/CheckCompileCommandOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/oracle/CheckCompileCommandOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
* @test CheckCompileCommandOption
* @summary Checks parsing of -XX:CompileCommand=option
* @bug 8055286 8056964 8059847 8069035
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver compiler.oracle.CheckCompileCommandOption
@@ -33,8 +33,8 @@
package compiler.oracle;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.io.File;
--- a/hotspot/test/compiler/oracle/GetMethodOptionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/oracle/GetMethodOptionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,9 +24,9 @@
/*
* @test
* @bug 8074980
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
- * @build sun.hotspot.WhiteBox jdk.test.lib.Asserts compiler.oracle.GetMethodOptionTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/oracle/MethodMatcherTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/oracle/MethodMatcherTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test MethodMatcherTest
* @summary Testing of compiler/MethodMatcher
* @bug 8135068
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/compiler/oracle/TestCompileCommand.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/oracle/TestCompileCommand.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test TestCompileCommand
* @bug 8069389
* @summary Regression tests of -XX:CompileCommand
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver compiler.oracle.TestCompileCommand
@@ -33,8 +33,8 @@
package compiler.oracle;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestCompileCommand {
--- a/hotspot/test/compiler/print/TestProfileReturnTypePrinting.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/print/TestProfileReturnTypePrinting.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +24,6 @@
/**
* @test
* @bug 8073154
- * @build compiler.print.TestProfileReturnTypePrinting
* @run main/othervm -XX:TypeProfileLevel=020
* -XX:CompileCommand=compileonly,compiler.print.TestProfileReturnTypePrinting::testMethod
* -XX:+IgnoreUnrecognizedVMOptions -XX:+PrintLIR
--- a/hotspot/test/compiler/profiling/spectrapredefineclass/Agent.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/profiling/spectrapredefineclass/Agent.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,10 +24,12 @@
package compiler.profiling.spectrapredefineclass;
import com.sun.tools.attach.VirtualMachine;
+import jdk.test.lib.Utils;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.Instrumentation;
import java.lang.management.ManagementFactory;
+import java.nio.file.Paths;
import java.security.ProtectionDomain;
class A {
@@ -67,8 +69,7 @@
}
public class Agent implements ClassFileTransformer {
-
-
+ public static final String AGENT_JAR = Paths.get(Utils.TEST_CLASSES, "agent.jar").toString();
static public boolean m2(A a) {
boolean res = false;
if (a.getClass() == B.class) {
@@ -95,7 +96,7 @@
// Redefine class
try {
VirtualMachine vm = VirtualMachine.attach(pid);
- vm.loadAgent(System.getProperty("test.classes",".") + "/agent.jar", "");
+ vm.loadAgent(AGENT_JAR, "");
vm.detach();
} catch (Exception e) {
throw new RuntimeException(e);
--- a/hotspot/test/compiler/profiling/spectrapredefineclass/Launcher.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/profiling/spectrapredefineclass/Launcher.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +24,11 @@
/*
* @test
* @bug 8038636
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.instrument
* java.management
- * @build compiler.profiling.spectrapredefineclass_classloaders.Agent
+ * @build compiler.profiling.spectrapredefineclass.Agent
* @run driver ClassFileInstaller compiler.profiling.spectrapredefineclass.Agent
* @run driver compiler.profiling.spectrapredefineclass.Launcher
* @run main/othervm -XX:-TieredCompilation -XX:-BackgroundCompilation
@@ -39,23 +39,33 @@
package compiler.profiling.spectrapredefineclass;
-import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.OutputAnalyzer;
import java.io.File;
+import java.io.IOException;
import java.io.PrintWriter;
public class Launcher {
+ private static final String MANIFEST = "MANIFEST.MF";
public static void main(String[] args) throws Exception {
+ try (PrintWriter pw = new PrintWriter(MANIFEST)) {
+ pw.println("Agent-Class: " + Agent.class.getName());
+ pw.println("Can-Retransform-Classes: true");
+ }
- PrintWriter pw = new PrintWriter("MANIFEST.MF");
- pw.println("Agent-Class: " + Launcher.class.getPackage().getName() +".Agent");
- pw.println("Can-Retransform-Classes: true");
- pw.close();
+ JDKToolLauncher jar = JDKToolLauncher.create("jar")
+ .addToolArg("cmf")
+ .addToolArg(MANIFEST)
+ .addToolArg(Agent.AGENT_JAR)
+ .addToolArg(Agent.class.getName().replace('.', File.separatorChar) + ".class");
- ProcessBuilder pb = new ProcessBuilder();
- pb.command(new String[] { JDKToolFinder.getJDKTool("jar"), "cmf", "MANIFEST.MF",
- System.getProperty("test.classes",".") + "/agent.jar",
- "compiler/profiling/spectrapredefineclass/Agent.class".replace('/', File.separatorChar)});
- pb.start().waitFor();
+ ProcessBuilder pb = new ProcessBuilder(jar.getCommand());
+ try {
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldHaveExitValue(0);
+ } catch (IOException ex) {
+ throw new Error("TESTBUG: jar failed.", ex);
+ }
}
}
--- a/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Agent.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Agent.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,6 +24,7 @@
package compiler.profiling.spectrapredefineclass_classloaders;
import com.sun.tools.attach.VirtualMachine;
+import jdk.test.lib.Utils;
import java.lang.instrument.ClassFileTransformer;
import java.lang.instrument.Instrumentation;
@@ -32,14 +33,16 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.ProtectionDomain;
public class Agent implements ClassFileTransformer {
+ public static final String AGENT_JAR = Paths.get(Utils.TEST_CLASSES, "agent.jar").toString();
public static ClassLoader newClassLoader() {
try {
return new URLClassLoader(new URL[] {
- Paths.get(System.getProperty("test.classes",".")).toUri().toURL(),
+ Paths.get(Utils.TEST_CLASSES).toUri().toURL(),
}, null);
} catch (MalformedURLException e){
throw new RuntimeException("Unexpected URL conversion failure", e);
@@ -76,7 +79,7 @@
for (int i = 0; i < 2; i++) {
try {
VirtualMachine vm = VirtualMachine.attach(pid);
- vm.loadAgent(System.getProperty("test.classes",".") + "/agent.jar", "");
+ vm.loadAgent(AGENT_JAR, "");
vm.detach();
} catch (Exception e) {
throw new RuntimeException(e);
--- a/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
/*
* @test
* @bug 8040237
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.instrument
* java.management
@@ -39,26 +39,36 @@
* -XX:ReservedCodeCacheSize=3M
* compiler.profiling.spectrapredefineclass_classloaders.Agent
*/
+
package compiler.profiling.spectrapredefineclass_classloaders;
-import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.OutputAnalyzer;
import java.io.File;
+import java.io.IOException;
import java.io.PrintWriter;
public class Launcher {
- public static void main(String[] args) throws Exception {
-
- PrintWriter pw = new PrintWriter("MANIFEST.MF");
+ private static final String MANIFEST = "MANIFEST.MF";
+ public static void main(String[] args) throws Exception {
+ try (PrintWriter pw = new PrintWriter(MANIFEST)) {
+ pw.println("Agent-Class: " + Agent.class.getName());
+ pw.println("Can-Retransform-Classes: true");
+ }
- pw.println("Agent-Class: " + Launcher.class.getPackage().getName() + ".Agent");
- pw.println("Can-Retransform-Classes: true");
- pw.close();
+ JDKToolLauncher jar = JDKToolLauncher.create("jar")
+ .addToolArg("cmf")
+ .addToolArg(MANIFEST)
+ .addToolArg(Agent.AGENT_JAR)
+ .addToolArg(Agent.class.getName().replace('.', File.separatorChar) + ".class");
- ProcessBuilder pb = new ProcessBuilder();
- pb.command(new String[]{JDKToolFinder.getJDKTool("jar"), "cmf", "MANIFEST.MF",
- System.getProperty("test.classes", ".") + "/agent.jar",
- "compiler/profiling/spectrapredefineclass/Agent.class".replace('/', File.separatorChar)});
- pb.start().waitFor();
+ ProcessBuilder pb = new ProcessBuilder(jar.getCommand());
+ try {
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldHaveExitValue(0);
+ } catch (IOException ex) {
+ throw new Error("TESTBUG: jar failed.", ex);
+ }
}
}
--- a/hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,11 +25,10 @@
* @test
* @bug 8073480
* @summary explicit range checks should be recognized by C2
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
- * @build compiler.rangechecks.TestExplicitRangeChecks
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * jdk.test.lib.Platform
* @run main/othervm -ea -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
* -XX:CompileCommand=compileonly,compiler.rangechecks.TestExplicitRangeChecks::test*
--- a/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,11 @@
* @test
* @bug 8066103
* @summary C2's range check smearing allows out of bound array accesses
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rangechecks.TestRangeCheckSmearing
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * jdk.test.lib.Platform
* @run main/othervm -ea -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-BackgroundCompilation -XX:-UseOnStackReplacement
* compiler.rangechecks.TestRangeCheckSmearing
--- a/hotspot/test/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/RTMGenericCommandLineOptionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
package compiler.rtm.cli;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
--- a/hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsBase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsBase.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
package compiler.rtm.cli;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
--- a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify PrintPreciseRTMLockingStatistics on CPUs with
* rtm support and on VM with rtm locking support,
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @bug 8031320
* @summary Verify PrintPreciseRTMLockingStatistics on CPUs without
* rtm support and/or unsupported VM.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
--- a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify RTMAbortRatio option processing on CPU with rtm
* support and on VM with rtm locking support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestRTMAbortRatioOptionOnSupportedConfig
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify RTMAbortRatio option processing on CPU without rtm
* support or on VM that does not support rtm locking.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestRTMAbortRatioOptionOnUnsupportedConfig
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/rtm/cli/TestRTMAbortThresholdOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestRTMAbortThresholdOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @test
* @bug 8031320
* @summary Verify processing of RTMAbortThreshold option.
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestRTMAbortThresholdOption
* @run main/othervm compiler.rtm.cli.TestRTMAbortThresholdOption
*/
--- a/hotspot/test/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestRTMLockingCalculationDelayOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @test
* @bug 8031320
* @summary Verify processing of RTMLockingCalculationDelay option.
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestRTMLockingCalculationDelayOption
* @run main/othervm compiler.rtm.cli.TestRTMLockingCalculationDelayOption
*/
--- a/hotspot/test/compiler/rtm/cli/TestRTMLockingThresholdOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestRTMLockingThresholdOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @test
* @bug 8031320
* @summary Verify processing of RTMLockingThreshold option.
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestRTMLockingThresholdOption
* @run main/othervm compiler.rtm.cli.TestRTMLockingThresholdOption
*/
--- a/hotspot/test/compiler/rtm/cli/TestRTMRetryCountOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestRTMRetryCountOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @test
* @bug 8031320
* @summary Verify processing of RTMRetryCount option.
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestRTMRetryCountOption
* @run main/othervm compiler.rtm.cli.TestRTMRetryCountOption
*/
--- a/hotspot/test/compiler/rtm/cli/TestRTMSpinLoopCountOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestRTMSpinLoopCountOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @test
* @bug 8031320
* @summary Verify processing of RTMSpinLoopCount option.
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestRTMSpinLoopCountOption
* @run main/othervm compiler.rtm.cli.TestRTMSpinLoopCountOption
*/
--- a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify RTMTotalCountIncrRate option processing on CPU with
* rtm support and on VM with rtm locking support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestRTMTotalCountIncrRateOptionOnSupportedConfig
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify RTMTotalCountIncrRate option processing on CPU without
* rtm support and/or on VM without rtm locking support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify UseRTMDeopt option processing on CPUs with rtm support
* when rtm locking is supported by VM.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestUseRTMDeoptOptionOnSupportedConfig
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -43,7 +43,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify UseRTMDeopt option processing on CPUs without rtm support
* or on VMs without rtm locking support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestUseRTMDeoptOptionOnUnsupportedConfig
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify UseRTMForStackLocks option processing on CPU with
* rtm support when VM supports rtm locking.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestUseRTMForStackLocksOptionOnSupportedConfig
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -43,7 +43,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify UseRTMForStackLocks option processing on CPUs without
* rtm support and/or on VMs without rtm locking support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestUseRTMForStackLocksOptionOnUnsupportedConfig
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -43,7 +43,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify UseRTMLocking option processing on CPU with rtm support and
* on VM with rtm-locking support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestUseRTMLockingOptionOnSupportedConfig
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -43,7 +43,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify UseRTMLocking option processing on CPU without
* rtm support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestUseRTMLockingOptionOnUnsupportedCPU
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -43,7 +43,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify UseRTMLocking option processing on CPU with rtm support
* in case when VM should not support this option.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestUseRTMLockingOptionOnUnsupportedVM
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -43,7 +43,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify processing of UseRTMLocking and UseBiasedLocking
* options combination on CPU and VM with rtm support.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestUseRTMLockingOptionWithBiasedLocking
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -43,7 +43,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMXendForLockBusyOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @test
* @bug 8031320
* @summary Verify processing of UseRTMXendForLockBusy option.
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.rtm.cli.TestUseRTMXendForLockBusyOption
* @run main/othervm compiler.rtm.cli.TestUseRTMXendForLockBusyOption
*/
--- a/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that RTMAbortRatio affects amount of aborts before
* deoptimization.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestRTMAbortRatio
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -48,7 +48,7 @@
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.internal.misc.Unsafe;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that RTMAbortThreshold option affects
* amount of aborts after which abort ratio is calculated.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestRTMAbortThreshold
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -47,7 +47,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +29,10 @@
* caused by reason other then rtm_state_change will reset
* method's RTM state. And if we don't use RTMDeopt, then
* RTM state remain the same after such deoptimization.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestRTMAfterNonRTMDeopt
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -50,7 +50,7 @@
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.internal.misc.Unsafe;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that on high abort ratio method will be recompiled
* without rtm locking.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestRTMDeoptOnHighAbortRatio
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -47,7 +47,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +26,10 @@
* @test
* @bug 8031320
* @summary Verify that on low abort ratio method will be recompiled.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestRTMDeoptOnLowAbortRatio
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -47,7 +47,7 @@
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.internal.misc.Unsafe;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that RTMLockingCalculationDelay affect when
* abort ratio calculation is started.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestRTMLockingCalculationDelay
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -46,7 +46,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that RTMLockingThreshold affects rtm state transition
* ProfileRTM => UseRTM.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestRTMLockingThreshold
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -48,7 +48,7 @@
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.internal.misc.Unsafe;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +26,10 @@
* @test
* @bug 8031320
* @summary Verify that RTMRetryCount affects actual amount of retries.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestRTMRetryCount
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -46,7 +46,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that RTMSpinLoopCount affects time spent
* between locking attempts.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestRTMSpinLoopCount
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -47,7 +47,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that RTMTotalCountIncrRate option affects
* RTM locking statistics.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestRTMTotalCountIncrRate
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -48,7 +48,7 @@
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.internal.misc.Unsafe;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that rtm locking is used for stack locks before
* inflation and after it used for inflated locks.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestUseRTMAfterLockInflation
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -47,7 +47,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that UseRTMDeopt affects uncommon trap installation in
* copmpiled methods with synchronized block.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestUseRTMDeopt
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -46,7 +46,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +26,10 @@
* @test
* @bug 8031320
* @summary Verify that rtm locking is used for inflated locks.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestUseRTMForInflatedLocks
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -45,7 +45,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +26,10 @@
* @test
* @bug 8031320
* @summary Verify that rtm locking is used for stack locks.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestUseRTMForStackLocks
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -46,7 +46,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that UseRTMXendForLockBusy option affects
* method behaviour if lock is busy.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.locking.TestUseRTMXendForLockBusy
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -48,7 +48,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,10 @@
* @bug 8031320
* @summary Verify that NoRTMLockEliding option could be applied to
* specified method and that such method will not use rtm.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.method_options.TestNoRTMLockElidingOption
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -47,7 +47,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +28,10 @@
* @summary Verify that UseRTMLockEliding option could be applied to
* specified method and that such method will not be deoptimized
* on high abort ratio.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.method_options.TestUseRTMLockElidingOption
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -48,7 +48,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +29,10 @@
* on overall aborts and locks count and count of aborts of
* different types. Test also verify that VM output does not
* contain rtm locking statistics when it should not.
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.rtm.print.TestPrintPreciseRTMLockingStatistics
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -50,7 +50,7 @@
import compiler.testlibrary.rtm.predicate.SupportedCPU;
import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
--- a/hotspot/test/compiler/runtime/Test8010927.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/runtime/Test8010927.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,9 +25,9 @@
* @test
* @bug 8010927
* @summary Kitchensink crashed with SIGSEGV, Problematic frame: v ~StubRoutines::checkcast_arraycopy
- * @library /test/lib /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
- * @build compiler.runtime.Test8010927
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions
--- a/hotspot/test/compiler/runtime/cr8015436/Test8015436.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/runtime/cr8015436/Test8015436.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,10 +25,9 @@
* @test
* @bug 8015436
* @summary the IK _initial_method_idnum value must be adjusted if overpass methods are added
- * @library /test/lib/share/classes /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @build compiler.runtime.cr8015436.Test8015436
- * compiler.runtime.cr8015436.Driver8015436
*
* @run driver compiler.runtime.cr8015436.Driver8015436
*/
--- a/hotspot/test/compiler/stable/TestStableBoolean.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableBoolean.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableBoolean
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableBoolean
*
* @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
--- a/hotspot/test/compiler/stable/TestStableByte.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableByte.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableByte
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableByte
*
* @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
--- a/hotspot/test/compiler/stable/TestStableChar.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableChar.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableChar
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableChar
*
* @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
--- a/hotspot/test/compiler/stable/TestStableDouble.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableDouble.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableDouble
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableDouble
*
* @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
--- a/hotspot/test/compiler/stable/TestStableFloat.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableFloat.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableFloat
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableFloat
*
* @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
--- a/hotspot/test/compiler/stable/TestStableInt.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableInt.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableInt
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableInt
*
* @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
--- a/hotspot/test/compiler/stable/TestStableLong.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableLong.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableLong
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableLong
*
* @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
--- a/hotspot/test/compiler/stable/TestStableObject.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableObject.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableObject
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableObject
*
* @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
--- a/hotspot/test/compiler/stable/TestStableShort.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableShort.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableShort
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableShort
*
* @run main/bootclasspath/othervm -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
* -XX:CompileOnly=::get,::get1,::get2,::get3,::get4
--- a/hotspot/test/compiler/stable/TestStableUByte.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableUByte.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableUByte
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableUByte
*
* @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+AlwaysIncrementalInline
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
--- a/hotspot/test/compiler/stable/TestStableUShort.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/stable/TestStableUShort.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,10 @@
/*
* @test TestStableUShort
* @summary tests on stable fields and arrays
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
* @build sun.hotspot.WhiteBox
- * @build compiler.stable.TestStableUShort
*
* @run main/bootclasspath/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+AlwaysIncrementalInline
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xcomp
--- a/hotspot/test/compiler/startup/NumCompilerThreadsCheck.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/startup/NumCompilerThreadsCheck.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
* @test
* @bug 8034775
* @summary Ensures correct minimal number of compiler threads (provided by -XX:CICompilerCount=)
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
@@ -34,9 +34,9 @@
package compiler.startup;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
public class NumCompilerThreadsCheck {
--- a/hotspot/test/compiler/startup/SmallCodeCacheStartup.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/startup/SmallCodeCacheStartup.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @summary Test ensures that there is no crash if there is not enough ReservedCodeCacheSize
* to initialize all compiler threads. The option -Xcomp gives the VM more time to
* trigger the old bug.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
@@ -37,8 +37,8 @@
package compiler.startup;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import static jdk.test.lib.Asserts.assertTrue;
--- a/hotspot/test/compiler/startup/StartupOutput.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/startup/StartupOutput.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,9 +23,9 @@
/*
* @test
- * @bug 8026949
+ * @bug 8026949 8164091
* @summary Test ensures correct VM output during startup
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*
@@ -34,8 +34,8 @@
package compiler.startup;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class StartupOutput {
public static void main(String[] args) throws Exception {
@@ -45,7 +45,14 @@
pb = ProcessTools.createJavaProcessBuilder("-Xint", "-XX:+DisplayVMOutputToStdout", "-version");
out = new OutputAnalyzer(pb.start());
out.shouldNotContain("no space to run compilers");
+ out.shouldHaveExitValue(0);
- out.shouldHaveExitValue(0);
+ pb = ProcessTools.createJavaProcessBuilder("-Xint", "-XX:ReservedCodeCacheSize=1770K", "-XX:InitialCodeCacheSize=4K", "-version");
+ out = new OutputAnalyzer(pb.start());
+ // The VM should not crash but may return an error message because we don't have enough space for adapters
+ int exitCode = out.getExitValue();
+ if (exitCode != 1 && exitCode != 0) {
+ throw new Exception("VM crashed with exit code " + exitCode);
+ }
}
}
--- a/hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
package compiler.testlibrary.rtm;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
import jdk.test.lib.cli.CommandLineOptionTest;
--- a/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +24,11 @@
/**
* @test ConstantGettersTransitionsTest
* @summary Test the correctness of compilation level transitions for constant getters methods
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.tiered.TransitionsTestExecutor
+ * @build sun.hotspot.WhiteBox
* compiler.tiered.ConstantGettersTransitionsTest
* @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/tiered/LevelTransitionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/tiered/LevelTransitionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +24,12 @@
/**
* @test LevelTransitionTest
* @summary Test the correctness of compilation level transitions for different methods
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
* @ignore 8067651
- * @build compiler.tiered.TransitionsTestExecutor compiler.tiered.LevelTransitionTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/tiered/NonTieredLevelsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/tiered/NonTieredLevelsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +24,11 @@
/**
* @test NonTieredLevelsTest
* @summary Verify that only one level can be used
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @requires vm.opt.TieredStopAtLevel==null
- * @build compiler.tiered.NonTieredLevelsTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:-TieredCompilation
--- a/hotspot/test/compiler/tiered/TieredLevelsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/tiered/TieredLevelsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,11 +24,11 @@
/**
* @test TieredLevelsTest
* @summary Verify that all levels < 'TieredStopAtLevel' can be used
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build compiler.tiered.TieredLevelsTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+TieredCompilation
--- a/hotspot/test/compiler/tiered/TransitionsTestExecutor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/tiered/TransitionsTestExecutor.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
package compiler.tiered;
import compiler.whitebox.CompilerWhiteBoxTest;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.lang.management.ManagementFactory;
import java.lang.management.RuntimeMXBean;
--- a/hotspot/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/types/TestMeetIncompatibleInterfaceArrays.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
* @summary C2 can not handle returns with inccompatible interface arrays
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
*
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/compiler/types/correctness/CorrectnessTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/types/correctness/CorrectnessTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +26,12 @@
* @bug 8038418
* @summary Tests correctness of type usage with type profiling and speculations
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
* @ignore 8066173
- * @build compiler.types.correctness.CorrectnessTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+IgnoreUnrecognizedVMOptions -XX:+UnlockExperimentalVMOptions
--- a/hotspot/test/compiler/types/correctness/OffTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/types/correctness/OffTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +24,12 @@
/*
* @test CorrectnessTest
* @bug 8038418
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
* @ignore 8066173
- * @build compiler.types.correctness.OffTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/timeout=1200 compiler.types.correctness.OffTest
@@ -38,8 +38,8 @@
package compiler.types.correctness;
import compiler.types.correctness.scenarios.ProfilingType;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
import java.util.Random;
--- a/hotspot/test/compiler/uncommontrap/DeoptReallocFailure.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/uncommontrap/DeoptReallocFailure.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @bug 8146416
- * @library /test/lib /testlibrary /
+ * @library /test/lib /
*
* @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/compiler/uncommontrap/Test8009761.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/uncommontrap/Test8009761.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,10 @@
* @test
* @bug 8009761
* @summary Deoptimization on sparc doesn't set Llast_SP correctly in the interpreter frames it creates
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
*
- * @build compiler.uncommontrap.Test8009761
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,16 +24,14 @@
/*
* @test
* @bug 8030976 8059226
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
*
- * @build compiler.uncommontrap.TestUnstableIfTrap
- * jdk.test.lib.*
- * compiler.testlibrary.uncommontrap.Verifier
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbatch -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/unsafe/UnsafeGetConstantField.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/unsafe/UnsafeGetConstantField.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
/*
* @test
* @summary tests on constant folding of unsafe get operations
- * @library /testlibrary
+ * @library /test/lib
*
* @requires vm.flavor == "server"
*
--- a/hotspot/test/compiler/unsafe/UnsafeGetStableArrayElement.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/unsafe/UnsafeGetStableArrayElement.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
/*
* @test
* @summary tests on constant folding of unsafe get operations from stable arrays
- * @library /testlibrary
+ * @library /test/lib
*
* @requires vm.flavor == "server"
*
--- a/hotspot/test/compiler/unsafe/UnsafeRaw.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/unsafe/UnsafeRaw.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
* @test
* @bug 8058744
* @summary Invalid pattern-matching of address computations in raw unsafe
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -Xbatch compiler.unsafe.UnsafeRaw
--- a/hotspot/test/compiler/whitebox/AllocationCodeBlobTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/AllocationCodeBlobTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +26,10 @@
* @test AllocationCodeBlobTest
* @summary testing of WB::allocate/freeCodeBlob()
* @bug 8059624 8064669
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.AllocationCodeBlobTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
@@ -45,7 +45,7 @@
package compiler.whitebox;
import jdk.test.lib.Asserts;
-import jdk.test.lib.InfiniteLoop;
+import jdk.test.lib.wrappers.InfiniteLoop;
import sun.hotspot.WhiteBox;
import sun.hotspot.code.BlobType;
--- a/hotspot/test/compiler/whitebox/BlockingCompilation.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/BlockingCompilation.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,9 +26,8 @@
* @bug 8150646 8153013
* @summary Add support for blocking compiles through whitebox API
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @build sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm
--- a/hotspot/test/compiler/whitebox/ClearMethodStateTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/ClearMethodStateTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,10 @@
* @test ClearMethodStateTest
* @bug 8006683 8007288 8022832
* @summary testing of WB::clearMethodState()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.ClearMethodStateTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/DeoptimizeAllTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,10 @@
* @test DeoptimizeAllTest
* @bug 8006683 8007288 8022832
* @summary testing of WB::deoptimizeAll()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.DeoptimizeAllTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/DeoptimizeFramesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/DeoptimizeFramesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +25,10 @@
* @test DeoptimizeFramesTest
* @bug 8028595
* @summary testing of WB::deoptimizeFrames()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.DeoptimizeFramesTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/DeoptimizeMethodTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,10 @@
* @test DeoptimizeMethodTest
* @bug 8006683 8007288 8022832
* @summary testing of WB::deoptimizeMethod()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.DeoptimizeMethodTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/DeoptimizeMultipleOSRTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/DeoptimizeMultipleOSRTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +26,10 @@
* @test DeoptimizeMultipleOSRTest
* @bug 8061817
* @summary testing of WB::deoptimizeMethod()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.DeoptimizeMultipleOSRTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
--- a/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/EnqueueMethodForCompilationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,10 @@
* @test EnqueueMethodForCompilationTest
* @bug 8006683 8007288 8022832
* @summary testing of WB::enqueueMethodForCompilation()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.EnqueueMethodForCompilationTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/ForceNMethodSweepTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/ForceNMethodSweepTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +26,10 @@
* @test
* @bug 8059624 8064669 8153265
* @summary testing of WB::forceNMethodSweep
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.ForceNMethodSweepTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/GetCodeHeapEntriesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/GetCodeHeapEntriesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +26,10 @@
* @test GetCodeHeapEntriesTest
* @bug 8059624
* @summary testing of WB::getCodeHeapEntries()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.GetCodeHeapEntriesTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/GetNMethodTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/GetNMethodTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +26,10 @@
* @test GetNMethodTest
* @bug 8038240
* @summary testing of WB::getNMethod()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.GetNMethodTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/IsMethodCompilableTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,16 +26,13 @@
* @bug 8007270 8006683 8007288 8022832
* @summary testing of WB::isMethodCompilable()
* @requires vm.flavor == "server"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
*
- * @build jdk.test.lib.*
- * sun.hotspot.WhiteBox
- * @build compiler.whitebox.IsMethodCompilableTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
- * jdk.test.lib.Platform
* @run main/othervm/timeout=2400 -XX:-TieredCompilation -Xmixed
* -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:PerMethodRecompilationCutoff=3 -XX:-UseCounterDecay
--- a/hotspot/test/compiler/whitebox/LockCompilationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/LockCompilationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +25,10 @@
* @test LockCompilationTest
* @bug 8059624 8152169
* @summary testing of WB::lock/unlockCompilation()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.LockCompilationTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmixed -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/MakeMethodNotCompilableTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,10 @@
* @test MakeMethodNotCompilableTest
* @bug 8012322 8006683 8007288 8022832
* @summary testing of WB::makeMethodNotCompilable()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.MakeMethodNotCompilableTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/SetDontInlineMethodTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,10 @@
* @test SetDontInlineMethodTest
* @bug 8006683 8007288 8022832
* @summary testing of WB::testSetDontInlineMethod()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.SetDontInlineMethodTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/compiler/whitebox/SetForceInlineMethodTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,10 @@
* @test SetForceInlineMethodTest
* @bug 8006683 8007288 8022832
* @summary testing of WB::testSetForceInlineMethod()
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
- * @build compiler.whitebox.SetForceInlineMethodTest
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/gc/CondCardMark/Basic.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/CondCardMark/Basic.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,6 @@
* @bug 8078438
* @summary Verify UseCondCardMark works
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build Basic
* @run main/othervm -Xint Basic
* @run main/othervm -Xint -XX:+UseCondCardMark Basic
* @run main/othervm -XX:TieredStopAtLevel=1 Basic
--- a/hotspot/test/gc/TestCardTablePageCommits.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/TestCardTablePageCommits.java Mon Sep 12 22:04:48 2016 +0000
@@ -22,8 +22,8 @@
*/
import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
/*
@@ -32,7 +32,7 @@
* @bug 8059066
* @summary Tests that the card table does not commit the same page twice
* @requires vm.gc.Parallel
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver TestCardTablePageCommits
--- a/hotspot/test/gc/TestDisableExplicitGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/TestDisableExplicitGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @test TestDisableExplicitGC
* @requires vm.opt.DisableExplicitGC == null
* @summary Verify GC behavior with DisableExplicitGC flag.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules jdk.management/com.sun.management.internal
* @run main/othervm -Xlog:gc=debug TestDisableExplicitGC
--- a/hotspot/test/gc/TestObjectAlignment.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/TestObjectAlignment.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @key gc
* @bug 8021823
* @summary G1: Concurrent marking crashes with -XX:ObjectAlignmentInBytes>=32 in 64bit VMs
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm TestObjectAlignment -Xmx20M -XX:+ExplicitGCInvokesConcurrent -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=8
@@ -43,8 +43,8 @@
* @run main/othervm TestObjectAlignment -Xmx20M -XX:-ExplicitGCInvokesConcurrent -XX:+IgnoreUnrecognizedVMOptions -XX:ObjectAlignmentInBytes=256
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestObjectAlignment {
--- a/hotspot/test/gc/TestSmallHeap.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/TestSmallHeap.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,10 +26,10 @@
* @bug 8067438 8152239
* @requires vm.gc=="null"
* @summary Verify that starting the VM with a small heap works
- * @library /testlibrary /test/lib /test/lib/share/classes
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management/sun.management
- * @build TestSmallHeap
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestSmallHeap
*/
--- a/hotspot/test/gc/TestSoftReferencesBehaviorOnOOME.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/TestSoftReferencesBehaviorOnOOME.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +25,9 @@
* @test TestSoftReferencesBehaviorOnOOME
* @key gc
* @summary Tests that all SoftReferences has been cleared at time of OOM.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestSoftReferencesBehaviorOnOOME
* @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 512 2k
* @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 128k 256k
* @run main/othervm -Xmx128m TestSoftReferencesBehaviorOnOOME 2k 32k
--- a/hotspot/test/gc/TestVerifyDuringStartup.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/TestVerifyDuringStartup.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,14 +25,14 @@
* @key gc
* @bug 8010463 8011343 8011898
* @summary Simple test run with -XX:+VerifyDuringStartup -XX:-UseTLAB to verify 8010463
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.ArrayList;
import java.util.Collections;
--- a/hotspot/test/gc/TestVerifySilently.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/TestVerifySilently.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,13 +25,13 @@
* @key gc
* @bug 8032771
* @summary Test silent verification.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.ArrayList;
import java.util.Collections;
import jdk.test.lib.Utils;
--- a/hotspot/test/gc/TestVerifySubSet.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/TestVerifySubSet.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,13 +25,13 @@
* @key gc
* @bug 8072725
* @summary Test VerifySubSet option
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.ArrayList;
import java.util.Collections;
import jdk.test.lib.Utils;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/arguments/AllocationHelper.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,114 @@
+/*
+* Copyright (c) 2015, 2016, 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.LinkedList;
+import java.util.concurrent.Callable;
+
+/**
+ * Helper class which allocates memory.
+ *
+ * Typical usage:
+ * <pre>
+ * {@code
+ * AllocationHelper allocator = new AllocationHelper(MAX_ITERATIONS, ARRAY_LENGTH, CHUNK_SIZE,
+ * () -> (verifier()));
+ * // Allocate byte[CHUNK_SIZE] ARRAY_LENGTH times. Total allocated bytes will be CHUNK_SIZE * ARRAY_LENGTH + refs length.
+ * // Then invoke verifier and iterate MAX_ITERATIONS times.
+ * allocator.allocateMemoryAndVerify();
+ * }
+ * </pre>
+ */
+public final class AllocationHelper {
+
+ private final int arrayLength;
+ private final int maxIterations;
+ private final int chunkSize;
+
+ // garbageStorage is used to store link to garbage to prevent optimization.
+ private static Object garbageStorage;
+ private byte garbage[][];
+ private final Callable<?> verifierInstance;
+
+ /**
+ * Create an AllocationHelper with specified iteration count, array length, chunk size and verifier.
+ *
+ * @param maxIterations
+ * @param arrayLength
+ * @param chunkSize
+ * @param verifier - Callable instance which will be invoked after all allocation cycle. Can be null;
+ */
+ public AllocationHelper(int maxIterations, int arrayLength, int chunkSize, Callable<?> verifier) {
+ if ((arrayLength <= 0) || (maxIterations <= 0) || (chunkSize <= 0)) {
+ throw new IllegalArgumentException("maxIterations, arrayLength and chunkSize should be greater then 0.");
+ }
+ this.arrayLength = arrayLength;
+ this.maxIterations = maxIterations;
+ this.chunkSize = chunkSize;
+ verifierInstance = verifier;
+ garbage = new byte[this.arrayLength][];
+ garbageStorage = garbage;
+ }
+
+ private void allocateMemoryOneIteration() {
+ for (int j = 0; j < arrayLength; j++) {
+ garbage[j] = new byte[chunkSize];
+ }
+ }
+
+ /**
+ * Allocate memory and invoke Verifier during all iteration.
+ *
+ * @throws java.lang.Exception
+ */
+ public void allocateMemoryAndVerify() throws Exception {
+ for (int i = 0; i < maxIterations; i++) {
+ allocateMemoryOneIteration();
+ if (verifierInstance != null) {
+ verifierInstance.call();
+ }
+ }
+ }
+
+ /**
+ * The same as allocateMemoryAndVerify() but hides OOME
+ *
+ * @throws Exception
+ */
+ public void allocateMemoryAndVerifyNoOOME() throws Exception {
+ try {
+ allocateMemoryAndVerify();
+ } catch (OutOfMemoryError e) {
+ // exit on OOME
+ }
+ }
+
+ /**
+ * Release link to allocated garbage to make it available for further GC
+ */
+ public void release() {
+ if (garbage != null) {
+ garbage = null;
+ garbageStorage = null;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/arguments/HeapRegionUsageTool.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,105 @@
+/*
+* Copyright (c) 2015, 2016, 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.management.ManagementFactory;
+import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.MemoryUsage;
+
+/**
+ * Utility class used by tests to get heap region usage.
+ */
+public final class HeapRegionUsageTool {
+
+ /**
+ * Get MemoryUsage from MemoryPoolMXBean which name matches passed string.
+ *
+ * @param name
+ * @return MemoryUsage
+ */
+ private static MemoryUsage getUsage(String name){
+ for (MemoryPoolMXBean pool : ManagementFactory.getMemoryPoolMXBeans()) {
+ if (pool.getName().matches(name)) {
+ return pool.getUsage();
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Get MemoryUsage of Eden space.
+ *
+ * @return MemoryUsage
+ */
+ public static MemoryUsage getEdenUsage() {
+ return getUsage(".*Eden.*");
+ }
+
+ /**
+ * Get MemoryUsage of Survivor space.
+ *
+ * @return MemoryUsage
+ */
+ public static MemoryUsage getSurvivorUsage() {
+ return getUsage(".*Survivor.*");
+ }
+
+ /**
+ * Get memory usage of Tenured space
+ *
+ * @return MemoryUsage
+ */
+ public static MemoryUsage getOldUsage() {
+ return getUsage(".*(Old|Tenured).*");
+ }
+
+ /**
+ * Get heap usage.
+ *
+ * @return MemoryUsage
+ */
+ public static MemoryUsage getHeapUsage() {
+ return ManagementFactory.getMemoryMXBean().getHeapMemoryUsage();
+ }
+
+ /**
+ * Helper function to align up.
+ *
+ * @param value
+ * @param alignment
+ * @return aligned value
+ */
+ public static long alignUp(long value, long alignment) {
+ return (value + alignment - 1) & ~(alignment - 1);
+ }
+
+ /**
+ * Helper function to align down.
+ *
+ * @param value
+ * @param alignment
+ * @return aligned value
+ */
+ public static long alignDown(long value, long alignment) {
+ return value & ~(alignment - 1);
+ }
+}
--- a/hotspot/test/gc/arguments/TestArrayAllocatorMallocLimit.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestArrayAllocatorMallocLimit.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,15 @@
* The test helps verifying that size_t flags can be set/read.
* @bug 8054823
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver TestArrayAllocatorMallocLimit
*/
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.math.BigInteger;
public class TestArrayAllocatorMallocLimit {
--- a/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestCMSHeapSizeFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,10 +27,10 @@
* @bug 8006088
* @requires vm.gc.ConcMarkSweep
* @summary Tests argument processing for initial and maximum heap size for the CMS collector
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestCMSHeapSizeFlags TestMaxHeapSizeTools
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestCMSHeapSizeFlags
--- a/hotspot/test/gc/arguments/TestCompressedClassFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestCompressedClassFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -21,14 +21,16 @@
* questions.
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.Platform;
/*
* @test
* @bug 8015107
* @summary Tests that VM prints a warning when -XX:CompressedClassSpaceSize
* is used together with -XX:-UseCompressedClassPointers
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
--- a/hotspot/test/gc/arguments/TestDisableDefaultGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestDisableDefaultGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,15 +26,15 @@
* @summary Test that the VM complains when the default GC is disabled and no other GC is specified
* @bug 8068579
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @requires vm.gc=="null"
* @modules java.base/jdk.internal.misc
* java.management
* @run driver TestDisableDefaultGC
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestDisableDefaultGC {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/gc/arguments/TestDynMaxHeapFreeRatio.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestDynMaxHeapFreeRatio.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +30,7 @@
* @test TestDynMaxHeapFreeRatio
* @bug 8028391
* @summary Verify that MaxHeapFreeRatio flag is manageable
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management
* @run main TestDynMaxHeapFreeRatio
--- a/hotspot/test/gc/arguments/TestDynMinHeapFreeRatio.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestDynMinHeapFreeRatio.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
* @test TestDynMinHeapFreeRatio
* @bug 8028391
* @summary Verify that MinHeapFreeRatio flag is manageable
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management
* @run main TestDynMinHeapFreeRatio
--- a/hotspot/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestG1ConcMarkStepDurationMillis.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,12 +26,13 @@
* @key gc
* @requires vm.gc.G1
* @summary Tests argument processing for double type flag, G1ConcMarkStepDurationMillis
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.*;
import java.util.regex.*;
--- a/hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestG1ConcRefinementThreads.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,12 +27,13 @@
* @bug 8047976
* @requires vm.gc.G1
* @summary Tests argument processing for G1ConcRefinementThreads
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.util.*;
import java.util.regex.*;
--- a/hotspot/test/gc/arguments/TestG1HeapRegionSize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestG1HeapRegionSize.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,7 +29,7 @@
* @summary Verify that the flag G1HeapRegionSize is updated properly
* @modules java.base/jdk.internal.misc
* @modules java.management/sun.management
- * @library /testlibrary
+ * @library /test/lib
* @run main TestG1HeapRegionSize
*/
@@ -39,7 +39,8 @@
import java.util.ArrayList;
import java.util.Arrays;
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestG1HeapRegionSize {
--- a/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestG1HeapSizeFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,10 +27,10 @@
* @bug 8006088
* @requires vm.gc.G1
* @summary Tests argument processing for initial and maximum heap size for the G1 collector
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestG1HeapSizeFlags TestMaxHeapSizeTools
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestG1HeapSizeFlags
--- a/hotspot/test/gc/arguments/TestG1PercentageOptions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestG1PercentageOptions.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,13 +27,14 @@
* @bug 8068942
* @requires vm.gc.G1
* @summary Test argument processing of various percentage options
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver TestG1PercentageOptions
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestG1PercentageOptions {
--- a/hotspot/test/gc/arguments/TestHeapFreeRatio.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestHeapFreeRatio.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +26,14 @@
* @key gc
* @bug 8025661
* @summary Test parsing of -Xminf and -Xmaxf
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm TestHeapFreeRatio
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestHeapFreeRatio {
--- a/hotspot/test/gc/arguments/TestInitialTenuringThreshold.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestInitialTenuringThreshold.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,14 +27,15 @@
* @bug 8014765
* @requires vm.gc.Parallel
* @summary Tests argument processing for initial tenuring threshold
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm TestInitialTenuringThreshold
* @author thomas.schatzl@oracle.com
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestInitialTenuringThreshold {
--- a/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestMaxHeapSizeTools.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,8 @@
import java.util.ArrayList;
import java.util.Arrays;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import sun.hotspot.WhiteBox;
class ErgoArgsPrinter {
--- a/hotspot/test/gc/arguments/TestMaxMinHeapFreeRatioFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestMaxMinHeapFreeRatioFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,20 +25,18 @@
* @test TestMaxMinHeapFreeRatioFlags
* @key gc
* @summary Verify that heap size changes according to max and min heap free ratios.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestMaxMinHeapFreeRatioFlags
* @run driver/timeout=240 TestMaxMinHeapFreeRatioFlags
*/
import java.util.LinkedList;
import java.util.Arrays;
import java.util.Collections;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
-import jdk.test.lib.HeapRegionUsageTool;
import jdk.internal.misc.Unsafe;
public class TestMaxMinHeapFreeRatioFlags {
--- a/hotspot/test/gc/arguments/TestMaxNewSize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestMaxNewSize.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,10 +27,9 @@
* @bug 7057939
* @summary Make sure that MaxNewSize always has a useful value after argument
* processing.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestMaxNewSize
* @run main TestMaxNewSize -XX:+UseSerialGC
* @run main TestMaxNewSize -XX:+UseParallelGC
* @run main TestMaxNewSize -XX:+UseConcMarkSweepGC
@@ -46,7 +45,8 @@
import java.util.ArrayList;
import java.util.Arrays;
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestMaxNewSize {
--- a/hotspot/test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestMinAndInitialSurvivorRatioFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2016, 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,22 +25,20 @@
* @test TestMinAndInitialSurvivorRatioFlags
* @key gc
* @summary Verify that MinSurvivorRatio and InitialSurvivorRatio flags work
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestMinAndInitialSurvivorRatioFlags
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run driver TestMinAndInitialSurvivorRatioFlags
*/
-import jdk.test.lib.AllocationHelper;
import java.lang.management.MemoryUsage;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
-import jdk.test.lib.HeapRegionUsageTool;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/gc/arguments/TestMinInitialErgonomics.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestMinInitialErgonomics.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,10 +26,10 @@
* @key gc
* @bug 8006088
* @summary Test ergonomics decisions related to minimum and initial heap size.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestMinInitialErgonomics TestMaxHeapSizeTools
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestMinInitialErgonomics
--- a/hotspot/test/gc/arguments/TestNewRatioFlag.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestNewRatioFlag.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2016, 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,10 +26,10 @@
* @key gc
* @bug 8025166
* @summary Verify that heap devided among generations according to NewRatio
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestNewRatioFlag
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run driver TestNewRatioFlag
*/
@@ -37,9 +37,8 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
-import jdk.test.lib.HeapRegionUsageTool;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/gc/arguments/TestNewSizeFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestNewSizeFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,23 +26,21 @@
* @key gc
* @bug 8025166
* @summary Verify that young gen size conforms values specified by NewSize, MaxNewSize and Xmn options
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestNewSizeFlags
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run driver/timeout=240 TestNewSizeFlags
*/
-import jdk.test.lib.AllocationHelper;
import java.io.IOException;
import java.lang.management.MemoryUsage;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
-import jdk.test.lib.HeapRegionUsageTool;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestNewSizeThreadIncrease.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,14 +26,17 @@
* @key gc
* @bug 8144527
* @summary Tests argument processing for NewSizeThreadIncrease
- * @library /testlibrary
+ * @library /test/lib
* @requires vm.gc.Serial
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
// Range of NewSizeThreadIncrease is 0 ~ max_uintx.
// Total of 5 threads will be created (1 GCTest thread and 4 TestThread).
--- a/hotspot/test/gc/arguments/TestObjectTenuringFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestObjectTenuringFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,14 +28,14 @@
* @requires vm.gc.Parallel
* @summary Tests argument processing for NeverTenure, AlwaysTenure,
* and MaxTenuringThreshold
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestObjectTenuringFlags FlagsValue
* @run main/othervm TestObjectTenuringFlags
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.util.*;
--- a/hotspot/test/gc/arguments/TestParallelGCThreads.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestParallelGCThreads.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, 2016, 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,13 +26,15 @@
* @key gc
* @bug 8059527 8081382
* @summary Tests argument processing for ParallelGCThreads
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver TestParallelGCThreads
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestParallelGCThreads {
--- a/hotspot/test/gc/arguments/TestParallelHeapSizeFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestParallelHeapSizeFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,10 +28,10 @@
* @summary Tests argument processing for initial and maximum heap size for the
* parallel collectors.
* @requires vm.gc=="null"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestParallelHeapSizeFlags TestMaxHeapSizeTools
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestParallelHeapSizeFlags
--- a/hotspot/test/gc/arguments/TestSelectDefaultGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestSelectDefaultGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,14 +26,17 @@
* @summary Test selection of GC when no GC option is specified
* @bug 8068582
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @requires vm.gc=="null"
* @modules java.base/jdk.internal.misc
* java.management
* @run driver TestSelectDefaultGC
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
import java.util.regex.*;
public class TestSelectDefaultGC {
--- a/hotspot/test/gc/arguments/TestSerialHeapSizeFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestSerialHeapSizeFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,10 +26,10 @@
* @key gc
* @bug 8006088
* @summary Tests argument processing for initial and maximum heap size for the Serial collector
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestSerialHeapSizeFlags TestMaxHeapSizeTools
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestSerialHeapSizeFlags
--- a/hotspot/test/gc/arguments/TestShrinkHeapInSteps.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestShrinkHeapInSteps.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,10 +25,9 @@
* @test TestShrinkHeapInSteps
* @key gc
* @summary Verify that -XX:-ShrinkHeapInSteps works properly.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestMaxMinHeapFreeRatioFlags TestShrinkHeapInSteps
* @run driver/timeout=240 TestShrinkHeapInSteps
*/
--- a/hotspot/test/gc/arguments/TestSurvivorAlignmentInBytesOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestSurvivorAlignmentInBytesOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -21,14 +21,14 @@
* questions.
*/
-import jdk.test.lib.ExitCode;
+import jdk.test.lib.process.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
/**
* @test
* @bug 8031323
* @summary Verify SurvivorAlignmentInBytes option processing.
- * @library /testlibrary
+ * @library /test/lib
* @requires vm.opt.SurvivorAlignmentInBytes == null
* & vm.opt.ObjectAlignmentInBytes == null
* & vm.opt.UnlockExperimentalVMOptions == null
--- a/hotspot/test/gc/arguments/TestSurvivorRatioFlag.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestSurvivorRatioFlag.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2016, 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,22 +25,20 @@
* @test TestSurvivorRatioFlag
* @key gc
* @summary Verify that actual survivor ratio is equal to specified SurvivorRatio value
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestSurvivorRatioFlag
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run driver TestSurvivorRatioFlag
*/
-import jdk.test.lib.AllocationHelper;
import java.lang.management.MemoryUsage;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedList;
-import jdk.test.lib.HeapRegionUsageTool;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/gc/arguments/TestTargetSurvivorRatioFlag.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestTargetSurvivorRatioFlag.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,15 +27,14 @@
* @summary Verify that option TargetSurvivorRatio affects survivor space occupancy after minor GC.
* @requires (vm.opt.ExplicitGCInvokesConcurrent == null) | (vm.opt.ExplicitGCInvokesConcurrent == false)
* @requires (vm.opt.UseJVMCICompiler == null) | (vm.opt.UseJVMCICompiler == false)
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestTargetSurvivorRatioFlag
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run driver TestTargetSurvivorRatioFlag
*/
-import jdk.test.lib.AllocationHelper;
import java.lang.management.GarbageCollectorMXBean;
import java.util.Arrays;
import java.util.Collections;
@@ -43,10 +42,9 @@
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import jdk.test.lib.HeapRegionUsageTool;
import jdk.internal.misc.Unsafe;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/gc/arguments/TestUnrecognizedVMOptionsHandling.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestUnrecognizedVMOptionsHandling.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,13 +26,14 @@
* @key gc
* @bug 8017611
* @summary Tests handling unrecognized VM options
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm TestUnrecognizedVMOptionsHandling
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestUnrecognizedVMOptionsHandling {
--- a/hotspot/test/gc/arguments/TestUseCompressedOopsErgo.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestUseCompressedOopsErgo.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,10 +26,10 @@
* @key gc
* @bug 8010722
* @summary Tests ergonomics for UseCompressedOops.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management/sun.management
- * @build TestUseCompressedOopsErgo TestUseCompressedOopsErgoTools
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm TestUseCompressedOopsErgo -XX:+UseG1GC
--- a/hotspot/test/gc/arguments/TestUseCompressedOopsErgoTools.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestUseCompressedOopsErgoTools.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,7 +29,9 @@
import java.util.ArrayList;
import java.util.Arrays;
-import jdk.test.lib.*;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.lang.management.ManagementFactory;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/gc/arguments/TestUseNUMAInterleaving.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestUseNUMAInterleaving.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,13 @@
* ergonomics, on all platforms when UseNUMA feature is enabled.
* @bug 8059614
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver TestUseNUMAInterleaving
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestUseNUMAInterleaving {
--- a/hotspot/test/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/arguments/TestVerifyBeforeAndAfterGCFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2015, 2016, 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,7 +30,7 @@
output contain or doesn't contain expected patterns
* @modules java.base/jdk.internal.misc
* @modules java.management
- * @library /testlibrary
+ * @library /test/lib
* @run driver TestVerifyBeforeAndAfterGCFlags
*/
@@ -38,17 +38,17 @@
import java.util.Collections;
import jdk.test.lib.Utils;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestVerifyBeforeAndAfterGCFlags {
- // VerifyBeforeGC:[Verifying threads heap tenured eden syms strs zone dict metaspace chunks hand C-heap code cache ]
+ // VerifyBeforeGC:[Verifying threads heap tenured eden syms strs zone dict metaspace chunks hand code cache ]
public static final String VERIFY_BEFORE_GC_PATTERN = "Verifying Before GC";
// VerifyBeforeGC: VerifyBeforeGC: VerifyBeforeGC:
public static final String VERIFY_BEFORE_GC_CORRUPTED_PATTERN = "VerifyBeforeGC:(?!\\[Verifying[^]]+\\])";
- // VerifyAfterGC:[Verifying threads heap tenured eden syms strs zone dict metaspace chunks hand C-heap code cache ]
+ // VerifyAfterGC:[Verifying threads heap tenured eden syms strs zone dict metaspace chunks hand code cache ]
public static final String VERIFY_AFTER_GC_PATTERN = "Verifying After GC";
// VerifyAfterGC: VerifyAfterGC: VerifyAfterGC:
public static final String VERIFY_AFTER_GC_CORRUPTED_PATTERN = "VerifyAfterGC:(?!\\[Verifying[^]]+\\])";
--- a/hotspot/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,18 +25,18 @@
* @test
* @key gc
* @bug 8049831
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestCMSClassUnloadingEnabledHWM
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver TestCMSClassUnloadingEnabledHWM
* @summary Test that -XX:-CMSClassUnloadingEnabled will trigger a Full GC when more than MetaspaceSize metadata is allocated.
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.lang.management.GarbageCollectorMXBean;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
--- a/hotspot/test/gc/class_unloading/TestG1ClassUnloadingHWM.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/class_unloading/TestG1ClassUnloadingHWM.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,18 +25,18 @@
* @test
* @key gc
* @bug 8049831
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestG1ClassUnloadingHWM
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver TestG1ClassUnloadingHWM
* @summary Test that -XX:-ClassUnloadingWithConcurrentMark will trigger a Full GC when more than MetaspaceSize metadata is allocated.
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.util.ArrayList;
import java.util.Arrays;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/gc/cms/GuardShrinkWarning.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/cms/GuardShrinkWarning.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,14 +27,15 @@
* @bug 8012111
* @key gc
* @key regression
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm GuardShrinkWarning
* @author jon.masamitsu@oracle.com
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class GuardShrinkWarning {
public static void main(String args[]) throws Exception {
--- a/hotspot/test/gc/ergonomics/TestDynamicNumberOfGCThreads.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/ergonomics/TestDynamicNumberOfGCThreads.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,11 @@
* @requires vm.gc=="null"
* @key gc
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestDynamicNumberOfGCThreads {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/gc/ergonomics/TestInitialGCThreadLogging.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/ergonomics/TestInitialGCThreadLogging.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,11 @@
* @requires vm.gc=="null"
* @key gc
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestInitialGCThreadLogging {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/gc/g1/Test2GbHeap.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/Test2GbHeap.java Mon Sep 12 22:04:48 2016 +0000
@@ -30,15 +30,15 @@
* @requires vm.bits != "32"
* @key gc
* @key regression
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import java.util.ArrayList;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class Test2GbHeap {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/gc/g1/TestEagerReclaimHumongousRegions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestEagerReclaimHumongousRegions.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @summary Test to make sure that eager reclaim of humongous objects work. We simply try to fill
* up the heap with humongous objects that should be eagerly reclaimable to avoid Full GC.
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
@@ -36,8 +36,8 @@
import java.util.regex.Matcher;
import java.util.LinkedList;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Asserts;
class ReclaimRegionFast {
--- a/hotspot/test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @summary Test to make sure that eager reclaim of humongous objects correctly clears
* mark bitmaps at reclaim.
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
@@ -36,8 +36,8 @@
import java.util.LinkedList;
import java.util.Random;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
// An object that has a few references to other instances to slow down marking.
class ObjectWithSomeRefs {
--- a/hotspot/test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestEagerReclaimHumongousRegionsWithRefs.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +30,7 @@
* referencing that we know is in the old gen. After changing this reference, the object
* should still be eagerly reclaimable to avoid Full GC.
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
@@ -39,8 +39,8 @@
import java.util.regex.Matcher;
import java.util.LinkedList;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import static jdk.test.lib.Asserts.*;
class RefHolder {
--- a/hotspot/test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestG1TraceEagerReclaimHumongousObjects.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,13 +27,13 @@
* @summary Ensure that the output for a G1TraceEagerReclaimHumongousObjects
* includes the expected necessary messages.
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.util.LinkedList;
public class TestG1TraceEagerReclaimHumongousObjects {
--- a/hotspot/test/gc/g1/TestGCLogMessages.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestGCLogMessages.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,13 +27,13 @@
* @summary Ensure the output for a minor GC with G1
* includes the expected necessary messages.
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestGCLogMessages {
--- a/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestHumongousAllocInitialMark.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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,12 +25,13 @@
* @test TestHumongousAllocInitialMark
* @bug 7168848
* @summary G1: humongous object allocations should initiate marking cycles when necessary
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestHumongousAllocInitialMark {
// Heap sizes < 224 MB are increased to 224 MB if vm_page_size == 64K to
--- a/hotspot/test/gc/g1/TestHumongousAllocNearlyFullRegion.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestHumongousAllocNearlyFullRegion.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,12 @@
* @summary G1: humongous object allocations should work even when there is
* not enough space in the heapRegion to fit a filler object.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @run driver TestHumongousAllocNearlyFullRegion
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestHumongousAllocNearlyFullRegion {
// Heap sizes < 224 MB are increased to 224 MB if vm_page_size == 64K to
--- a/hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestHumongousCodeCacheRoots.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,17 +26,18 @@
* @key regression
* @key gc
* @bug 8027756
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestHumongousCodeCacheRoots
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @summary Humongous objects may have references from the code cache
* @run main TestHumongousCodeCacheRoots
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import sun.hotspot.WhiteBox;
import java.util.ArrayList;
--- a/hotspot/test/gc/g1/TestHumongousShrinkHeap.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestHumongousShrinkHeap.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
* @requires vm.gc.G1
* @summary Verify that heap shrinks after GC in the presence of fragmentation
* due to humongous objects
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management/sun.management
* @run main/othervm -XX:-ExplicitGCInvokesConcurrent -XX:MinHeapFreeRatio=10
--- a/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestLargePageUseForAuxMemory.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,10 +27,9 @@
* @bug 8058354 8079208
* @key gc
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @requires vm.gc.G1
- * @build jdk.test.lib.* sun.hotspot.WhiteBox
- * @build TestLargePageUseForAuxMemory
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+IgnoreUnrecognizedVMOptions -XX:+UseLargePages TestLargePageUseForAuxMemory
@@ -40,8 +39,10 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Asserts;
+import jdk.test.lib.Platform;
import sun.hotspot.WhiteBox;
public class TestLargePageUseForAuxMemory {
--- a/hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestNoEagerReclaimOfHumongousRegions.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,9 +29,9 @@
* might pass even if there are problems in the code, but it will never crash unless there is a problem.
* @requires vm.gc.G1
* @key gc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
- * @build TestNoEagerReclaimOfHumongousRegions
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xlog:gc,gc+humongous=debug -XX:+UseG1GC -XX:MaxTenuringThreshold=0 -XX:G1RSetSparseRegionEntries=32 -XX:G1HeapRegionSize=1m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestNoEagerReclaimOfHumongousRegions
--- a/hotspot/test/gc/g1/TestPLABOutput.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestPLABOutput.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,7 +28,7 @@
* @requires vm.gc.G1
* @key gc
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run driver TestPLABOutput
@@ -39,9 +39,9 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/gc/g1/TestPLABSizeBounds.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestPLABSizeBounds.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,16 +27,16 @@
* @summary Regression test to ensure that G1 supports PLAB sizes of half a region size.
* @requires vm.gc.G1
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import java.util.ArrayList;
-import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestPLABSizeBounds {
--- a/hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestPrintRegionRememberedSetInfo.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,14 +26,15 @@
* @key gc
* @bug 8014240
* @summary Test output of G1PrintRegionRememberedSetInfo
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main TestPrintRegionRememberedSetInfo
* @author thomas.schatzl@oracle.com
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.lang.Thread;
import java.util.ArrayList;
import java.util.Arrays;
--- a/hotspot/test/gc/g1/TestRegionLivenessPrint.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestRegionLivenessPrint.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,9 +27,9 @@
* @requires vm.gc.G1
* @summary Make sure that G1 does not assert when printing region liveness data on a humongous continues region.
* @key gc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
- * @build TestRegionLivenessPrint
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC -Xmx128M -XX:G1HeapRegionSize=1m -Xlog:gc+liveness=trace TestRegionLivenessPrint
--- a/hotspot/test/gc/g1/TestRemsetLogging.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestRemsetLogging.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,10 +25,10 @@
* @test TestRemsetLogging.java
* @requires vm.gc.G1
* @bug 8013895 8129977 8145534
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management/sun.management
- * @build TestRemsetLoggingTools TestRemsetLogging
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @summary Verify output of -Xlog:gc+remset*=trace
--- a/hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestRemsetLoggingPerRegion.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,10 +25,10 @@
* @test TestRemsetLoggingPerRegion.java
* @requires vm.gc.G1
* @bug 8014078 8129977 8145534
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management/sun.management
- * @build TestRemsetLoggingTools TestRemsetLoggingPerRegion
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @summary Verify output of -Xlog:gc+remset*=trace in regards to per-region type output
--- a/hotspot/test/gc/g1/TestRemsetLoggingThreads.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestRemsetLoggingThreads.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @requires vm.gc.G1
* @bug 8025441 8145534
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management/sun.management
* @summary Ensure that various values of worker threads/concurrent
@@ -36,8 +36,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestRemsetLoggingThreads {
--- a/hotspot/test/gc/g1/TestRemsetLoggingTools.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestRemsetLoggingTools.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,7 +29,8 @@
import com.sun.management.VMOption;
import sun.hotspot.WhiteBox;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.lang.management.ManagementFactory;
import java.util.ArrayList;
import java.util.Arrays;
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData.java Mon Sep 12 22:04:48 2016 +0000
@@ -22,9 +22,9 @@
*/
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import java.io.IOException;
import java.lang.management.ManagementFactory;
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData00.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
* @requires vm.gc.G1
* @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.* sun.hotspot.WhiteBox
- * TestShrinkAuxiliaryData TestShrinkAuxiliaryData00
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/timeout=720 TestShrinkAuxiliaryData00
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData05.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
* @requires vm.gc.G1
* @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.* sun.hotspot.WhiteBox
- * TestShrinkAuxiliaryData TestShrinkAuxiliaryData05
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/timeout=720 TestShrinkAuxiliaryData05
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData10.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
* @requires vm.gc.G1
* @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.* sun.hotspot.WhiteBox
- * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData10
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/timeout=720 TestShrinkAuxiliaryData10
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData15.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
* @requires vm.gc.G1
* @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.* sun.hotspot.WhiteBox
- * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData15
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/timeout=720 TestShrinkAuxiliaryData15
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData20.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
* @requires vm.gc.G1
* @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.* sun.hotspot.WhiteBox
- * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData20
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/timeout=720 TestShrinkAuxiliaryData20
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData25.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
* @requires vm.gc.G1
* @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.* sun.hotspot.WhiteBox
- * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData25
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/timeout=720 TestShrinkAuxiliaryData25
--- a/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestShrinkAuxiliaryData30.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* G1ConcRSLogCacheSize and ObjectAlignmentInBytes options values
* @requires vm.gc.G1
* @requires vm.opt.AggressiveOpts=="false" | vm.opt.AggressiveOpts=="null"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.* sun.hotspot.WhiteBox
- * @build TestShrinkAuxiliaryData TestShrinkAuxiliaryData30
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/timeout=720 TestShrinkAuxiliaryData30
--- a/hotspot/test/gc/g1/TestShrinkDefragmentedHeap.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestShrinkDefragmentedHeap.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
* "..................................H"
* 3. invoke gc and check that memory returned to the system (amount of committed memory got down)
*
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management/sun.management
*/
@@ -40,8 +40,8 @@
import java.util.ArrayList;
import java.util.List;
import static jdk.test.lib.Asserts.*;
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import com.sun.management.HotSpotDiagnosticMXBean;
public class TestShrinkDefragmentedHeap {
--- a/hotspot/test/gc/g1/TestStringDeduplicationAgeThreshold.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestStringDeduplicationAgeThreshold.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @summary Test string deduplication age threshold
* @bug 8029075
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
--- a/hotspot/test/gc/g1/TestStringDeduplicationFullGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestStringDeduplicationFullGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @summary Test string deduplication during full GC
* @bug 8029075
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
--- a/hotspot/test/gc/g1/TestStringDeduplicationInterned.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestStringDeduplicationInterned.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @summary Test string deduplication of interned strings
* @bug 8029075
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
--- a/hotspot/test/gc/g1/TestStringDeduplicationPrintOptions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestStringDeduplicationPrintOptions.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @summary Test string deduplication print options
* @bug 8029075
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
--- a/hotspot/test/gc/g1/TestStringDeduplicationTableRehash.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestStringDeduplicationTableRehash.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @summary Test string deduplication table rehash
* @bug 8029075
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
--- a/hotspot/test/gc/g1/TestStringDeduplicationTableResize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestStringDeduplicationTableResize.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @summary Test string deduplication table resize
* @bug 8029075
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
--- a/hotspot/test/gc/g1/TestStringDeduplicationTools.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestStringDeduplicationTools.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +29,8 @@
import java.lang.reflect.*;
import java.security.*;
import java.util.*;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import sun.misc.*;
class TestStringDeduplicationTools {
--- a/hotspot/test/gc/g1/TestStringDeduplicationYoungGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestStringDeduplicationYoungGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @summary Test string deduplication during young GC
* @bug 8029075
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
--- a/hotspot/test/gc/g1/TestStringSymbolTableStats.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/TestStringSymbolTableStats.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +26,13 @@
* @bug 8027476 8027455
* @summary Ensure that the G1TraceStringSymbolTableScrubbing prints the expected message.
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestStringSymbolTableStats {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/humongousObjects/TestHeapCounters.java Mon Sep 12 22:04:48 2016 +0000
@@ -38,12 +38,10 @@
* @test TestHeapCounters
* @summary Checks that heap counters work as expected after humongous allocations/deallocations
* @requires vm.gc.G1
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
* @build sun.hotspot.WhiteBox
- * gc.testlibrary.Helpers
- * gc.g1.humongousObjects.TestHeapCounters
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
*
--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousClassLoader.java Mon Sep 12 22:04:48 2016 +0000
@@ -41,15 +41,10 @@
* @requires vm.gc.G1
* @requires vm.opt.G1HeapRegionSize == "null" | vm.opt.G1HeapRegionSize == "1M"
* @requires vm.opt.ExplicitGCInvokesConcurrent != true
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
* @build sun.hotspot.WhiteBox
- * gc.testlibrary.Helpers
- * gc.g1.humongousObjects.G1SampleClass
- * gc.g1.humongousObjects.ClassLoaderGenerator
- * gc.g1.humongousObjects.TestHumongousClassLoader
- *
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
*
--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousMovement.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousMovement.java Mon Sep 12 22:04:48 2016 +0000
@@ -40,12 +40,10 @@
* @test TestHumongousMovement
* @summary Checks that Humongous objects are not moved during GC
* @requires vm.gc.G1
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
* @build sun.hotspot.WhiteBox
- * gc.testlibrary.Helpers
- * gc.g1.humongousObjects.TestHumongousMovement
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -XX:+UseG1GC -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbootclasspath/a:.
--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousNonArrayAllocation.java Mon Sep 12 22:04:48 2016 +0000
@@ -39,14 +39,10 @@
* @summary Checks that huge class' instances (ie with huge amount of fields) are allocated successfully
* @requires vm.gc.G1
* @requires vm.opt.G1HeapRegionSize == "null" | vm.opt.G1HeapRegionSize == "1M"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
* @build sun.hotspot.WhiteBox
- * gc.testlibrary.Helpers
- * gc.g1.humongousObjects.G1SampleClass
- * gc.g1.humongousObjects.TestHumongousNonArrayAllocation
- *
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
*
--- a/hotspot/test/gc/g1/humongousObjects/TestHumongousThreshold.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/humongousObjects/TestHumongousThreshold.java Mon Sep 12 22:04:48 2016 +0000
@@ -32,12 +32,10 @@
* @test TestHumongousThreshold
* @summary Checks that objects larger than half a region are allocated as humongous
* @requires vm.gc.G1
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
* @build sun.hotspot.WhiteBox
- * gc.testlibrary.Helpers
- * gc.g1.humongousObjects.TestHumongousThreshold
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
*
--- a/hotspot/test/gc/g1/humongousObjects/TestNoAllocationsInHRegions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/humongousObjects/TestNoAllocationsInHRegions.java Mon Sep 12 22:04:48 2016 +0000
@@ -36,12 +36,9 @@
* @test TestNoAllocationsInHRegions
* @summary Checks that no additional allocations are made in humongous regions
* @requires vm.gc.G1
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.management java.base/jdk.internal.misc
* @build sun.hotspot.WhiteBox
- * gc.testlibrary.Helpers
- * gc.g1.humongousObjects.TestNoAllocationsInHRegions
- *
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
*
--- a/hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/humongousObjects/TestObjectCollected.java Mon Sep 12 22:04:48 2016 +0000
@@ -38,13 +38,10 @@
* @summary checks that after different type of GCs weak/soft references to humongous object behave correspondingly to
* actual object behavior
* @requires vm.gc.G1
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
* @build sun.hotspot.WhiteBox
- * gc.testlibrary.Helpers
- * gc.g1.humongousObjects.TestObjectCollected
- *
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
*
--- a/hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/humongousObjects/objectGraphTest/TestObjectGraphAfterGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
package gc.g1.humongousObjects.objectGraphTest;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import sun.hotspot.WhiteBox;
import java.io.File;
@@ -50,16 +50,9 @@
* @summary Checks that objects' graph behave as expected after gc
* @requires vm.gc.G1
* @requires vm.opt.ExplicitGCInvokesConcurrent != true
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.management java.base/jdk.internal.misc
* @build sun.hotspot.WhiteBox
- * gc.testlibrary.Helpers
- * gc.g1.humongousObjects.objectGraphTest.GCTokens
- * gc.g1.humongousObjects.objectGraphTest.ReferenceInfo
- * gc.g1.humongousObjects.objectGraphTest.GC
- * gc.g1.humongousObjects.objectGraphTest.ObjectGraph
- * gc.g1.humongousObjects.objectGraphTest.TestObjectGraphAfterGC
- *
* @ignore 8156755
*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/gc/g1/ihop/TestIHOPErgo.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/ihop/TestIHOPErgo.java Mon Sep 12 22:04:48 2016 +0000
@@ -30,11 +30,9 @@
* @requires !vm.flightRecorder
* @requires vm.opt.ExplicitGCInvokesConcurrent != true
* @requires vm.opt.MaxGCPauseMillis == "null"
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
- * @build gc.g1.ihop.TestIHOPErgo
- * gc.g1.ihop.lib.IhopUtils
* @run driver/timeout=480 gc.g1.ihop.TestIHOPErgo
*/
package gc.g1.ihop;
@@ -44,8 +42,8 @@
import java.util.LinkedList;
import java.util.List;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import gc.g1.ihop.lib.IhopUtils;
--- a/hotspot/test/gc/g1/ihop/TestIHOPStatic.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/ihop/TestIHOPStatic.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,9 @@
* @requires vm.gc.G1
* @requires !vm.flightRecorder
* @requires vm.opt.ExplicitGCInvokesConcurrent != true
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
- * @build gc.g1.ihop.TestIHOPStatic
- * gc.g1.ihop.lib.IhopUtils
* @run driver/timeout=240 gc.g1.ihop.TestIHOPStatic
*/
package gc.g1.ihop;
@@ -41,8 +39,8 @@
import java.util.Collections;
import java.util.List;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import gc.g1.ihop.lib.IhopUtils;
--- a/hotspot/test/gc/g1/ihop/lib/IhopUtils.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/ihop/lib/IhopUtils.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
/**
--- a/hotspot/test/gc/g1/mixedgc/TestLogging.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/mixedgc/TestLogging.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,18 +26,18 @@
* @summary Check that a mixed GC is reflected in the gc logs
* @requires vm.gc.G1
* @requires vm.opt.MaxGCPauseMillis == "null"
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management
- * @build sun.hotspot.WhiteBox gc.g1.mixedgc.TestLogging
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run driver gc.g1.mixedgc.TestLogging
*/
package gc.g1.mixedgc;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Asserts;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/plab/TestPLABEvacuationFailure.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,9 @@
* @bug 8148376
* @summary Checks PLAB statistics on evacuation failure
* @requires vm.gc.G1
- * @library /testlibrary /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
- * @build gc.g1.plab.lib.LogParser
- * gc.g1.plab.lib.AppPLABEvacuationFailure
* @run main gc.g1.plab.TestPLABEvacuationFailure
*/
package gc.g1.plab;
@@ -43,8 +41,8 @@
import java.util.regex.Pattern;
import java.util.stream.Collectors;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
import gc.g1.plab.lib.LogParser;
--- a/hotspot/test/gc/g1/plab/TestPLABPromotion.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/plab/TestPLABPromotion.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,14 +27,10 @@
* @summary Test PLAB promotion
* @requires vm.gc.G1
* @requires !vm.flightRecorder
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
- * @build ClassFileInstaller
- * sun.hotspot.WhiteBox
- * gc.g1.plab.lib.MemoryConsumer
- * gc.g1.plab.lib.LogParser
- * gc.g1.plab.lib.AppPLABPromotion
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/timeout=240 gc.g1.plab.TestPLABPromotion
@@ -50,8 +46,8 @@
import gc.g1.plab.lib.PLABUtils;
import gc.g1.plab.lib.PlabInfo;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
/**
* Test checks PLAB promotion of different size objects.
--- a/hotspot/test/gc/g1/plab/TestPLABResize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/plab/TestPLABResize.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,15 +27,10 @@
* @summary Test for PLAB resizing
* @requires vm.gc.G1
* @requires !vm.flightRecorder
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
- * @build ClassFileInstaller
- * sun.hotspot.WhiteBox
- * gc.g1.plab.lib.LogParser
- * gc.g1.plab.lib.MemoryConsumer
- * gc.g1.plab.lib.PLABUtils
- * gc.g1.plab.lib.AppPLABResize
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main gc.g1.plab.TestPLABResize
@@ -52,8 +47,8 @@
import gc.g1.plab.lib.AppPLABResize;
import gc.g1.plab.lib.PlabReport;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
/**
* Test for PLAB resizing.
--- a/hotspot/test/gc/g1/plab/lib/PLABUtils.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/g1/plab/lib/PLABUtils.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
/**
--- a/hotspot/test/gc/logging/TestDeprecatedPrintFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/logging/TestDeprecatedPrintFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,12 +26,13 @@
* @bug 8145180
* @summary Verify PrintGC, PrintGCDetails and -Xloggc
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Paths;
--- a/hotspot/test/gc/logging/TestGCId.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/logging/TestGCId.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,13 +27,13 @@
* @summary Ensure that the GCId is logged
* @requires vm.gc=="null"
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestGCId {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/gc/logging/TestPrintReferences.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/logging/TestPrintReferences.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +26,13 @@
* @bug 8136991
* @summary Validate the reference processing logging
* @key gc
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestPrintReferences {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/gc/logging/TestUnifiedLoggingSwitchStress.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/logging/TestUnifiedLoggingSwitchStress.java Mon Sep 12 22:04:48 2016 +0000
@@ -44,7 +44,7 @@
* @key gc
* @key stress
* @requires !vm.flightRecorder
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.management java.base/jdk.internal.misc
*
* @run main/othervm -Xmx256M -Xms256M
--- a/hotspot/test/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/metaspace/CompressedClassSpaceSizeInJmapHeap.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,16 @@
* @test CompressedClassSpaceSizeInJmapHeap
* @bug 8004924
* @summary Checks that jmap -heap contains the flag CompressedClassSpaceSize
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:CompressedClassSpaceSize=50m CompressedClassSpaceSizeInJmapHeap
*/
-import jdk.test.lib.*;
+import jdk.test.lib.JDKToolLauncher;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.nio.file.*;
import java.io.File;
import java.nio.charset.Charset;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/gc/metaspace/InputArguments.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2013, 2016, 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.management.RuntimeMXBean;
+import java.lang.management.ManagementFactory;
+import java.util.List;
+
+/**
+ * This class provides access to the input arguments to the VM.
+ */
+public class InputArguments {
+ private static final List<String> args;
+
+ static {
+ RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
+ args = runtimeMxBean.getInputArguments();
+ }
+
+ /**
+ * Returns true if {@code arg} is an input argument to the VM.
+ *
+ * This is useful for checking boolean flags such as -XX:+UseSerialGC or
+ * -XX:-UsePerfData.
+ *
+ * @param arg The name of the argument.
+ * @return {@code true} if the given argument is an input argument,
+ * otherwise {@code false}.
+ */
+ public static boolean contains(String arg) {
+ return args.contains(arg);
+ }
+
+ /**
+ * Returns true if {@code prefix} is the start of an input argument to the
+ * VM.
+ *
+ * This is useful for checking if flags describing a quantity, such as
+ * -XX:+MaxMetaspaceSize=100m, is set without having to know the quantity.
+ * To check if the flag -XX:MaxMetaspaceSize is set, use
+ * {@code InputArguments.containsPrefix("-XX:MaxMetaspaceSize")}.
+ *
+ * @param prefix The start of the argument.
+ * @return {@code true} if the given argument is the start of an input
+ * argument, otherwise {@code false}.
+ */
+ public static boolean containsPrefix(String prefix) {
+ for (String arg : args) {
+ if (arg.startsWith(prefix)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
--- a/hotspot/test/gc/metaspace/PerfCounters.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/metaspace/PerfCounters.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import sun.jvmstat.monitor.MonitoredHost;
import sun.jvmstat.monitor.MonitoredVm;
import sun.jvmstat.monitor.VmIdentifier;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
/**
* PerfCounters can be used to get a performance counter from the currently
--- a/hotspot/test/gc/metaspace/TestCapacityUntilGCWrapAround.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/metaspace/TestCapacityUntilGCWrapAround.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +25,10 @@
* @test
* @key gc
* @bug 8049831
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestCapacityUntilGCWrapAround
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI TestCapacityUntilGCWrapAround
--- a/hotspot/test/gc/metaspace/TestMetaspaceCMSCancel.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/metaspace/TestMetaspaceCMSCancel.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,9 +28,9 @@
/* @test TestMetaspaceCMSCancel
* @bug 8026752
* @summary Tests cancel of CMS concurrent cycle for Metaspace after a full GC
- * @library /testlibrary /test/lib /test/lib/share/classes
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
- * @build TestMetaspaceCMSCancel
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm TestMetaspaceCMSCancel
*/
--- a/hotspot/test/gc/metaspace/TestMetaspaceInitialization.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/metaspace/TestMetaspaceInitialization.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* @bug 8024945
* @summary Tests to initialize metaspace with a very low MetaspaceSize
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
* @run main/othervm -XX:MetaspaceSize=0 TestMetaspaceInitialization
*/
public class TestMetaspaceInitialization {
--- a/hotspot/test/gc/metaspace/TestMetaspaceMemoryPool.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/metaspace/TestMetaspaceMemoryPool.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,14 +23,16 @@
import java.util.List;
import java.lang.management.*;
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import static jdk.test.lib.Asserts.*;
/* @test TestMetaspaceMemoryPool
* @bug 8000754
* @summary Tests that a MemoryPoolMXBeans is created for metaspace and that a
* MemoryManagerMXBean is created.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops TestMetaspaceMemoryPool
--- a/hotspot/test/gc/metaspace/TestMetaspacePerfCounters.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/metaspace/TestMetaspacePerfCounters.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -21,21 +21,27 @@
* questions.
*/
+import java.lang.management.GarbageCollectorMXBean;
import java.util.List;
import java.util.ArrayList;
-import jdk.test.lib.*;
+import jdk.test.lib.ByteCodeLoader;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.Platform;
+
+import sun.management.ManagementFactoryHelper;
+
import static jdk.test.lib.Asserts.*;
/* @test TestMetaspacePerfCounters
* @bug 8014659
* @requires vm.gc=="null"
- * @library /testlibrary
+ * @library /test/lib
* @summary Tests that performance counters for metaspace and compressed class
* space exists and works.
* @modules java.base/jdk.internal.misc
* java.compiler
- * java.management
+ * java.management/sun.management
* jdk.jvmstat/sun.jvmstat.monitor
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:+UsePerfData -XX:+UseSerialGC TestMetaspacePerfCounters
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:+UsePerfData -XX:+UseParallelGC -XX:+UseParallelOldGC TestMetaspacePerfCounters
@@ -48,6 +54,7 @@
public class TestMetaspacePerfCounters {
public static Class fooClass = null;
private static final String[] counterNames = {"minCapacity", "maxCapacity", "capacity", "used"};
+ private static final List<GarbageCollectorMXBean> gcBeans = ManagementFactoryHelper.getGarbageCollectorMXBeans();
public static void main(String[] args) throws Exception {
String metaspace = "sun.gc.metaspace";
@@ -65,10 +72,27 @@
}
private static void checkPerfCounters(String ns) throws Exception {
- long minCapacity = getMinCapacity(ns);
- long maxCapacity = getMaxCapacity(ns);
- long capacity = getCapacity(ns);
- long used = getUsed(ns);
+ long gcCountBefore;
+ long gcCountAfter;
+ long minCapacity;
+ long maxCapacity;
+ long capacity;
+ long used;
+
+ // The perf counter values are updated during GC and to be able to
+ // do the assertions below we need to ensure that the values are from
+ // the same GC cycle.
+ do {
+ gcCountBefore = currentGCCount();
+
+ minCapacity = getMinCapacity(ns);
+ maxCapacity = getMaxCapacity(ns);
+ capacity = getCapacity(ns);
+ used = getUsed(ns);
+
+ gcCountAfter = currentGCCount();
+ assertGTE(gcCountAfter, gcCountBefore);
+ } while(gcCountAfter > gcCountBefore);
assertGTE(minCapacity, 0L);
assertGTE(used, minCapacity);
@@ -127,4 +151,12 @@
private static long getUsed(String ns) throws Exception {
return PerfCounters.findByName(ns + ".used").longValue();
}
+
+ private static long currentGCCount() {
+ long gcCount = 0;
+ for (GarbageCollectorMXBean bean : gcBeans) {
+ gcCount += bean.getCollectionCount();
+ }
+ return gcCount;
+ }
}
--- a/hotspot/test/gc/metaspace/TestMetaspaceSizeFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/metaspace/TestMetaspaceSizeFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -22,15 +22,15 @@
*/
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
/*
* @test TestMetaspaceSizeFlags
* @key gc
* @bug 8024650
* @summary Test that metaspace size flags can be set correctly
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
--- a/hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/metaspace/TestPerfCountersAndMemoryPools.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,12 +24,12 @@
import java.util.List;
import java.lang.management.*;
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
import static jdk.test.lib.Asserts.*;
/* @test TestPerfCountersAndMemoryPools
* @bug 8023476
- * @library /testlibrary
+ * @library /test/lib
* @requires vm.gc.Serial
* @summary Tests that a MemoryPoolMXBeans and PerfCounters for metaspace
* report the same data.
--- a/hotspot/test/gc/parallel/AdaptiveGCBoundary.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/parallel/AdaptiveGCBoundary.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,14 +27,15 @@
* @bug 8014546
* @key gc
* @key regression
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm AdaptiveGCBoundary
* @author jon.masamitsu@oracle.com
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class AdaptiveGCBoundary {
public static void main(String args[]) throws Exception {
--- a/hotspot/test/gc/parallel/TestDynShrinkHeap.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/parallel/TestDynShrinkHeap.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,7 +28,7 @@
* @summary Verify that the heap shrinks after full GC according to the current values of the Min/MaxHeapFreeRatio flags
* @modules java.base/jdk.internal.misc
* @modules jdk.management
- * @library /testlibrary
+ * @library /test/lib
* @run main/othervm -XX:+UseAdaptiveSizePolicyWithSystemGC -XX:+UseParallelGC -XX:MinHeapFreeRatio=0 -XX:MaxHeapFreeRatio=100 -Xmx1g -verbose:gc TestDynShrinkHeap
*/
import jdk.test.lib.DynamicVMOption;
--- a/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,7 +28,6 @@
* @key gc
* @requires vm.gc.Parallel
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
* @run main/othervm -Xmx50m -XX:+UseParallelGC -Xlog:gc*=trace TestPrintGCDetailsVerbose
*/
public class TestPrintGCDetailsVerbose {
--- a/hotspot/test/gc/serial/HeapChangeLogging.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/serial/HeapChangeLogging.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +24,9 @@
/*
* @test HeapChangeLogging.java
* @bug 8027440
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build HeapChangeLogging
* @summary Allocate to get a promotion failure and verify that that heap change logging is present.
* @run main HeapChangeLogging
*/
@@ -35,7 +34,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class HeapChangeLogging {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/gc/startup_warnings/TestCMS.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/startup_warnings/TestCMS.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,13 +26,13 @@
* @key gc
* @bug 8006398
* @summary Test that CMS does not print a warning message
-* @library /testlibrary
+* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestCMS {
--- a/hotspot/test/gc/startup_warnings/TestDefNewCMS.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/startup_warnings/TestDefNewCMS.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,13 +26,13 @@
* @key gc
* @bug 8065972
* @summary Test that the unsupported DefNew+CMS combination does not start
-* @library /testlibrary
+* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestDefNewCMS {
--- a/hotspot/test/gc/startup_warnings/TestG1.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/startup_warnings/TestG1.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,13 +26,13 @@
* @key gc
* @bug 8006398
* @summary Test that the G1 collector does not print a warning message
-* @library /testlibrary
+* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestG1 {
--- a/hotspot/test/gc/startup_warnings/TestParNewCMS.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/startup_warnings/TestParNewCMS.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,13 +26,13 @@
* @key gc
* @bug 8065972
* @summary Test that specifying -XX:+UseParNewGC on the command line logs a warning message
-* @library /testlibrary
+* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestParNewCMS {
--- a/hotspot/test/gc/startup_warnings/TestParNewSerialOld.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/startup_warnings/TestParNewSerialOld.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,13 +26,13 @@
* @key gc
* @bug 8065972
* @summary Test that the unsupported ParNew+SerialOld combination does not start
-* @library /testlibrary
+* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestParNewSerialOld {
--- a/hotspot/test/gc/startup_warnings/TestParallelGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/startup_warnings/TestParallelGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,13 +26,13 @@
* @key gc
* @bug 8006398
* @summary Test that ParallelGC does not print a warning message
-* @library /testlibrary
+* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestParallelGC {
--- a/hotspot/test/gc/startup_warnings/TestParallelScavengeSerialOld.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/startup_warnings/TestParallelScavengeSerialOld.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,13 +26,13 @@
* @key gc
* @bug 8006398
* @summary Test that the ParallelScavenge+SerialOld combination does not print a warning message
-* @library /testlibrary
+* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestParallelScavengeSerialOld {
--- a/hotspot/test/gc/startup_warnings/TestSerialGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/startup_warnings/TestSerialGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2013, 2016, 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,13 +26,13 @@
* @key gc
* @bug 8006398
* @summary Test that SerialGC does not print a warning message
-* @library /testlibrary
+* @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestSerialGC {
--- a/hotspot/test/gc/stress/TestMultiThreadStressRSet.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/stress/TestMultiThreadStressRSet.java Mon Sep 12 22:04:48 2016 +0000
@@ -37,7 +37,7 @@
*
* @summary Stress G1 Remembered Set using multiple threads
* @modules java.base/jdk.internal.misc
- * @library /test/lib /testlibrary
+ * @library /test/lib
* @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/gc/stress/TestStressRSetCoarsening.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/stress/TestStressRSetCoarsening.java Mon Sep 12 22:04:48 2016 +0000
@@ -34,7 +34,7 @@
*
* @summary Stress G1 Remembered Set by creating a lot of cross region links
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/gc/survivorAlignment/TestAllocationInEden.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/survivorAlignment/TestAllocationInEden.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +26,10 @@
* @bug 8031323
* @summary Verify that object's alignment in eden space is not affected by
* SurvivorAlignmentInBytes option.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestAllocationInEden SurvivorAlignmentTestMain AlignmentHelper
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/survivorAlignment/TestPromotionFromEdenToTenured.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @bug 8031323
* @summary Verify that objects promoted from eden space to tenured space during
* full GC are not aligned to SurvivorAlignmentInBytes value.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestPromotionFromEdenToTenured SurvivorAlignmentTestMain
- * AlignmentHelper
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterFullGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @bug 8031323
* @summary Verify that objects promoted from survivor space to tenured space
* during full GC are not aligned to SurvivorAlignmentInBytes value.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestPromotionFromSurvivorToTenuredAfterFullGC
- * SurvivorAlignmentTestMain AlignmentHelper
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/survivorAlignment/TestPromotionFromSurvivorToTenuredAfterMinorGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,11 +27,10 @@
* @summary Verify that objects promoted from survivor space to tenured space
* when their age exceeded tenuring threshold are not aligned to
* SurvivorAlignmentInBytes value.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestPromotionFromSurvivorToTenuredAfterMinorGC
- * SurvivorAlignmentTestMain AlignmentHelper
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/gc/survivorAlignment/TestPromotionToSurvivor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/survivorAlignment/TestPromotionToSurvivor.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,11 +26,10 @@
* @bug 8031323
* @summary Verify that objects promoted from eden space to survivor space after
* minor GC are aligned to SurvivorAlignmentInBytes.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestPromotionToSurvivor
- * SurvivorAlignmentTestMain AlignmentHelper
+ * @build sun.hotspot.WhiteBox
* @ignore 8129886
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
--- a/hotspot/test/gc/testlibrary/Helpers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/testlibrary/Helpers.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
package gc.testlibrary;
import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import sun.hotspot.WhiteBox;
import java.io.File;
--- a/hotspot/test/gc/whitebox/TestConcMarkCycleWB.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/whitebox/TestConcMarkCycleWB.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,12 +25,12 @@
* @test TestConMarkCycleWB
* @bug 8065579
* @requires vm.gc.G1
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build ClassFileInstaller jdk.test.lib.* sun.hotspot.WhiteBox TestConcMarkCycleWB
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UseG1GC TestConcMarkCycleWB
--- a/hotspot/test/gc/whitebox/TestWBGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/gc/whitebox/TestWBGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,14 +25,16 @@
* @test TestWBGC
* @bug 8055098
* @summary Test verify that WB methods isObjectInOldGen and youngGC works correctly.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestWBGC
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run driver TestWBGC
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Asserts;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import sun.hotspot.WhiteBox;
public class TestWBGC {
--- a/hotspot/test/native/GTestWrapper.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/native/GTestWrapper.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/* @test
* @summary a jtreg wrapper for gtest tests
- * @library /test/lib/share/classes
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @run main/native GTestWrapper
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/logTestFixture.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2016, 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 "logTestFixture.hpp"
+#include "logTestUtils.inline.hpp"
+#include "logging/logConfiguration.hpp"
+#include "memory/resourceArea.hpp"
+#include "unittest.hpp"
+#include "utilities/ostream.hpp"
+
+LogTestFixture::LogTestFixture() {
+ // Set up TestLogFileName to include PID, testcase name and test name
+ int ret = jio_snprintf(_filename, sizeof(_filename), "testlog.pid%d.%s.%s.log",
+ os::current_process_id(),
+ ::testing::UnitTest::GetInstance()->current_test_info()->test_case_name(),
+ ::testing::UnitTest::GetInstance()->current_test_info()->name());
+ EXPECT_GT(ret, 0) << "_filename buffer issue";
+ TestLogFileName = _filename;
+}
+
+LogTestFixture::~LogTestFixture() {
+ restore_default_log_config();
+ delete_file(TestLogFileName);
+}
+
+bool LogTestFixture::set_log_config(const char* output,
+ const char* what,
+ const char* decorators,
+ const char* options,
+ bool allow_failure) {
+ ResourceMark rm;
+ stringStream stream;
+ bool success = LogConfiguration::parse_log_arguments(output, what, decorators, options, &stream);
+ if (!allow_failure) {
+ const char* errmsg = stream.as_string();
+ EXPECT_STREQ("", errmsg) << "Unexpected error reported";
+ EXPECT_TRUE(success) << "Shouldn't cause errors";
+ }
+ return success;
+}
+
+void LogTestFixture::restore_default_log_config() {
+ LogConfiguration::disable_logging();
+ set_log_config("stdout", "all=warning");
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/logTestFixture.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2016, 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 "unittest.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+// A fixture base class for tests that need to change the log configuration,
+// or use a log file. After each test, the fixture will automatically restore
+// the log configuration and remove the test file (if used).
+// Provides TestLogFileName which is unique for each test, and is automatically
+// deleted after the test completes.
+class LogTestFixture : public testing::Test {
+ private:
+ char _filename[2 * K];
+
+ protected:
+ const char* TestLogFileName;
+
+ LogTestFixture();
+ ~LogTestFixture();
+
+ static bool set_log_config(const char* output,
+ const char* what,
+ const char* decorators = "",
+ const char* options = "",
+ bool allow_failure = false);
+
+ static void restore_default_log_config();
+};
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/logTestUtils.inline.hpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016, 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 "runtime/os.hpp"
+#include "unittest.hpp"
+
+#define LOG_TEST_STRING_LITERAL "a (hopefully) unique log message for testing"
+
+static inline bool string_contains_substring(const char* haystack, const char* needle) {
+ return strstr(haystack, needle) != NULL;
+}
+
+static inline bool file_exists(const char* filename) {
+ struct stat st;
+ return os::stat(filename, &st) == 0;
+}
+
+static inline void delete_file(const char* filename) {
+ if (!file_exists(filename)) {
+ return;
+ }
+ int ret = remove(filename);
+ EXPECT_TRUE(ret == 0 || errno == ENOENT) << "failed to remove file '" << filename << "': "
+ << os::strerror(errno) << " (" << errno << ")";
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/test_logConfiguration.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,291 @@
+/*
+ * Copyright (c) 2016, 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 "logTestFixture.hpp"
+#include "logTestUtils.inline.hpp"
+#include "logging/logConfiguration.hpp"
+#include "logging/logLevel.hpp"
+#include "logging/logOutput.hpp"
+#include "logging/logTag.hpp"
+#include "logging/logTagSet.hpp"
+#include "memory/resourceArea.hpp"
+#include "unittest.hpp"
+#include "utilities/ostream.hpp"
+
+class LogConfigurationTest : public LogTestFixture {
+ protected:
+ static char _all_decorators[256];
+
+ public:
+ static void SetUpTestCase();
+};
+
+char LogConfigurationTest::_all_decorators[256];
+
+// Prepare _all_decorators to contain the full list of decorators (comma separated)
+void LogConfigurationTest::SetUpTestCase() {
+ char *pos = _all_decorators;
+ for (size_t i = 0; i < LogDecorators::Count; i++) {
+ pos += jio_snprintf(pos, sizeof(_all_decorators) - (pos - _all_decorators), "%s%s",
+ (i == 0 ? "" : ","),
+ LogDecorators::name(static_cast<LogDecorators::Decorator>(i)));
+ }
+}
+
+// Check if the given text is included by LogConfiguration::describe()
+static bool is_described(const char* text) {
+ ResourceMark rm;
+ stringStream ss;
+ LogConfiguration::describe(&ss);
+ return string_contains_substring(ss.as_string(), text);
+}
+
+TEST_F(LogConfigurationTest, describe) {
+ ResourceMark rm;
+ stringStream ss;
+ LogConfiguration::describe(&ss);
+ const char* description = ss.as_string();
+
+ // Verify that stdout and stderr are listed by default
+ EXPECT_PRED2(string_contains_substring, description, LogOutput::Stdout->name());
+ EXPECT_PRED2(string_contains_substring, description, LogOutput::Stderr->name());
+
+ // Verify that each tag, level and decorator is listed
+ for (size_t i = 0; i < LogTag::Count; i++) {
+ EXPECT_PRED2(string_contains_substring, description, LogTag::name(static_cast<LogTagType>(i)));
+ }
+ for (size_t i = 0; i < LogLevel::Count; i++) {
+ EXPECT_PRED2(string_contains_substring, description, LogLevel::name(static_cast<LogLevelType>(i)));
+ }
+ for (size_t i = 0; i < LogDecorators::Count; i++) {
+ EXPECT_PRED2(string_contains_substring, description, LogDecorators::name(static_cast<LogDecorators::Decorator>(i)));
+ }
+
+ // Verify that the default configuration is printed
+ char expected_buf[256];
+ int ret = jio_snprintf(expected_buf, sizeof(expected_buf), "=%s", LogLevel::name(LogLevel::Default));
+ ASSERT_NE(-1, ret);
+ EXPECT_PRED2(string_contains_substring, description, expected_buf);
+ EXPECT_PRED2(string_contains_substring, description, "#1: stderr all=off");
+
+ // Verify default decorators are listed
+ LogDecorators default_decorators;
+ expected_buf[0] = '\0';
+ for (size_t i = 0; i < LogDecorators::Count; i++) {
+ LogDecorators::Decorator d = static_cast<LogDecorators::Decorator>(i);
+ if (default_decorators.is_decorator(d)) {
+ ASSERT_LT(strlen(expected_buf), sizeof(expected_buf));
+ ret = jio_snprintf(expected_buf + strlen(expected_buf),
+ sizeof(expected_buf) - strlen(expected_buf),
+ "%s%s",
+ strlen(expected_buf) > 0 ? "," : "",
+ LogDecorators::name(d));
+ ASSERT_NE(-1, ret);
+ }
+ }
+ EXPECT_PRED2(string_contains_substring, description, expected_buf);
+
+ // Add a new output and verify that it gets described after it has been added
+ const char* what = "all=trace";
+ EXPECT_FALSE(is_described(TestLogFileName)) << "Test output already exists!";
+ set_log_config(TestLogFileName, what);
+ EXPECT_TRUE(is_described(TestLogFileName));
+ EXPECT_TRUE(is_described("logging=trace"));
+}
+
+// Test updating an existing log output
+TEST_F(LogConfigurationTest, update_output) {
+ // Update stdout twice, first using it's name, and the second time its index #
+ const char* test_outputs[] = { "stdout", "#0" };
+ for (size_t i = 0; i < ARRAY_SIZE(test_outputs); i++) {
+ set_log_config(test_outputs[i], "all=info");
+
+ // Verify configuration using LogConfiguration::describe
+ EXPECT_TRUE(is_described("#0: stdout"));
+ EXPECT_TRUE(is_described("logging=info"));
+
+ // Verify by iterating over tagsets
+ LogOutput* o = LogOutput::Stdout;
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_TRUE(ts->has_output(o));
+ EXPECT_TRUE(ts->is_level(LogLevel::Info));
+ EXPECT_FALSE(ts->is_level(LogLevel::Debug));
+ }
+
+ // Now change the level and verify the change propagated
+ set_log_config(test_outputs[i], "all=debug");
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_TRUE(ts->has_output(o));
+ EXPECT_TRUE(ts->is_level(LogLevel::Debug));
+ EXPECT_FALSE(ts->is_level(LogLevel::Trace));
+ }
+ }
+}
+
+// Test adding a new output to the configuration
+TEST_F(LogConfigurationTest, add_new_output) {
+ const char* what = "all=trace";
+
+ ASSERT_FALSE(is_described(TestLogFileName));
+ set_log_config(TestLogFileName, what);
+
+ // Verify new output using LogConfiguration::describe
+ EXPECT_TRUE(is_described(TestLogFileName));
+ EXPECT_TRUE(is_described("logging=trace"));
+
+ // Also verify by iterating over tagsets, checking levels on tagsets
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_TRUE(ts->is_level(LogLevel::Trace));
+ }
+}
+
+TEST_F(LogConfigurationTest, disable_logging) {
+ // Add TestLogFileName as an output
+ set_log_config(TestLogFileName, "logging=info");
+
+ LogConfiguration::disable_logging();
+
+ // Verify TestLogFileName was disabled
+ EXPECT_FALSE(is_described(TestLogFileName));
+
+ // Verify that no tagset has logging enabled
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_FALSE(ts->has_output(LogOutput::Stdout));
+ EXPECT_FALSE(ts->has_output(LogOutput::Stderr));
+ EXPECT_FALSE(ts->is_level(LogLevel::Error));
+ }
+}
+
+// Test disabling a particular output
+TEST_F(LogConfigurationTest, disable_output) {
+ // Disable the default configuration for stdout
+ set_log_config("stdout", "all=off");
+
+ // Verify configuration using LogConfiguration::describe
+ EXPECT_TRUE(is_described("#0: stdout all=off"));
+
+ // Verify by iterating over tagsets
+ LogOutput* o = LogOutput::Stdout;
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_FALSE(ts->has_output(o));
+ EXPECT_FALSE(ts->is_level(LogLevel::Error));
+ }
+
+ // Add a new file output
+ const char* what = "all=debug";
+ set_log_config(TestLogFileName, what);
+ EXPECT_TRUE(is_described(TestLogFileName));
+
+ // Now disable it, verifying it is removed completely
+ set_log_config(TestLogFileName, "all=off");
+ EXPECT_FALSE(is_described(TestLogFileName));
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_FALSE(ts->is_level(LogLevel::Error));
+ }
+}
+
+// Test reconfiguration of the selected decorators for an output
+TEST_F(LogConfigurationTest, reconfigure_decorators) {
+ // Configure stderr with all decorators
+ set_log_config("stderr", "all=off", _all_decorators);
+ char buf[256];
+ int ret = jio_snprintf(buf, sizeof(buf), "#1: stderr all=off %s", _all_decorators);
+ ASSERT_NE(-1, ret);
+ EXPECT_TRUE(is_described(buf)) << "'" << buf << "' not described after reconfiguration";
+
+ // Now reconfigure logging on stderr with no decorators
+ set_log_config("stderr", "all=off", "none");
+ EXPECT_TRUE(is_described("#1: stderr all=off \n")) << "Expecting no decorators";
+}
+
+// Test that invalid options cause configuration errors
+TEST_F(LogConfigurationTest, invalid_configure_options) {
+ LogConfiguration::disable_logging();
+ const char* invalid_outputs[] = { "#2", "invalidtype=123", ":invalid/path}to*file?" };
+ for (size_t i = 0; i < ARRAY_SIZE(invalid_outputs); i++) {
+ EXPECT_FALSE(set_log_config(invalid_outputs[i], "", "", "", true))
+ << "Accepted invalid output '" << invalid_outputs[i] << "'";
+ }
+ EXPECT_FALSE(LogConfiguration::parse_command_line_arguments("all=invalid_level"));
+ EXPECT_FALSE(LogConfiguration::parse_command_line_arguments("what=invalid"));
+ EXPECT_FALSE(LogConfiguration::parse_command_line_arguments("all::invalid_decorator"));
+}
+
+// Test empty configuration options
+TEST_F(LogConfigurationTest, parse_empty_command_line_arguments) {
+ const char* empty_variations[] = { "", ":", "::", ":::", "::::" };
+ for (size_t i = 0; i < ARRAY_SIZE(empty_variations); i++) {
+ const char* cmdline = empty_variations[i];
+ bool ret = LogConfiguration::parse_command_line_arguments(cmdline);
+ EXPECT_TRUE(ret) << "Error parsing command line arguments '" << cmdline << "'";
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_EQ(LogLevel::Unspecified, ts->level_for(LogOutput::Stdout));
+ }
+ }
+}
+
+// Test basic command line parsing & configuration
+TEST_F(LogConfigurationTest, parse_command_line_arguments) {
+ // Prepare a command line for logging*=debug on stderr with all decorators
+ int ret;
+ char buf[256];
+ ret = jio_snprintf(buf, sizeof(buf), "logging*=debug:stderr:%s", _all_decorators);
+ ASSERT_NE(-1, ret);
+
+ bool success = LogConfiguration::parse_command_line_arguments(buf);
+ EXPECT_TRUE(success) << "Error parsing valid command line arguments '" << buf << "'";
+ // Ensure the new configuration applied
+ EXPECT_TRUE(is_described("logging=debug"));
+ EXPECT_TRUE(is_described(_all_decorators));
+
+ // Test the configuration of file outputs as well
+ ret = jio_snprintf(buf, sizeof(buf), ":%s", TestLogFileName);
+ ASSERT_NE(-1, ret);
+ EXPECT_TRUE(LogConfiguration::parse_command_line_arguments(buf));
+}
+
+// Test split up log configuration arguments
+TEST_F(LogConfigurationTest, parse_log_arguments) {
+ ResourceMark rm;
+ stringStream ss;
+ // Verify that it's possible to configure each individual tag
+ for (size_t t = 1 /* Skip _NO_TAG */; t < LogTag::Count; t++) {
+ const LogTagType tag = static_cast<LogTagType>(t);
+ EXPECT_TRUE(LogConfiguration::parse_log_arguments("stdout", LogTag::name(tag), "", "", &ss));
+ }
+ // Same for each level
+ for (size_t l = 0; l < LogLevel::Count; l++) {
+ const LogLevelType level = static_cast<LogLevelType>(l);
+ char expected_buf[256];
+ int ret = jio_snprintf(expected_buf, sizeof(expected_buf), "all=%s", LogLevel::name(level));
+ ASSERT_NE(-1, ret);
+ EXPECT_TRUE(LogConfiguration::parse_log_arguments("stderr", expected_buf, "", "", &ss));
+ }
+ // And for each decorator
+ for (size_t d = 0; d < LogDecorators::Count; d++) {
+ const LogDecorators::Decorator decorator = static_cast<LogDecorators::Decorator>(d);
+ EXPECT_TRUE(LogConfiguration::parse_log_arguments("#0", "", LogDecorators::name(decorator), "", &ss));
+ }
+ EXPECT_STREQ("", ss.as_string()) << "Error reported while parsing: " << ss.as_string();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/test_logDecorations.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) 2016, 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 "logging/logDecorations.hpp"
+#include "logging/logTagSet.hpp"
+#include "runtime/os.hpp"
+#include "unittest.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+static const LogTagSet& tagset = LogTagSetMapping<LOG_TAGS(logging, safepoint)>::tagset();
+static const LogDecorators default_decorators;
+
+TEST(LogDecorations, level) {
+ for (uint l = LogLevel::First; l <= LogLevel::Last; l++) {
+ LogLevelType level = static_cast<LogLevelType>(l);
+ // Create a decorations object for the current level
+ LogDecorations decorations(level, tagset, default_decorators);
+ // Verify that the level decoration matches the specified level
+ EXPECT_STREQ(LogLevel::name(level), decorations.decoration(LogDecorators::level_decorator));
+
+ // Test changing level after object creation time
+ LogLevelType other_level;
+ if (l != LogLevel::Last) {
+ other_level = static_cast<LogLevelType>(l + 1);
+ } else {
+ other_level = static_cast<LogLevelType>(LogLevel::First);
+ }
+ decorations.set_level(other_level);
+ EXPECT_STREQ(LogLevel::name(other_level), decorations.decoration(LogDecorators::level_decorator))
+ << "Decoration reports incorrect value after changing the level";
+ }
+}
+
+TEST(LogDecorations, uptime) {
+ // Verify the format of the decoration
+ int a, b;
+ char decimal_point;
+ LogDecorations decorations(LogLevel::Info, tagset, default_decorators);
+ const char* uptime = decorations.decoration(LogDecorators::uptime_decorator);
+ int read = sscanf(uptime, "%d%c%ds", &a, &decimal_point, &b);
+ EXPECT_EQ(3, read) << "Invalid uptime decoration: " << uptime;
+ EXPECT_TRUE(decimal_point == '.' || decimal_point == ',') << "Invalid uptime decoration: " << uptime;
+
+ // Verify that uptime increases
+ double prev = 0;
+ for (int i = 0; i < 3; i++) {
+ os::naked_short_sleep(10);
+ LogDecorations d(LogLevel::Info, tagset, default_decorators);
+ double cur = strtod(d.decoration(LogDecorators::uptime_decorator), NULL);
+ ASSERT_LT(prev, cur);
+ prev = cur;
+ }
+}
+
+TEST(LogDecorations, tags) {
+ char expected_tags[1 * K];
+ tagset.label(expected_tags, sizeof(expected_tags));
+ // Verify that the expected tags are included in the tags decoration
+ LogDecorations decorations(LogLevel::Info, tagset, default_decorators);
+ EXPECT_STREQ(expected_tags, decorations.decoration(LogDecorators::tags_decorator));
+}
+
+// Test each variation of the different timestamp decorations (ms, ns, uptime ms, uptime ns)
+TEST(LogDecorations, timestamps) {
+ struct {
+ const LogDecorators::Decorator decorator;
+ const char* suffix;
+ } test_decorator[] = {
+ { LogDecorators::timemillis_decorator, "ms" },
+ { LogDecorators::uptimemillis_decorator, "ms" },
+ { LogDecorators::timenanos_decorator, "ns" },
+ { LogDecorators::uptimenanos_decorator, "ns" }
+ };
+
+ for (uint i = 0; i < ARRAY_SIZE(test_decorator); i++) {
+ LogDecorators::Decorator decorator = test_decorator[i].decorator;
+ LogDecorators decorator_selection;
+ ASSERT_TRUE(decorator_selection.parse(LogDecorators::name(decorator)));
+
+ // Create decorations with the decorator we want to test included
+ LogDecorations decorations(LogLevel::Info, tagset, decorator_selection);
+ const char* decoration = decorations.decoration(decorator);
+
+ // Verify format of timestamp
+ const char* suffix;
+ for (suffix = decoration; isdigit(*suffix); suffix++) {
+ // Skip over digits
+ }
+ EXPECT_STREQ(test_decorator[i].suffix, suffix);
+
+ // Verify timestamp values
+ julong prev = 0;
+ for (int i = 0; i < 3; i++) {
+ os::naked_short_sleep(5);
+ LogDecorations d(LogLevel::Info, tagset, decorator_selection);
+ julong val = strtoull(d.decoration(decorator), NULL, 10);
+ ASSERT_LT(prev, val);
+ prev = val;
+ }
+ }
+}
+
+// Test the time decoration
+TEST(LogDecorations, iso8601_time) {
+ LogDecorators decorator_selection;
+ ASSERT_TRUE(decorator_selection.parse("time"));
+ LogDecorations decorations(LogLevel::Info, tagset, decorator_selection);
+
+ const char *timestr = decorations.decoration(LogDecorators::time_decorator);
+ time_t expected_ts = time(NULL);
+
+ // Verify format
+ int y, M, d, h, m;
+ double s;
+ int read = sscanf(timestr, "%d-%d-%dT%d:%d:%lfZ", &y, &M, &d, &h, &m, &s);
+ ASSERT_EQ(6, read);
+
+ // Verify reported time & date
+ struct tm reported_time = {0};
+ reported_time.tm_year = y - 1900;
+ reported_time.tm_mon = M - 1;
+ reported_time.tm_mday = d;
+ reported_time.tm_hour = h;
+ reported_time.tm_min = m;
+ reported_time.tm_sec = s;
+ reported_time.tm_isdst = daylight;
+ time_t reported_ts = mktime(&reported_time);
+ expected_ts = mktime(localtime(&expected_ts));
+ time_t diff = reported_ts - expected_ts;
+ if (diff < 0) {
+ diff = -diff;
+ }
+ // Allow up to 10 seconds in difference
+ ASSERT_LE(diff, 10) << "Reported time: " << reported_ts << " (" << timestr << ")"
+ << ", expected time: " << expected_ts;
+}
+
+// Test the pid and tid decorations
+TEST(LogDecorations, identifiers) {
+ LogDecorators decorator_selection;
+ ASSERT_TRUE(decorator_selection.parse("pid,tid"));
+ LogDecorations decorations(LogLevel::Info, tagset, decorator_selection);
+
+ struct {
+ intx expected;
+ LogDecorators::Decorator decorator;
+ } ids[] = {
+ { os::current_process_id(), LogDecorators::pid_decorator },
+ { os::current_thread_id(), LogDecorators::tid_decorator },
+ };
+
+ for (uint i = 0; i < ARRAY_SIZE(ids); i++) {
+ const char* reported = decorations.decoration(ids[i].decorator);
+
+ // Verify format
+ const char* str;
+ for (str = reported; isdigit(*str); str++) {
+ // Skip over digits
+ }
+ EXPECT_EQ('\0', *str) << "Should only contain digits";
+
+ // Verify value
+ EXPECT_EQ(ids[i].expected, strtol(reported, NULL, 10));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/test_logDecorators.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2016, 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 "logging/logDecorators.hpp"
+#include "unittest.hpp"
+
+static LogDecorators::Decorator decorator_array[] = {
+#define DECORATOR(name, abbr) LogDecorators::name##_decorator,
+ DECORATOR_LIST
+#undef DECORATOR
+};
+
+static const char* decorator_name_array[] = {
+#define DECORATOR(name, abbr) #name,
+ DECORATOR_LIST
+#undef DECORATOR
+};
+
+static const char* decorator_abbr_array[] = {
+#define DECORATOR(name, abbr) #abbr,
+ DECORATOR_LIST
+#undef DECORATOR
+};
+
+// Assert that the given decorators object has the default decorators (uptime, level, tags)
+// If exclusive = true, also assert that no other decorators are selected
+static void assert_default_decorators(LogDecorators* decorators, bool exclusive = true) {
+ for (int i = 0; i < LogDecorators::Count; i++) {
+ LogDecorators::Decorator decorator = decorator_array[i];
+ if (decorator == LogDecorators::uptime_decorator ||
+ decorator == LogDecorators::level_decorator ||
+ decorator == LogDecorators::tags_decorator) {
+ EXPECT_TRUE(decorators->is_decorator(decorator));
+ } else if (exclusive) {
+ EXPECT_FALSE(decorators->is_decorator(decorator));
+ }
+ }
+}
+
+TEST(LogDecorators, defaults) {
+ LogDecorators decorators;
+ assert_default_decorators(&decorators);
+}
+
+// Test converting between name and decorator (string and enum)
+TEST(LogDecorators, from_and_to_name) {
+ EXPECT_EQ(LogDecorators::Invalid, LogDecorators::from_string("unknown"));
+ EXPECT_EQ(LogDecorators::Invalid, LogDecorators::from_string(""));
+
+ for (int i = 0; i < LogDecorators::Count; i++) {
+ LogDecorators::Decorator decorator = decorator_array[i];
+
+ const char* name = LogDecorators::name(decorator);
+ EXPECT_STREQ(decorator_name_array[i], name);
+
+ LogDecorators::Decorator decorator2 = LogDecorators::from_string(name);
+ EXPECT_EQ(decorator, decorator2);
+
+ // Test case insensitivity
+ char* name_cpy = strdup(name);
+ name_cpy[0] = toupper(name_cpy[0]);
+ decorator2 = LogDecorators::from_string(name_cpy);
+ free(name_cpy);
+ EXPECT_EQ(decorator, decorator2);
+ }
+}
+
+// Test decorator abbreviations
+TEST(LogDecorators, from_and_to_abbr) {
+ for (int i = 0; i < LogDecorators::Count; i++) {
+ LogDecorators::Decorator decorator = decorator_array[i];
+
+ const char* abbr = LogDecorators::abbreviation(decorator);
+ EXPECT_STREQ(decorator_abbr_array[i], abbr);
+
+ LogDecorators::Decorator decorator2 = LogDecorators::from_string(abbr);
+ ASSERT_EQ(decorator, decorator2);
+
+ // Test case insensitivity
+ char* abbr_cpy = strdup(abbr);
+ abbr_cpy[0] = toupper(abbr_cpy[0]);
+ decorator2 = LogDecorators::from_string(abbr_cpy);
+ free(abbr_cpy);
+ EXPECT_EQ(decorator, decorator2);
+ }
+}
+
+TEST(LogDecorators, parse_default) {
+ LogDecorators decorators;
+ decorators.parse(""); // Empty string means we should use the default decorators
+ assert_default_decorators(&decorators);
+}
+
+// Test that "none" gives no decorators at all
+TEST(LogDecorators, parse_none) {
+ LogDecorators decorators;
+ decorators.parse("none");
+ for (int i = 0; i < LogDecorators::Count; i++) {
+ EXPECT_FALSE(decorators.is_decorator(decorator_array[i]));
+ }
+}
+
+// Test a few invalid decorator selections
+TEST(LogDecorators, parse_invalid) {
+ LogDecorators decorators;
+ EXPECT_FALSE(decorators.parse("invalid"));
+ EXPECT_FALSE(decorators.parse(",invalid"));
+ EXPECT_FALSE(decorators.parse(",invalid,"));
+ assert_default_decorators(&decorators);
+}
+
+// Assert that the given decorator has all decorators between first and last
+static void assert_decorations_between(const LogDecorators* decorator, size_t first, size_t last) {
+ for (size_t i = 0; i < ARRAY_SIZE(decorator_array); i++) {
+ if (i >= first && i <= last) {
+ EXPECT_TRUE(decorator->is_decorator(decorator_array[i]));
+ } else {
+ EXPECT_FALSE(decorator->is_decorator(decorator_array[i]));
+ }
+ }
+}
+
+TEST(LogDecorators, parse) {
+ LogDecorators decorators;
+
+ // Verify a bunch of different decorator selections
+ char decstr[1 * K];
+ decstr[0] = '\0';
+ size_t written = 0;
+ for (size_t i = 0; i < ARRAY_SIZE(decorator_array); i++) {
+ for (size_t j = i; j < ARRAY_SIZE(decorator_array); j++) {
+ for (size_t k = i; k <= j; k++) {
+ ASSERT_LT(written, sizeof(decstr)) << "decstr overflow";
+ int ret = jio_snprintf(decstr + written, sizeof(decstr) - written, "%s%s",
+ written == 0 ? "" : ",",
+ ((k + j) % 2 == 0) ? decorator_name_array[k] : decorator_abbr_array[k]);
+ ASSERT_NE(-1, ret);
+ written += ret;
+ }
+ EXPECT_TRUE(decorators.parse(decstr)) << "Valid decorator selection did not parse: " << decstr;
+ assert_decorations_between(&decorators, i, j);
+ written = 0;
+ decstr[0] = '\0';
+ }
+ }
+}
+
+TEST(LogDecorators, combine_with) {
+ LogDecorators dec1;
+ LogDecorators dec2;
+
+ // Select first and third decorator for dec1
+ char input[64];
+ sprintf(input, "%s,%s", decorator_name_array[0], decorator_name_array[2]);
+ dec1.parse(input);
+ EXPECT_TRUE(dec1.is_decorator(decorator_array[0]));
+ EXPECT_TRUE(dec1.is_decorator(decorator_array[2]));
+
+ // Select the default decorators for dec2
+ EXPECT_FALSE(dec2.is_decorator(decorator_array[0]));
+ EXPECT_FALSE(dec2.is_decorator(decorator_array[2]));
+ assert_default_decorators(&dec2);
+
+ // Combine and verify that the combination includes first, third and default decorators
+ dec2.combine_with(dec1);
+ EXPECT_TRUE(dec2.is_decorator(decorator_array[0]));
+ EXPECT_TRUE(dec2.is_decorator(decorator_array[2]));
+ assert_default_decorators(&dec2, false);
+}
+
+TEST(LogDecorators, clear) {
+ // Start with default decorators and then clear it
+ LogDecorators dec;
+ EXPECT_FALSE(dec.is_empty());
+
+ dec.clear();
+ EXPECT_TRUE(dec.is_empty());
+ for (size_t i = 0; i < LogDecorators::Count; i++) {
+ EXPECT_FALSE(dec.is_decorator(decorator_array[i]));
+ }
+}
+
+// Test the decorator constant None
+TEST(LogDecorators, none) {
+ LogDecorators dec = LogDecorators::None;
+ for (size_t i = 0; i < LogDecorators::Count; i++) {
+ EXPECT_FALSE(dec.is_decorator(decorator_array[i]));
+ }
+}
+
+TEST(LogDecorators, is_empty) {
+ LogDecorators def, none = LogDecorators::None;
+ EXPECT_FALSE(def.is_empty());
+ EXPECT_TRUE(none.is_empty());
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/test_logFileOutput.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 2016, 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 "logging/logFileOutput.hpp"
+#include "memory/resourceArea.hpp"
+#include "runtime/os.hpp"
+#include "unittest.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include "utilities/ostream.hpp"
+
+static const char* name = "testlog.pid%p.%t.log";
+
+// Test parsing a bunch of valid file output options
+TEST(LogFileOutput, parse_valid) {
+ const char* valid_options[] = {
+ "", "filecount=10", "filesize=512",
+ "filecount=11,filesize=256",
+ "filesize=256,filecount=11",
+ "filesize=0", "filecount=1",
+ "filesize=1m", "filesize=1M",
+ "filesize=1k", "filesize=1G"
+ };
+
+ // Override LogOutput's vm_start time to get predictable file name
+ LogFileOutput::set_file_name_parameters(0);
+ char expected_filename[1 * K];
+ int ret = jio_snprintf(expected_filename, sizeof(expected_filename),
+ "testlog.pid%d.1970-01-01_01-00-00.log",
+ os::current_process_id());
+ ASSERT_GT(ret, 0) << "Buffer too small";
+
+ for (size_t i = 0; i < ARRAY_SIZE(valid_options); i++) {
+ ResourceMark rm;
+ stringStream ss;
+ {
+ LogFileOutput fo(name);
+ EXPECT_STREQ(name, fo.name());
+ EXPECT_TRUE(fo.initialize(valid_options[i], &ss))
+ << "Did not accept valid option(s) '" << valid_options[i] << "': " << ss.as_string();
+ }
+ remove(expected_filename);
+ }
+}
+
+// Test parsing a bunch of invalid file output options
+TEST(LogFileOutput, parse_invalid) {
+ const char* invalid_options[] = {
+ "invalidopt", "filecount=",
+ "filesize=,filecount=10",
+ "fileco=10", "ilesize=512",
+ "filecount=11,,filesize=256",
+ ",filesize=256,filecount=11",
+ "filesize=256,filecount=11,",
+ "filesize=-1", "filecount=0.1",
+ "filecount=-2", "filecount=2.0",
+ "filecount= 2", "filesize=2 ",
+ "filecount=ab", "filesize=0xz",
+ "filecount=1MB", "filesize=99bytes",
+ "filesize=9999999999999999999999999"
+ "filecount=9999999999999999999999999"
+ };
+
+ for (size_t i = 0; i < ARRAY_SIZE(invalid_options); i++) {
+ ResourceMark rm;
+ stringStream ss;
+ LogFileOutput fo(name);
+ EXPECT_FALSE(fo.initialize(invalid_options[i], &ss))
+ << "Accepted invalid option(s) '" << invalid_options[i] << "': " << ss.as_string();
+ }
+}
+
+// Test for overflows with filesize
+TEST(LogFileOutput, filesize_overflow) {
+ char buf[256];
+ int ret = jio_snprintf(buf, sizeof(buf), "filesize=" SIZE_FORMAT "K", SIZE_MAX);
+ ASSERT_GT(ret, 0) << "Buffer too small";
+
+ ResourceMark rm;
+ stringStream ss;
+ LogFileOutput fo(name);
+ EXPECT_FALSE(fo.initialize(buf, &ss)) << "Accepted filesize that overflows";
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/test_logLevel.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2016, 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 "logging/logLevel.hpp"
+#include "unittest.hpp"
+
+TEST(LogLevel, from_string) {
+ LogLevelType level;
+
+ // Verify each name defined in the LOG_LEVEL_LIST
+#define LOG_LEVEL(lname, lstring) \
+ level = LogLevel::from_string(#lstring); \
+ EXPECT_EQ(level, LogLevel::lname);
+ LOG_LEVEL_LIST
+#undef LOG_LEVEL
+
+ // Verify a few invalid level strings
+ EXPECT_EQ(LogLevel::Invalid, LogLevel::from_string("bad level"));
+ EXPECT_EQ(LogLevel::Invalid, LogLevel::from_string("debugger"));
+ EXPECT_EQ(LogLevel::Invalid, LogLevel::from_string("inf"));
+ EXPECT_EQ(LogLevel::Invalid, LogLevel::from_string("info "));
+ EXPECT_EQ(LogLevel::Invalid, LogLevel::from_string(" info"));
+ EXPECT_EQ(LogLevel::Invalid, LogLevel::from_string("=info"));
+ EXPECT_EQ(LogLevel::Invalid, LogLevel::from_string("infodebugwarning"));
+}
+
+TEST(LogLevel, name) {
+ // Use names from macro as reference
+#define LOG_LEVEL(lname, lstring) \
+ EXPECT_STREQ(LogLevel::name(LogLevel::lname), #lstring);
+ LOG_LEVEL_LIST
+#undef LOG_LEVEL
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/test_logOutputList.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,255 @@
+/*
+ * Copyright (c) 2016, 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 "logging/logLevel.hpp"
+#include "logging/logOutput.hpp"
+#include "logging/logOutputList.hpp"
+#include "runtime/os.hpp"
+#include "unittest.hpp"
+
+// Count the outputs in the given list, starting from the specified level
+static size_t output_count(LogOutputList* list, LogLevelType from = LogLevel::Error) {
+ size_t count = 0;
+ for (LogOutputList::Iterator it = list->iterator(from); it != list->end(); it++) {
+ count++;
+ }
+ return count;
+}
+
+// Get the level for an output in the given list
+static LogLevelType find_output_level(LogOutputList* list, LogOutput* o) {
+ for (size_t levelnum = 1; levelnum < LogLevel::Count; levelnum++) {
+ LogLevelType level = static_cast<LogLevelType>(levelnum);
+ for (LogOutputList::Iterator it = list->iterator(level); it != list->end(); it++) {
+ if (*it == o) {
+ return level;
+ }
+ }
+ }
+ return LogLevel::Off;
+}
+
+// Create a dummy output pointer with the specified id.
+// This dummy pointer should not be used for anything
+// but pointer comparisons with other dummies.
+static LogOutput* dummy_output(size_t id) {
+ return reinterpret_cast<LogOutput*>(id + 1);
+}
+
+// Randomly update and verify some outputs some number of times
+TEST(LogOutputList, set_output_level_update) {
+ const size_t TestOutputCount = 10;
+ const size_t TestIterations = 10000;
+ LogOutputList list;
+ size_t outputs_on_level[LogLevel::Count];
+ LogLevelType expected_level_for_output[TestOutputCount];
+
+ os::init_random(0x4711);
+ for (size_t i = 0; i < LogLevel::Count; i++) {
+ outputs_on_level[i] = 0;
+ }
+ outputs_on_level[LogLevel::Off] = TestOutputCount;
+ for (size_t i = 0; i < TestOutputCount; i++) {
+ expected_level_for_output[i] = LogLevel::Off;
+ }
+
+ for (size_t iteration = 0; iteration < TestIterations; iteration++) {
+ size_t output_idx = os::random() % TestOutputCount;
+ size_t levelnum = os::random() % LogLevel::Count;
+ LogLevelType level = static_cast<LogLevelType>(levelnum);
+
+ // Update the expectations
+ outputs_on_level[expected_level_for_output[output_idx]]--;
+ outputs_on_level[levelnum]++;
+ expected_level_for_output[output_idx] = level;
+
+ // Update the actual list
+ list.set_output_level(dummy_output(output_idx), level);
+
+ // Verify expected levels
+ for (size_t i = 0; i < TestOutputCount; i++) {
+ ASSERT_EQ(expected_level_for_output[i], find_output_level(&list, dummy_output(i)));
+ }
+ // Verify output counts
+ size_t expected_count = 0;
+ for (size_t i = 1; i < LogLevel::Count; i++) {
+ expected_count += outputs_on_level[i];
+ ASSERT_EQ(expected_count, output_count(&list, static_cast<LogLevelType>(i)));
+ }
+ ASSERT_EQ(TestOutputCount, expected_count + outputs_on_level[LogLevel::Off]);
+ }
+}
+
+// Test removing outputs from a LogOutputList
+TEST(LogOutputList, set_output_level_remove) {
+ LogOutputList list;
+
+ // Add three dummy outputs per loglevel
+ for (size_t i = 1; i < LogLevel::Count; i++) {
+ list.set_output_level(dummy_output(i), static_cast<LogLevelType>(i));
+ list.set_output_level(dummy_output(i*10), static_cast<LogLevelType>(i));
+ list.set_output_level(dummy_output(i*100), static_cast<LogLevelType>(i));
+ }
+
+ // Verify that they have been added successfully
+ // (Count - 1 since we don't count LogLevel::Off)
+ EXPECT_EQ(3u * (LogLevel::Count - 1), output_count(&list));
+ // Now remove the second output from each loglevel
+ for (size_t i = 1; i < LogLevel::Count; i++) {
+ list.set_output_level(dummy_output(i*10), LogLevel::Off);
+ }
+ // Make sure they have been successfully removed
+ EXPECT_EQ(2u * (LogLevel::Count - 1), output_count(&list));
+
+ // Now remove the remaining outputs
+ for (size_t i = 1; i < LogLevel::Count; i++) {
+ list.set_output_level(dummy_output(i), LogLevel::Off);
+ list.set_output_level(dummy_output(i*100), LogLevel::Off);
+ }
+ EXPECT_EQ(0u, output_count(&list));
+}
+
+// Test adding to a LogOutputList
+TEST(LogOutputList, set_output_level_add) {
+ LogOutputList list;
+
+ // First add 5 outputs to Info level
+ for (size_t i = 10; i < 15; i++) {
+ list.set_output_level(dummy_output(i), LogLevel::Info);
+ }
+
+ // Verify that they have been added successfully
+ size_t count = 0;
+ for (LogOutputList::Iterator it = list.iterator(); it != list.end(); it++) {
+ ASSERT_EQ(dummy_output(10 + count++), *it);
+ }
+ ASSERT_EQ(5u, count);
+
+ // Now add more outputs, but on all different levels
+ for (size_t i = 5; i < 10; i++) {
+ list.set_output_level(dummy_output(i), LogLevel::Warning);
+ }
+ for (size_t i = 0; i < 5; i++) {
+ list.set_output_level(dummy_output(i), LogLevel::Error);
+ }
+ for (size_t i = 15; i < 20; i++) {
+ list.set_output_level(dummy_output(i), LogLevel::Debug);
+ }
+ for (size_t i = 20; i < 25; i++) {
+ list.set_output_level(dummy_output(i), LogLevel::Trace);
+ }
+
+ // Verify that that all outputs have been added, and that the order is Error, Warning, Info, Debug, Trace
+ count = 0;
+ for (LogOutputList::Iterator it = list.iterator(); it != list.end(); it++) {
+ ASSERT_EQ(dummy_output(count++), *it);
+ }
+ ASSERT_EQ(25u, count);
+}
+
+// Test is_level() on lists with a single output on different levels
+TEST(LogOutputList, is_level_single_output) {
+ for (size_t i = LogLevel::First; i < LogLevel::Count; i++) {
+ LogLevelType level = static_cast<LogLevelType>(i);
+ LogOutputList list;
+ list.set_output_level(LogOutput::Stdout, level);
+ for (size_t j = LogLevel::First; j < LogLevel::Count; j++) {
+ LogLevelType other = static_cast<LogLevelType>(j);
+ // Verify that levels finer than the current level for stdout are reported as disabled,
+ // and levels equal to or included in the current level are reported as enabled
+ if (other >= level) {
+ EXPECT_TRUE(list.is_level(other))
+ << LogLevel::name(other) << " >= " << LogLevel::name(level) << " but is_level() returns false";
+ } else {
+ EXPECT_FALSE(list.is_level(other))
+ << LogLevel::name(other) << " < " << LogLevel::name(level) << " but is_level() returns true";
+ }
+ }
+ }
+}
+
+// Test is_level() with an empty list
+TEST(LogOutputList, is_level_empty) {
+ LogOutputList emptylist;
+ for (size_t i = LogLevel::First; i < LogLevel::Count; i++) {
+ LogLevelType other = static_cast<LogLevelType>(i);
+ EXPECT_FALSE(emptylist.is_level(other)) << "is_level() returns true even though the list is empty";
+ }
+}
+
+// Test is_level() on lists with two outputs on different levels
+TEST(LogOutputList, is_level_multiple_outputs) {
+ for (size_t i = LogLevel::First; i < LogLevel::Count - 1; i++) {
+ LogOutput* dummy1 = LogOutput::Stdout;
+ LogOutput* dummy2 = LogOutput::Stderr;
+ LogLevelType first = static_cast<LogLevelType>(i);
+ LogLevelType second = static_cast<LogLevelType>(i + 1);
+ LogOutputList list;
+ list.set_output_level(dummy1, first);
+ list.set_output_level(dummy2, second);
+ for (size_t j = LogLevel::First; j < LogLevel::Count; j++) {
+ LogLevelType other = static_cast<LogLevelType>(j);
+ // The first output's level will be the finest, expect it's level to be reported by the list
+ if (other >= first) {
+ EXPECT_TRUE(list.is_level(other))
+ << LogLevel::name(other) << " >= " << LogLevel::name(first) << " but is_level() returns false";
+ } else {
+ EXPECT_FALSE(list.is_level(other))
+ << LogLevel::name(other) << " < " << LogLevel::name(first) << " but is_level() returns true";
+ }
+ }
+ }
+}
+
+TEST(LogOutputList, level_for) {
+ LogOutputList list;
+
+ // Ask the empty list about stdout, stderr
+ EXPECT_EQ(LogLevel::Off, list.level_for(LogOutput::Stdout));
+ EXPECT_EQ(LogLevel::Off, list.level_for(LogOutput::Stderr));
+
+ // Ask for level in a list with two outputs on different levels
+ list.set_output_level(LogOutput::Stdout, LogLevel::Info);
+ list.set_output_level(LogOutput::Stderr, LogLevel::Trace);
+ EXPECT_EQ(LogLevel::Info, list.level_for(LogOutput::Stdout));
+ EXPECT_EQ(LogLevel::Trace, list.level_for(LogOutput::Stderr));
+
+ // Remove and ask again
+ list.set_output_level(LogOutput::Stdout, LogLevel::Off);
+ EXPECT_EQ(LogLevel::Off, list.level_for(LogOutput::Stdout));
+ EXPECT_EQ(LogLevel::Trace, list.level_for(LogOutput::Stderr));
+
+ // Ask about an unknown output
+ LogOutput* dummy = dummy_output(4711);
+ EXPECT_EQ(LogLevel::Off, list.level_for(dummy));
+
+ for (size_t i = LogLevel::First; i <= LogLevel::Last; i++) {
+ LogLevelType level = static_cast<LogLevelType>(i);
+ list.set_output_level(dummy, level);
+ EXPECT_EQ(level, list.level_for(dummy));
+ }
+
+ // Make sure the stderr level is still the same
+ EXPECT_EQ(LogLevel::Trace, list.level_for(LogOutput::Stderr));
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/test_logTag.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2016, 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 "logging/logTag.hpp"
+#include "unittest.hpp"
+
+TEST(LogTag, from_string) {
+ // Verify for all tags defined in LOG_TAG_LIST
+#define LOG_TAG(tag) \
+ EXPECT_EQ(PREFIX_LOG_TAG(tag), LogTag::from_string(#tag));
+ LOG_TAG_LIST
+#undef LOG_TAG
+
+ // Verify a couple of invalid strings parsing as invalid tags
+ const char* invalid_tag[] = {
+ "bad tag", ".^@", "**", "*", "gcc", "+gc", "gc+", "gc+safepoint",
+ "gc+safepoint=warning", "warning", "=info", "gcsafepointlogging",
+ "gc+safepointlogging", "gclogging", "+", " gc", "logging ", ","
+ };
+ for (size_t i = 0; i < sizeof(invalid_tag) / sizeof(*invalid_tag); i++) {
+ EXPECT_EQ(LogTag::__NO_TAG, LogTag::from_string(invalid_tag[i]))
+ << "'" << invalid_tag[i] << "' did not parse as an invalid tag";
+ }
+}
+
+TEST(LogTag, name) {
+ // Verify for each tag from the macro
+#define LOG_TAG(tag) \
+ EXPECT_STREQ(#tag, LogTag::name(PREFIX_LOG_TAG(tag)));
+ LOG_TAG_LIST
+#undef LOG_TAG
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/test_logTagLevelExpression.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,183 @@
+/*
+ * Copyright (c) 2016, 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 "logging/logLevel.hpp"
+#include "logging/logTagLevelExpression.hpp"
+#include "logging/logTagSet.hpp"
+#include "unittest.hpp"
+#include "utilities/globalDefinitions.hpp"
+
+TEST(LogTagLevelExpression, parse) {
+ char buf[256];
+ const char* invalid_substr[] = {
+ "=", "+", " ", "+=", "+=*", "*+", " +", "**", "++", ".", ",", ",," ",+",
+ " *", "all+", "all*", "+all", "+all=Warning", "==Info", "=InfoWarning",
+ "BadTag+", "logging++", "logging*+", ",=", "gc+gc+gc+gc+gc+gc"
+ };
+ const char* valid_expression[] = {
+ "all", "gc", "gc,logging", "gc+logging", "logging+gc", "logging+gc,gc", "logging+gc*", "gc=trace",
+ "gc=trace,logging=info", "logging+gc=trace", "logging+gc=trace,gc+logging=warning,logging",
+ "gc,all=info", "logging*", "logging*=info", "gc+logging*=error", "logging*,gc=info"
+ };
+
+ // Verify valid expressions parse without problems
+ for (size_t i = 0; i < ARRAY_SIZE(valid_expression); i++) {
+ LogTagLevelExpression expr;
+ EXPECT_TRUE(expr.parse(valid_expression[i])) << "Valid expression '" << valid_expression[i] << "' did not parse";
+ }
+
+ // Verify we can use 'all' with each available level
+ for (uint level = LogLevel::First; level <= LogLevel::Last; level++) {
+ char buf[32];
+ int ret = jio_snprintf(buf, sizeof(buf), "all=%s", LogLevel::name(static_cast<LogLevelType>(level)));
+ ASSERT_NE(ret, -1);
+
+ LogTagLevelExpression expr;
+ EXPECT_TRUE(expr.parse(buf));
+ }
+
+ // Verify invalid expressions do not parse
+ for (size_t i = 0; i < ARRAY_SIZE(valid_expression); i++) {
+ for (size_t j = 0; j < ARRAY_SIZE(invalid_substr); j++) {
+ // Prefix with invalid substr
+ LogTagLevelExpression expr;
+ jio_snprintf(buf, sizeof(buf), "%s%s", invalid_substr[j], valid_expression[i]);
+ EXPECT_FALSE(expr.parse(buf)) << "'" << buf << "'" << " considered legal";
+
+ // Suffix with invalid substr
+ LogTagLevelExpression expr1;
+ jio_snprintf(buf, sizeof(buf), "%s%s", valid_expression[i], invalid_substr[j]);
+ EXPECT_FALSE(expr1.parse(buf)) << "'" << buf << "'" << " considered legal";
+
+ // Use only the invalid substr
+ LogTagLevelExpression expr2;
+ EXPECT_FALSE(expr2.parse(invalid_substr[j])) << "'" << invalid_substr[j] << "'" << " considered legal";
+ }
+
+ // Suffix/prefix with some unique invalid prefixes/suffixes
+ LogTagLevelExpression expr;
+ jio_snprintf(buf, sizeof(buf), "*%s", valid_expression[i]);
+ EXPECT_FALSE(expr.parse(buf)) << "'" << buf << "'" << " considered legal";
+
+ LogTagLevelExpression expr1;
+ jio_snprintf(buf, sizeof(buf), "logging*%s", valid_expression[i]);
+ EXPECT_FALSE(expr1.parse(buf)) << "'" << buf << "'" << " considered legal";
+ }
+}
+
+// Test the level_for() function for an empty expression
+TEST(LogTagLevelExpression, level_for_empty) {
+ LogTagLevelExpression emptyexpr;
+ ASSERT_TRUE(emptyexpr.parse(""));
+ // All tagsets should be unspecified since the expression doesn't involve any tagset
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_EQ(LogLevel::Unspecified, emptyexpr.level_for(*ts));
+ }
+}
+
+// Test level_for() with "all" without any specified level
+TEST(LogTagLevelExpression, level_for_all) {
+ LogTagLevelExpression allexpr;
+ ASSERT_TRUE(allexpr.parse("all"));
+ // Level will be unspecified since no level was given
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_EQ(LogLevel::Unspecified, allexpr.level_for(*ts));
+ }
+}
+
+// Test level_for() with "all=debug"
+TEST(LogTagLevelExpression, level_for_all_debug) {
+ LogTagLevelExpression alldebugexpr;
+ ASSERT_TRUE(alldebugexpr.parse("all=debug"));
+ // All tagsets should report debug level
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_EQ(LogLevel::Debug, alldebugexpr.level_for(*ts));
+ }
+}
+
+// Test level_for() with "all=off"
+TEST(LogTagLevelExpression, level_for_all_off) {
+ LogTagLevelExpression alloffexpr;
+ ASSERT_TRUE(alloffexpr.parse("all=off"));
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ EXPECT_EQ(LogLevel::Off, alloffexpr.level_for(*ts));
+ }
+}
+
+// Test level_for() with an expression that has overlap (last subexpression should be used)
+TEST(LogTagLevelExpression, level_for_overlap) {
+ LogTagLevelExpression overlapexpr;
+ // The all=warning will be overridden with gc=info and/or logging+safepoint*=trace
+ ASSERT_TRUE(overlapexpr.parse("all=warning,gc=info,logging+safepoint*=trace"));
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ if (ts->contains(PREFIX_LOG_TAG(gc)) && ts->ntags() == 1) {
+ EXPECT_EQ(LogLevel::Info, overlapexpr.level_for(*ts));
+ } else if (ts->contains(PREFIX_LOG_TAG(logging)) && ts->contains(PREFIX_LOG_TAG(safepoint))) {
+ EXPECT_EQ(LogLevel::Trace, overlapexpr.level_for(*ts));
+ } else {
+ EXPECT_EQ(LogLevel::Warning, overlapexpr.level_for(*ts));
+ }
+ }
+ EXPECT_EQ(LogLevel::Warning, overlapexpr.level_for(LogTagSetMapping<LOG_TAGS(class)>::tagset()));
+ EXPECT_EQ(LogLevel::Info, overlapexpr.level_for(LogTagSetMapping<LOG_TAGS(gc)>::tagset()));
+ EXPECT_EQ(LogLevel::Trace, overlapexpr.level_for(LogTagSetMapping<LOG_TAGS(logging, safepoint)>::tagset()));
+ EXPECT_EQ(LogLevel::Trace,
+ overlapexpr.level_for(LogTagSetMapping<LOG_TAGS(logging, gc, class, safepoint, heap)>::tagset()));
+}
+
+// Test level_for() with an expression containing two independent subexpressions
+TEST(LogTagLevelExpression, level_for_disjoint) {
+ LogTagLevelExpression reducedexpr;
+ ASSERT_TRUE(reducedexpr.parse("gc+logging=trace,class*=error"));
+ EXPECT_EQ(LogLevel::Error, reducedexpr.level_for(LogTagSetMapping<LOG_TAGS(class)>::tagset()));
+ EXPECT_EQ(LogLevel::Error, reducedexpr.level_for(LogTagSetMapping<LOG_TAGS(safepoint, class)>::tagset()));
+ EXPECT_EQ(LogLevel::NotMentioned, reducedexpr.level_for(LogTagSetMapping<LOG_TAGS(safepoint)>::tagset()));
+ EXPECT_EQ(LogLevel::NotMentioned, reducedexpr.level_for(LogTagSetMapping<LOG_TAGS(logging)>::tagset()));
+ EXPECT_EQ(LogLevel::NotMentioned, reducedexpr.level_for(LogTagSetMapping<LOG_TAGS(gc)>::tagset()));
+ EXPECT_EQ(LogLevel::Trace, reducedexpr.level_for(LogTagSetMapping<LOG_TAGS(logging, gc)>::tagset()));
+}
+
+// Test level_for() with an expression that is completely overridden in the last part of the expression
+TEST(LogTagLevelExpression, level_for_override) {
+ LogTagLevelExpression overrideexpr;
+ // No matter what, everything should be set to error level because of the last part
+ ASSERT_TRUE(overrideexpr.parse("logging,gc*=trace,all=error"));
+ EXPECT_EQ(LogLevel::Error, overrideexpr.level_for(LogTagSetMapping<LOG_TAGS(class)>::tagset()));
+ EXPECT_EQ(LogLevel::Error, overrideexpr.level_for(LogTagSetMapping<LOG_TAGS(logging)>::tagset()));
+ EXPECT_EQ(LogLevel::Error, overrideexpr.level_for(LogTagSetMapping<LOG_TAGS(gc)>::tagset()));
+ EXPECT_EQ(LogLevel::Error, overrideexpr.level_for(LogTagSetMapping<LOG_TAGS(logging, gc)>::tagset()));
+}
+
+// Test level_for() with a mixed expression with a bit of everything
+TEST(LogTagLevelExpression, level_for_mixed) {
+ LogTagLevelExpression mixedexpr;
+ ASSERT_TRUE(mixedexpr.parse("all=warning,gc*=debug,gc=trace,safepoint*=off"));
+ EXPECT_EQ(LogLevel::Warning, mixedexpr.level_for(LogTagSetMapping<LOG_TAGS(logging)>::tagset()));
+ EXPECT_EQ(LogLevel::Warning, mixedexpr.level_for(LogTagSetMapping<LOG_TAGS(logging, class)>::tagset()));
+ EXPECT_EQ(LogLevel::Debug, mixedexpr.level_for(LogTagSetMapping<LOG_TAGS(gc, class)>::tagset()));
+ EXPECT_EQ(LogLevel::Off, mixedexpr.level_for(LogTagSetMapping<LOG_TAGS(gc, safepoint, logging)>::tagset()));
+ EXPECT_EQ(LogLevel::Off, mixedexpr.level_for(LogTagSetMapping<LOG_TAGS(safepoint)>::tagset()));
+ EXPECT_EQ(LogLevel::Debug, mixedexpr.level_for(LogTagSetMapping<LOG_TAGS(logging, gc)>::tagset()));
+ EXPECT_EQ(LogLevel::Trace, mixedexpr.level_for(LogTagSetMapping<LOG_TAGS(gc)>::tagset()));
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/logging/test_logTagSet.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,130 @@
+/*
+ * Copyright (c) 2016, 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
+ * ac_heapanied 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 "logging/logLevel.hpp"
+#include "logging/logOutput.hpp"
+#include "logging/logTag.hpp"
+#include "logging/logTagSet.hpp"
+#include "unittest.hpp"
+
+// Test the default level for each tagset
+TEST(LogTagSet, defaults) {
+ for (LogTagSet* ts = LogTagSet::first(); ts != NULL; ts = ts->next()) {
+ char buf[256];
+ ts->label(buf, sizeof(buf));
+ SCOPED_TRACE(buf);
+ EXPECT_TRUE(ts->is_level(LogLevel::Error));
+ EXPECT_TRUE(ts->is_level(LogLevel::Warning));
+ EXPECT_FALSE(ts->is_level(LogLevel::Info));
+ EXPECT_TRUE(ts->has_output(LogOutput::Stdout));
+ EXPECT_FALSE(ts->has_output(LogOutput::Stderr));
+ }
+}
+
+TEST(LogTagSet, has_output) {
+ LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
+ ts.set_output_level(LogOutput::Stderr, LogLevel::Trace);
+ EXPECT_TRUE(ts.has_output(LogOutput::Stderr));
+ EXPECT_FALSE(ts.has_output(NULL));
+ ts.set_output_level(LogOutput::Stderr, LogLevel::Off);
+ EXPECT_FALSE(ts.has_output(LogOutput::Stderr));
+}
+
+TEST(LogTagSet, ntags) {
+ const LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
+ EXPECT_EQ(1u, ts.ntags());
+ const LogTagSet& ts2 = LogTagSetMapping<LOG_TAGS(logging, gc, class, safepoint, heap)>::tagset();
+ EXPECT_EQ(5u, ts2.ntags());
+}
+
+TEST(LogTagSet, is_level) {
+ LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
+ // Set info level on stdout and verify that is_level() reports correctly
+ ts.set_output_level(LogOutput::Stdout, LogLevel::Info);
+ EXPECT_TRUE(ts.is_level(LogLevel::Error));
+ EXPECT_TRUE(ts.is_level(LogLevel::Warning));
+ EXPECT_TRUE(ts.is_level(LogLevel::Info));
+ EXPECT_FALSE(ts.is_level(LogLevel::Debug));
+ EXPECT_FALSE(ts.is_level(LogLevel::Trace));
+ ts.set_output_level(LogOutput::Stdout, LogLevel::Default);
+ EXPECT_TRUE(ts.is_level(LogLevel::Default));
+}
+
+TEST(LogTagSet, level_for) {
+ LogOutput* output = LogOutput::Stdout;
+ LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
+ for (uint i = 0; i < LogLevel::Count; i++) {
+ LogLevelType level = static_cast<LogLevelType>(i);
+ // Set the level and verify that level_for() reports it back
+ ts.set_output_level(output, level);
+ EXPECT_EQ(level, ts.level_for(output));
+ }
+ ts.set_output_level(output, LogLevel::Default);
+}
+
+TEST(LogTagSet, contains) {
+ // Verify that contains works as intended for a few predetermined tagsets
+ const LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
+ EXPECT_TRUE(ts.contains(PREFIX_LOG_TAG(logging)));
+ EXPECT_FALSE(ts.contains(PREFIX_LOG_TAG(gc)));
+ EXPECT_FALSE(ts.contains(PREFIX_LOG_TAG(class)));
+
+ const LogTagSet& ts2 = LogTagSetMapping<LOG_TAGS(logging, gc)>::tagset();
+ EXPECT_TRUE(ts2.contains(PREFIX_LOG_TAG(logging)));
+ EXPECT_TRUE(ts2.contains(PREFIX_LOG_TAG(gc)));
+ EXPECT_FALSE(ts2.contains(PREFIX_LOG_TAG(class)));
+
+ const LogTagSet& ts3 = LogTagSetMapping<LOG_TAGS(logging, gc, class)>::tagset();
+ EXPECT_TRUE(ts3.contains(PREFIX_LOG_TAG(logging)));
+ EXPECT_TRUE(ts3.contains(PREFIX_LOG_TAG(gc)));
+ EXPECT_TRUE(ts3.contains(PREFIX_LOG_TAG(class)));
+ EXPECT_FALSE(ts3.contains(PREFIX_LOG_TAG(safepoint)));
+
+ const LogTagSet& ts4 = LogTagSetMapping<LOG_TAGS(logging, gc, class, safepoint, heap)>::tagset();
+ EXPECT_TRUE(ts4.contains(PREFIX_LOG_TAG(logging)));
+ EXPECT_TRUE(ts4.contains(PREFIX_LOG_TAG(gc)));
+ EXPECT_TRUE(ts4.contains(PREFIX_LOG_TAG(class)));
+ EXPECT_TRUE(ts4.contains(PREFIX_LOG_TAG(safepoint)));
+ EXPECT_TRUE(ts4.contains(PREFIX_LOG_TAG(heap)));
+}
+
+TEST(LogTagSet, label) {
+ char buf[256];
+ const LogTagSet& ts = LogTagSetMapping<LOG_TAGS(logging, safepoint)>::tagset();
+ ASSERT_NE(-1, ts.label(buf, sizeof(buf)));
+ EXPECT_STREQ("logging,safepoint", buf);
+ // Verify using a custom separator
+ ASSERT_NE(-1, ts.label(buf, sizeof(buf), "++"));
+ EXPECT_STREQ("logging++safepoint", buf);
+
+ // Verify with three tags
+ const LogTagSet& ts1 = LogTagSetMapping<LOG_TAGS(logging, safepoint, jni)>::tagset();
+ ASSERT_NE(-1, ts1.label(buf, sizeof(buf)));
+ EXPECT_STREQ("logging,safepoint,jni", buf);
+
+ // Verify with a single tag
+ const LogTagSet& ts2 = LogTagSetMapping<LOG_TAGS(logging)>::tagset();
+ ASSERT_NE(-1, ts2.label(buf, sizeof(buf)));
+ EXPECT_STREQ("logging", buf);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/native/utilities/test_bitMap_setops.cpp Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,417 @@
+/*
+ * Copyright (c) 2016, 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 "utilities/bitMap.inline.hpp"
+#include "utilities/copy.hpp"
+#include "utilities/debug.hpp"
+#include "utilities/globalDefinitions.hpp"
+#include <stdlib.h>
+#include "unittest.hpp"
+
+typedef BitMap::idx_t idx_t;
+typedef BitMap::bm_word_t bm_word_t;
+
+class BitMapMemory {
+private:
+ idx_t _words;
+ bm_word_t* _memory;
+
+public:
+ BitMapMemory(idx_t bits) :
+ _words(BitMap::calc_size_in_words(bits)),
+ _memory(static_cast<bm_word_t*>(malloc(_words * sizeof(bm_word_t))))
+ { }
+
+ ~BitMapMemory() {
+ free(_memory);
+ }
+
+ BitMapView make_view(idx_t bits, bm_word_t value) {
+ vmassert(BitMap::calc_size_in_words(bits) <= _words, "invalid request");
+ STATIC_ASSERT(sizeof(bm_word_t) == sizeof(HeapWord));
+ Copy::fill_to_aligned_words((HeapWord*)_memory, _words, value);
+ return BitMapView(_memory, bits);
+ }
+
+ bm_word_t* memory() { return _memory; }
+};
+
+const idx_t aligned_size = 4 * BitsPerWord;
+const idx_t unaligned_size = aligned_size - (BitsPerWord / 2);
+
+static bm_word_t make_even_bits() {
+ bm_word_t result = 1;
+ while (true) {
+ bm_word_t next = (result << 2) | 1;
+ if (next == result) {
+ return result;
+ }
+ result = next;
+ }
+}
+
+const bm_word_t even_bits = make_even_bits();
+const bm_word_t odd_bits = ~even_bits;
+const bm_word_t one_bits = ~bm_word_t(0);
+const bm_word_t zero_bits = 0;
+
+// Scoped set a clear bit and restore to clear.
+class WithBitSet {
+private:
+ BitMap& _bm;
+ idx_t _index;
+
+public:
+ WithBitSet(BitMap& bm, idx_t index) : _bm(bm), _index(index) {
+ // Failure may indicate test bug; can't use ASSERT_xxx in constructor.
+ EXPECT_FALSE(_bm.at(_index));
+ bm.set_bit(_index);
+ }
+
+ ~WithBitSet() {
+ _bm.clear_bit(_index);
+ }
+};
+
+// Scoped clear a set bit and restore to set.
+class WithBitClear {
+private:
+ BitMap& _bm;
+ idx_t _index;
+
+public:
+ WithBitClear(BitMap& bm, idx_t index) : _bm(bm), _index(index) {
+ // Failure may indicate test bug; can't use ASSERT_xxx in constructor.
+ EXPECT_TRUE(_bm.at(_index));
+ bm.clear_bit(_index);
+ }
+
+ ~WithBitClear() {
+ _bm.set_bit(_index);
+ }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+// bool is_same(const BitMap& bits);
+
+TEST(BitMap, is_same__aligned) {
+ BitMapMemory mx(aligned_size);
+ BitMapMemory my(aligned_size);
+
+ BitMapView x = mx.make_view(aligned_size, even_bits);
+ BitMapView y = my.make_view(aligned_size, even_bits);
+ EXPECT_TRUE(x.is_same(y));
+
+ WithBitClear wbc(x, aligned_size / 2);
+ EXPECT_FALSE(x.is_same(y));
+}
+
+TEST(BitMap, is_same__unaligned) {
+ BitMapMemory mx(aligned_size);
+ BitMapMemory my(aligned_size);
+
+ BitMapView x = mx.make_view(unaligned_size, even_bits);
+ BitMapView y = my.make_view(unaligned_size, even_bits);
+
+ // Check that a difference beyond the end of x/y doesn't count.
+ {
+ BitMapView aligned = BitMapView(mx.memory(), aligned_size);
+ const idx_t index = aligned_size - 2;
+ STATIC_ASSERT(unaligned_size <= index);
+
+ WithBitClear wbc(aligned, index);
+ EXPECT_TRUE(x.is_same(y));
+ }
+
+ // Check that a difference in the final partial word does count.
+ {
+ idx_t index = unaligned_size - 2;
+ ASSERT_LE(BitMap::word_align_down(unaligned_size), index);
+
+ WithBitClear wbc(y, index);
+ EXPECT_FALSE(x.is_same(y));
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// bool is_full();
+// bool is_empty();
+
+TEST(BitMap, is_full_or_empty__aligned) {
+ BitMapMemory mx(aligned_size);
+
+ {
+ BitMapView x = mx.make_view(aligned_size, even_bits);
+ EXPECT_FALSE(x.is_full());
+ EXPECT_FALSE(x.is_empty());
+ }
+
+ {
+ BitMapView x = mx.make_view(aligned_size, zero_bits);
+ EXPECT_FALSE(x.is_full());
+ EXPECT_TRUE(x.is_empty());
+ }
+
+ {
+ BitMapView x = mx.make_view(aligned_size, one_bits);
+ EXPECT_TRUE(x.is_full());
+ EXPECT_FALSE(x.is_empty());
+ }
+}
+
+TEST(BitMap, is_full__unaligned) {
+ BitMapMemory mx(aligned_size);
+
+ BitMapView x = mx.make_view(unaligned_size, one_bits);
+ EXPECT_TRUE(x.is_full());
+
+ // Check that a missing bit beyond the end doesn't count.
+ {
+ idx_t index = aligned_size - 1;
+ BitMapView aligned = BitMapView(mx.memory(), aligned_size);
+
+ WithBitClear wcb(aligned, index);
+ EXPECT_FALSE(aligned.is_full());
+ EXPECT_TRUE(x.is_full());
+ }
+
+ // Check that a missing bit in the final partial word does count.
+ {
+ WithBitClear wcb(x, unaligned_size - 1);
+ EXPECT_FALSE(x.is_full());
+ }
+}
+
+TEST(BitMap, is_empty__unaligned) {
+ BitMapMemory mx(aligned_size);
+
+ BitMapView x = mx.make_view(unaligned_size, zero_bits);
+ EXPECT_TRUE(x.is_empty());
+
+ // Check that a set bit beyond the end doesn't count.
+ {
+ idx_t index = aligned_size - 1;
+ BitMapView aligned = BitMapView(mx.memory(), aligned_size);
+
+ WithBitSet wbs(aligned, index);
+ EXPECT_FALSE(aligned.is_empty());
+ EXPECT_TRUE(x.is_empty());
+ }
+
+ // Check that a set bit in the final partial word does count.
+ {
+ WithBitSet wbs(x, unaligned_size - 1);
+ EXPECT_FALSE(x.is_empty());
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// bool contains(const BitMap& bits);
+
+TEST(BitMap, contains__aligned) {
+ BitMapMemory mx(aligned_size);
+ BitMapMemory my(aligned_size);
+
+ BitMapView x = mx.make_view(aligned_size, even_bits);
+ BitMapView y = my.make_view(aligned_size, even_bits);
+ EXPECT_TRUE(x.contains(y));
+
+ WithBitClear wbc(x, aligned_size / 2);
+ EXPECT_FALSE(x.contains(y));
+}
+
+TEST(BitMap, contains__unaligned) {
+ BitMapMemory mx(aligned_size);
+ BitMapMemory my(aligned_size);
+
+ BitMapView x = mx.make_view(unaligned_size, even_bits);
+ BitMapView y = my.make_view(unaligned_size, even_bits);
+
+ // Check that a missing bit beyond the end of x doesn't count.
+ {
+ BitMapView aligned = BitMapView(mx.memory(), aligned_size);
+ const idx_t index = aligned_size - 2;
+ STATIC_ASSERT(unaligned_size <= index);
+
+ WithBitClear wbc(aligned, index);
+ EXPECT_TRUE(x.contains(y));
+ }
+
+ // Check that a missing bit in the final partial word does count.
+ {
+ idx_t index = unaligned_size - 2;
+ ASSERT_LE(BitMap::word_align_down(unaligned_size), index);
+
+ WithBitClear wbc(x, index);
+ EXPECT_FALSE(x.contains(y));
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// bool intersects(const BitMap& bits);
+
+TEST(BitMap, intersects__aligned) {
+ BitMapMemory mx(aligned_size);
+ BitMapMemory my(aligned_size);
+
+ BitMapView x = mx.make_view(aligned_size, even_bits);
+ BitMapView y = my.make_view(aligned_size, zero_bits);
+ EXPECT_FALSE(x.intersects(y));
+
+ ASSERT_TRUE(x.at(aligned_size / 2));
+ WithBitSet wbs(y, aligned_size / 2);
+ EXPECT_TRUE(x.intersects(y));
+}
+
+TEST(BitMap, intersects__unaligned) {
+ BitMapMemory mx(aligned_size);
+ BitMapMemory my(aligned_size);
+
+ BitMapView x = mx.make_view(unaligned_size, even_bits);
+ BitMapView y = my.make_view(unaligned_size, zero_bits);
+ EXPECT_FALSE(x.intersects(y));
+
+ // Check that adding a bit beyond the end of y doesn't count.
+ {
+ BitMapView aligned_x = BitMapView(mx.memory(), aligned_size);
+ BitMapView aligned_y = BitMapView(my.memory(), aligned_size);
+ const idx_t index = aligned_size - 2;
+ STATIC_ASSERT(unaligned_size <= index);
+ ASSERT_TRUE(aligned_x.at(index));
+
+ WithBitSet wbs(aligned_y, index);
+ EXPECT_FALSE(x.intersects(y));
+ }
+
+ // Check that adding a bit in the final partial word does count.
+ {
+ idx_t index = unaligned_size - 2;
+ ASSERT_LE(BitMap::word_align_down(unaligned_size), index);
+ ASSERT_TRUE(x.at(index));
+
+ WithBitSet wbs(y, index);
+ EXPECT_TRUE(x.intersects(y));
+ }
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// void set_from(const BitMap& bits);
+// void set_union(const BitMap& bits);
+// void set_difference(const BitMap& bits);
+// void set_intersection(const BitMap& bits);
+//
+// bool set_union_with_result(const BitMap& bits);
+// bool set_difference_with_result(const BitMap& bits);
+// bool set_intersection_with_result(const BitMap& bits);
+
+static void check_tail_unmodified(BitMapMemory& mem,
+ idx_t bits,
+ bm_word_t fill_word) {
+ if (!BitMap::is_word_aligned(bits)) {
+ idx_t last_word_bit_index = BitMap::word_align_down(bits);
+ idx_t last_word_index = BitMap::calc_size_in_words(last_word_bit_index);
+ bm_word_t last_word = mem.memory()[last_word_index];
+ idx_t shift = bits - last_word_bit_index;
+ EXPECT_EQ(fill_word >> shift, last_word >> shift);
+ }
+}
+
+static void check_mod_setop(void (BitMap::*f)(const BitMap&),
+ idx_t bits,
+ bm_word_t wx,
+ bm_word_t wy,
+ bm_word_t wexp) {
+ BitMapMemory mx(bits);
+ BitMapMemory my(bits);
+ BitMapMemory mexp(bits);
+
+ BitMapView x = mx.make_view(bits, wx);
+ BitMapView y = my.make_view(bits, wy);
+ BitMapView exp = mexp.make_view(bits, wexp);
+
+ (x.*f)(y);
+
+ EXPECT_TRUE(exp.is_same(x));
+ check_tail_unmodified(mx, bits, wx);
+}
+
+static void check_mod_setop_with_result(bool (BitMap::*f)(const BitMap&),
+ idx_t bits,
+ bm_word_t wx,
+ bm_word_t wy,
+ bm_word_t wexp) {
+ BitMapMemory mx(bits);
+ BitMapMemory my(bits);
+ BitMapMemory mexp(bits);
+
+ BitMapView x = mx.make_view(bits, wx);
+ BitMapView y = my.make_view(bits, wy);
+ BitMapView exp = mexp.make_view(bits, wexp);
+
+ bool value = (x.*f)(y);
+ EXPECT_EQ(value, wx != wexp);
+
+ EXPECT_TRUE(exp.is_same(x));
+ check_tail_unmodified(mx, bits, wx);
+}
+
+#define CHECK_MOD_SETOP_AUX(checker, name, x, y, exp) \
+ TEST(BitMap, name ## __ ## x ## _ ## y) { \
+ checker(&BitMap::name, aligned_size, \
+ x ## _bits, y ## _bits, exp ## _bits); \
+ checker(&BitMap::name, unaligned_size, \
+ x ## _bits, y ## _bits, exp ## _bits); \
+ }
+
+#define CHECK_MOD_SETOP(name, x, y, exp) \
+ CHECK_MOD_SETOP_AUX(check_mod_setop, name, x, y, exp)
+
+#define CHECK_MOD_SETOP_WITH_RESULT(name, x, y, exp) \
+ CHECK_MOD_SETOP_AUX(check_mod_setop_with_result, name, x, y, exp)
+
+#define CHECK_MOD_SETOPS(name, x, y, exp) \
+ CHECK_MOD_SETOP(name, x, y, exp) \
+ CHECK_MOD_SETOP_WITH_RESULT(name ## _with_result, x, y, exp)
+
+CHECK_MOD_SETOP(set_from, even, even, even)
+CHECK_MOD_SETOP(set_from, even, odd, odd)
+CHECK_MOD_SETOP(set_from, even, one, one)
+CHECK_MOD_SETOP(set_from, even, zero, zero)
+
+CHECK_MOD_SETOPS(set_union, even, even, even)
+CHECK_MOD_SETOPS(set_union, even, odd, one)
+CHECK_MOD_SETOPS(set_union, even, one, one)
+CHECK_MOD_SETOPS(set_union, even, zero, even)
+
+CHECK_MOD_SETOPS(set_difference, even, even, zero)
+CHECK_MOD_SETOPS(set_difference, even, odd, even)
+CHECK_MOD_SETOPS(set_difference, even, one, zero)
+CHECK_MOD_SETOPS(set_difference, even, zero, even)
+
+CHECK_MOD_SETOPS(set_intersection, even, even, even)
+CHECK_MOD_SETOPS(set_intersection, even, odd, zero)
+CHECK_MOD_SETOPS(set_intersection, even, one, even)
+CHECK_MOD_SETOPS(set_intersection, even, zero, zero)
+
--- a/hotspot/test/runtime/8026365/InvokeSpecialAnonTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/8026365/InvokeSpecialAnonTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 8026365
* @summary Test invokespecial of host class method from an anonymous class
* @author Robert Field
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* @compile -XDignore.symbol.file InvokeSpecialAnonTest.java
--- a/hotspot/test/runtime/BadObjectClass/BootstrapRedefine.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/BadObjectClass/BootstrapRedefine.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,13 +25,15 @@
* @test
* @bug 6583051
* @summary Give error if java.lang.Object has been incompatibly overridden on the bootpath
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main BootstrapRedefine
*/
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class BootstrapRedefine {
--- a/hotspot/test/runtime/BoolReturn/NativeSmallIntCallsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/BoolReturn/NativeSmallIntCallsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @bug 8149170
* @summary Test native functions return booleans as 0/1 but differently than java functions
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @compile BoolConstructor.java
* @run main/native NativeSmallIntCallsTest
*/
--- a/hotspot/test/runtime/BootClassAppendProp/BootClassPathAppend.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/BootClassAppendProp/BootClassPathAppend.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,11 +25,12 @@
* @test
* @bug 8087154
* @summary Uninitialized system property jdk.boot.class.path.append causes SIGSEGV
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
// Test that system property jdk.boot.class.path.append is initialized. Otherwise,
// -XX:+PrintCompilation does causes a SIGSEGV.
--- a/hotspot/test/runtime/BootClassAppendProp/BootClassPathAppendProp.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/BootClassAppendProp/BootClassPathAppendProp.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,6 @@
/*
* @test
- * @build BootClassPathAppendProp
* @run main/othervm -Xbootclasspath/a:/usr/lib -showversion -Xbootclasspath/a:/i/dont/exist BootClassPathAppendProp
* @run main/othervm --patch-module=no_module=/not/here -Xbootclasspath/a:/i/may/exist BootClassPathAppendProp
* @run main/othervm -Djdk.boot.class.path.append=newdir BootClassPathAppendProp
--- a/hotspot/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrs.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,15 @@
* @test
* @bug 8003424
* @summary Testing UseCompressedClassPointers with CDS
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main CDSCompressedKPtrs
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CDSCompressedKPtrs {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CDSCompressedKPtrs/CDSCompressedKPtrsError.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,15 @@
* @test
* @bug 8003424
* @summary Test that cannot use CDS if UseCompressedClassPointers is turned off.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main CDSCompressedKPtrsError
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CDSCompressedKPtrsError {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CDSCompressedKPtrs/XShareAuto.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,15 @@
* @test
* @bug 8005933
* @summary Test that -Xshare:auto uses CDS when explicitly specified with -server.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main XShareAuto
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class XShareAuto {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/ClassFile/JsrRewriting.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ClassFile/JsrRewriting.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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,14 +33,17 @@
* @bug 7185550
* @bug 7149464
* @key cte_test
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.desktop
* java.management
* @run main JsrRewriting
*/
-import jdk.test.lib.*;
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.io.File;
public class JsrRewriting {
--- a/hotspot/test/runtime/ClassFile/OomWhileParsingRepeatedJsr.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ClassFile/OomWhileParsingRepeatedJsr.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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,15 +33,17 @@
* @bug 7037122
* @bug 7123945
* @bug 8016029
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.desktop
* java.management
* @run main OomWhileParsingRepeatedJsr
*/
-import jdk.test.lib.*;
-
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class OomWhileParsingRepeatedJsr {
--- a/hotspot/test/runtime/ClassFile/UnsupportedClassFileVersion.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ClassFile/UnsupportedClassFileVersion.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* java.management
@@ -36,7 +36,8 @@
import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.MethodVisitor;
import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class UnsupportedClassFileVersion implements Opcodes {
public static void main(String... args) throws Exception {
--- a/hotspot/test/runtime/ClassUnload/KeepAliveClass.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ClassUnload/KeepAliveClass.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,9 @@
* @test KeepAliveClass
* @summary This test case uses a java.lang.Class instance to keep a class alive.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /runtime/testlibrary
+ * @library /test/lib /runtime/testlibrary
* @library classes
- * @build KeepAliveClass test.Empty
- * @build ClassUnloadCommon
+ * @build sun.hotspot.WhiteBox test.Empty
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClass
--- a/hotspot/test/runtime/ClassUnload/KeepAliveClassLoader.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ClassUnload/KeepAliveClassLoader.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,9 @@
* @test KeepAliveClassLoader
* @summary This test case uses a java.lang.ClassLoader instance to keep a class alive.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /runtime/testlibrary
+ * @library /test/lib /runtime/testlibrary
* @library classes
- * @build KeepAliveClassLoader test.Empty
- * @build ClassUnloadCommon
+ * @build sun.hotspot.WhiteBox test.Empty
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveClassLoader
--- a/hotspot/test/runtime/ClassUnload/KeepAliveObject.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ClassUnload/KeepAliveObject.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,9 @@
* @test KeepAliveObject
* @summary This test case uses a class instance to keep the class alive.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /runtime/testlibrary
+ * @library /test/lib /runtime/testlibrary
* @library classes
- * @build KeepAliveObject test.Empty
- * @build ClassUnloadCommon
+ * @build sun.hotspot.WhiteBox test.Empty
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveObject
--- a/hotspot/test/runtime/ClassUnload/KeepAliveSoftReference.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ClassUnload/KeepAliveSoftReference.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +25,9 @@
* @test KeepAliveSoftReference
* @summary This test case uses a java.lang.ref.SoftReference referencing a class instance to keep a class alive.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /runtime/testlibrary
+ * @library /test/lib /runtime/testlibrary
* @library classes
- * @build KeepAliveSoftReference test.Empty
- * @build ClassUnloadCommon
+ * @build sun.hotspot.WhiteBox test.Empty
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI KeepAliveSoftReference
--- a/hotspot/test/runtime/ClassUnload/UnloadTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ClassUnload/UnloadTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,10 +24,9 @@
/*
* @test UnloadTest
* @modules java.base/jdk.internal.misc
- * @library /runtime/testlibrary /testlibrary /test/lib
+ * @library /runtime/testlibrary /test/lib
* @library classes
- * @build ClassUnloadCommon test.Empty
- * @build UnloadTest
+ * @build sun.hotspot.WhiteBox test.Empty
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xmn8m -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UnloadTest
--- a/hotspot/test/runtime/CommandLine/BooleanFlagWithInvalidValue.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/BooleanFlagWithInvalidValue.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @bug 8006298
* @summary Setting an invalid value for a bool argument should result in a useful error message
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class BooleanFlagWithInvalidValue {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CommandLine/CompilerConfigFileWarning.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/CompilerConfigFileWarning.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,15 @@
* @test
* @bug 7167142
* @summary Warn if unused .hotspot_compiler file is present
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import java.io.PrintWriter;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
public class CompilerConfigFileWarning {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CommandLine/ConfigFileParsing.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/ConfigFileParsing.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,14 @@
* @test ConfigFileParsing
* @bug 7158804
* @summary Improve config file parsing
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import java.io.PrintWriter;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class ConfigFileParsing {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CommandLine/ConfigFileWarning.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/ConfigFileWarning.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,15 @@
* @test
* @bug 7167142
* @summary Warn if unused .hotspot_rc file is present
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import java.io.PrintWriter;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
public class ConfigFileWarning {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CommandLine/FlagWithInvalidValue.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/FlagWithInvalidValue.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @bug 8006298
* @summary Setting a flag to an invalid value should print a useful error message
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class FlagWithInvalidValue {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/IgnoreUnrecognizedVMOptions.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -21,14 +21,16 @@
* questions.
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
/*
* @test
* @bug 8129855
* @summary -XX:+IgnoreUnrecognizedVMOptions should work according to the spec from JDK-8129855
*
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main IgnoreUnrecognizedVMOptions
--- a/hotspot/test/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/NonBooleanFlagWithInvalidBooleanPrefix.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @bug 8006298
* @summary Using a bool (+/-) prefix on non-bool flag should result in a useful error message
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class NonBooleanFlagWithInvalidBooleanPrefix {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CommandLine/ObsoleteFlagErrorMessage.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/ObsoleteFlagErrorMessage.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,10 +26,11 @@
* @bug 8060449 8073989
* @summary Newly obsolete command line options should still give useful error messages when used improperly.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class ObsoleteFlagErrorMessage {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/OptionsValidation/TestJcmdOutput.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @summary Verify jcmd error message for out-of-range value and for
* value which is not allowed by constraint. Also check that
* jcmd does not print an error message to the target process output.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* jdk.management
@@ -35,8 +35,8 @@
import jdk.test.lib.Asserts;
import jdk.test.lib.DynamicVMOption;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.dcmd.PidJcmdExecutor;
public class TestJcmdOutput {
--- a/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,12 +24,11 @@
/*
* @test
* @summary Test VM Options with ranges
- * @library /testlibrary /runtime/CommandLine/OptionsValidation/common
+ * @library /test/lib /runtime/CommandLine/OptionsValidation/common
* @modules java.base/jdk.internal.misc
* java.management
* jdk.attach/sun.tools.attach
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.* TestOptionsWithRanges
* @run main/othervm/timeout=900 TestOptionsWithRanges
*/
--- a/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRangesDynamic.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +24,7 @@
/*
* @test
* @summary Test writeable VM Options with ranges.
- * @library /testlibrary /runtime/CommandLine/OptionsValidation/common
+ * @library /test/lib /runtime/CommandLine/OptionsValidation/common
* @modules java.base/jdk.internal.misc
* jdk.attach/sun.tools.attach
* java.management
--- a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -30,8 +30,8 @@
import java.util.List;
import java.util.Set;
import jdk.test.lib.DynamicVMOption;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
import sun.tools.attach.HotSpotVirtualMachine;
--- a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java Mon Sep 12 22:04:48 2016 +0000
@@ -37,9 +37,9 @@
import java.util.Map;
import java.util.StringTokenizer;
import java.util.function.Predicate;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
public class JVMOptionsUtils {
--- a/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/PrintTouchedMethods.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +26,16 @@
* @bug 8025692
* @modules java.base/jdk.internal.misc
* java.management
- * @library /testlibrary
+ * @library /test/lib
* @compile TestLogTouchedMethods.java PrintTouchedMethods.java
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+LogTouchedMethods PrintTouchedMethods
*/
import java.io.File;
import java.util.List;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class PrintTouchedMethods {
--- a/hotspot/test/runtime/CommandLine/TestHexArguments.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/TestHexArguments.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,13 +26,14 @@
* @bug 8042885
* @summary Make sure there is no error using hexadecimal format in vm options
* @author Yumin Qi
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
import java.io.File;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestHexArguments {
public static void main(String args[]) throws Exception {
--- a/hotspot/test/runtime/CommandLine/TestLongUnrecognizedVMOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/TestLongUnrecognizedVMOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +25,14 @@
* @test
* @bug 8129786
* @summary Verify that JVM correctly processes very long unrecognized VM option
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management
* @run main TestLongUnrecognizedVMOption
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestLongUnrecognizedVMOption {
--- a/hotspot/test/runtime/CommandLine/TestNullTerminatedFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/TestNullTerminatedFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -21,13 +21,14 @@
* questions.
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
/*
* @test TestNullTerminatedFlags
* @bug 6522873
* @summary Test that the VM don't allow random junk characters at the end of valid command line flags.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver TestNullTerminatedFlags
--- a/hotspot/test/runtime/CommandLine/TestVMOptions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/TestVMOptions.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,13 +25,14 @@
* @test
* @bug 8060256
* @summary Test various command line options
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main TestVMOptions
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.io.File;
public class TestVMOptions {
--- a/hotspot/test/runtime/CommandLine/TraceExceptionsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/TraceExceptionsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,12 +25,13 @@
* @test
* @bug 8048933
* @summary TraceExceptions output should have the exception message - useful for ClassNotFoundExceptions especially
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TraceExceptionsTest {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CommandLine/UnrecognizedVMOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/UnrecognizedVMOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @bug 8006298
* @summary Using an unrecognized VM option should print the name of the option
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class UnrecognizedVMOption {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CommandLine/VMAliasOptions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/VMAliasOptions.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -21,7 +21,8 @@
* questions.
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.*;
/*
@@ -29,7 +30,7 @@
* @bug 8061611
* @summary Test that various alias options correctly set the target options. See aliased_jvm_flags in arguments.cpp.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
public class VMAliasOptions {
--- a/hotspot/test/runtime/CommandLine/VMDeprecatedOptions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/VMDeprecatedOptions.java Mon Sep 12 22:04:48 2016 +0000
@@ -21,7 +21,8 @@
* questions.
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.cli.*;
/*
@@ -29,7 +30,7 @@
* @bug 8066821
* @summary Test that various options are deprecated. See deprecated_jvm_flags in arguments.cpp.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
public class VMDeprecatedOptions {
--- a/hotspot/test/runtime/CommandLine/VMOptionWarning.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/VMOptionWarning.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,14 @@
* @test
* @bug 8027314
* @summary Warn if diagnostic or experimental vm option is used and -XX:+UnlockDiagnosticVMOptions or -XX:+UnlockExperimentalVMOptions, respectively, isn't specified. Warn if develop or notproduct vm option is used with product version of VM.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
public class VMOptionWarning {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CommandLine/VMOptionsFile/TestVMOptionsFile.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test
* @bug 8061999 8135195 8136552
* @summary Test "-XX:VMOptionsFile" VM option
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules jdk.management
* @run main TestVMOptionsFile
@@ -52,8 +52,8 @@
import java.util.Set;
import jdk.test.lib.Asserts;
import jdk.test.lib.DynamicVMOption;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestVMOptionsFile {
--- a/hotspot/test/runtime/CompressedOops/CompressedClassPointers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CompressedOops/CompressedClassPointers.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,12 +25,14 @@
* @test
* @bug 8024927
* @summary Testing address of compressed class pointer space as best as possible.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CompressedClassPointers {
--- a/hotspot/test/runtime/CompressedOops/CompressedClassSpaceSize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CompressedOops/CompressedClassSpaceSize.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,14 @@
* @test
* @bug 8022865
* @summary Tests for the -XX:CompressedClassSpaceSize command line option
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main CompressedClassSpaceSize
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CompressedClassSpaceSize {
--- a/hotspot/test/runtime/CompressedOops/CompressedKlassPointerAndOops.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CompressedOops/CompressedKlassPointerAndOops.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +26,14 @@
* @bug 8000968
* @key regression
* @summary NPG: UseCompressedClassPointers asserts with ObjectAlignmentInBytes=32
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CompressedKlassPointerAndOops {
--- a/hotspot/test/runtime/CompressedOops/ObjectAlignment.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CompressedOops/ObjectAlignment.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,15 @@
* @test
* @bug 8022865
* @summary Tests for the -XX:ObjectAlignmentInBytes command line option
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main ObjectAlignment
*/
-import jdk.test.lib.*;
+
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class ObjectAlignment {
--- a/hotspot/test/runtime/CompressedOops/UseCompressedOops.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/CompressedOops/UseCompressedOops.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @test
* @bug 8022865
* @summary Tests for different combination of UseCompressedOops options
- * @library /testlibrary
+ * @library /test/lib
* @ignore 8079353
* @modules java.base/jdk.internal.misc
* java.management
@@ -33,7 +33,9 @@
*/
import java.util.ArrayList;
import java.util.Collections;
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class UseCompressedOops {
--- a/hotspot/test/runtime/ConstantPool/BadMethodHandles.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ConstantPool/BadMethodHandles.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,6 @@
* @test
* @bug 8087223
* @summary Adding constantTag to keep method call consistent with it.
- * @library /testlibrary
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* java.management
--- a/hotspot/test/runtime/ConstantPool/IntfMethod.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ConstantPool/IntfMethod.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,6 @@
* @test
* $bug 8087223
* @summary Adding constantTag to keep method call consistent with it.
- * @library /testlibrary
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* java.management
--- a/hotspot/test/runtime/EnclosingMethodAttr/EnclMethodAttr.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/EnclosingMethodAttr/EnclMethodAttr.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
/*
* @test
* @bug 8044738
- * @library /testlibrary
+ * @library /test/lib
* @summary Check attribute_length of EnclosingMethod attribute
* @modules java.base/jdk.internal.misc
* java.management
@@ -32,7 +32,8 @@
*/
import java.io.File;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class EnclMethodAttr {
--- a/hotspot/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ErrorHandling/CreateCoredumpOnCrash.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,16 +23,18 @@
/*
* @test
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
* @run driver CreateCoredumpOnCrash
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
public class CreateCoredumpOnCrash {
--- a/hotspot/test/runtime/ErrorHandling/ErrorHandler.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ErrorHandling/ErrorHandler.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,11 +28,13 @@
* @summary Exercise HotSpot error handling code by invoking java with
* -XX:ErrorHandlerTest option to cause an error report. Check the results.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @run driver ErrorHandler
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class ErrorHandler {
--- a/hotspot/test/runtime/ErrorHandling/ProblematicFrameTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ErrorHandling/ProblematicFrameTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,19 +25,19 @@
* @test
* @bug 8050167
* @summary Test that error is not occurred during printing problematic frame
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
* @run driver ProblematicFrameTest
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
-import jdk.test.lib.Utils;
public class ProblematicFrameTest {
private static class Crasher {
--- a/hotspot/test/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ErrorHandling/SafeFetchInErrorHandlingTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,16 +27,16 @@
import java.io.InputStreamReader;
import java.util.regex.Pattern;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
/*
* @test
* @bug 8074552
* @summary SafeFetch32 and SafeFetchN do not work in error handling
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @author Thomas Stuefe (SAP)
*/
--- a/hotspot/test/runtime/ErrorHandling/SecondaryErrorTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ErrorHandling/SecondaryErrorTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8065896
* @summary Synchronous signals during error reporting may terminate or hang VM process
- * @library /testlibrary
+ * @library /test/lib
* @author Thomas Stuefe (SAP)
* @modules java.base/jdk.internal.misc
* java.management
@@ -38,9 +38,9 @@
import java.io.InputStreamReader;
import java.util.regex.Pattern;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
public class SecondaryErrorTest {
--- a/hotspot/test/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ErrorHandling/TestCrashOnOutOfMemoryError.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +25,13 @@
* @test TestCrashOnOutOfMemoryError
* @summary Test using -XX:+CrashOnOutOfMemoryError
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build jdk.test.lib.*
+ * @library /test/lib
* @run driver TestCrashOnOutOfMemoryError
* @bug 8138745
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.io.BufferedReader;
import java.io.File;
import java.io.FileInputStream;
--- a/hotspot/test/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ErrorHandling/TestExitOnOutOfMemoryError.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +25,13 @@
* @test TestExitOnOutOfMemoryError
* @summary Test using -XX:ExitOnOutOfMemoryError
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build jdk.test.lib.*
+ * @library /test/lib
* @run driver TestExitOnOutOfMemoryError
* @bug 8138745
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestExitOnOutOfMemoryError {
--- a/hotspot/test/runtime/ErrorHandling/TestOnError.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ErrorHandling/TestOnError.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +25,14 @@
* @test TestOnError
* @summary Test using -XX:OnError=<cmd>
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build TestOnError
+ * @library /test/lib
* @run main TestOnError
* @bug 8078470
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
public class TestOnError {
--- a/hotspot/test/runtime/ErrorHandling/TestOnOutOfMemoryError.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ErrorHandling/TestOnOutOfMemoryError.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +25,13 @@
* @test TestOnOutOfMemoryError
* @summary Test using -XX:OnOutOfMemoryError=<cmd>
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build TestOnOutOfMemoryError
+ * @library /test/lib
* @run main TestOnOutOfMemoryError
* @bug 8078470
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestOnOutOfMemoryError {
--- a/hotspot/test/runtime/Final/TestPutMain.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Final/TestPutMain.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @test
* @bug 8160527
* @summary The VM does not always perform checks added by 8157181 when updating final instance fields
- * @library /testlibrary
+ * @library /test/lib
* @compile TestPutField.jasm
* @compile TestPutStatic.jasm
* @compile TestPutMain.java
--- a/hotspot/test/runtime/LoadClass/LoadClassNegative.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/LoadClass/LoadClassNegative.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,16 +26,16 @@
* @key regression
* @bug 8020675
* @summary make sure there is no fatal error if a class is loaded from an invalid jar file which is in the bootclasspath
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @build TestForName
- * @build LoadClassNegative
* @run main LoadClassNegative
*/
import java.io.File;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class LoadClassNegative {
--- a/hotspot/test/runtime/LocalVariableTable/TestLVT.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/LocalVariableTable/TestLVT.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +25,15 @@
* @test
* @bug 8049632
* @summary Test ClassFileParser::copy_localvariable_table cases
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @compile -g -XDignore.symbol.file TestLVT.java
* @run main TestLVT
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.*;
public class TestLVT {
--- a/hotspot/test/runtime/Metaspace/FragmentMetaspace.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Metaspace/FragmentMetaspace.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,6 @@
* @library /runtime/testlibrary
* @modules java.base/jdk.internal.misc
* @modules java.compiler
- * @build GeneratedClassLoader
* @run main/othervm/timeout=200 -Xmx300m FragmentMetaspace
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/MinimalVM/CDS.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016, 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
+ * @requires vm.flavor == "minimal"
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @run driver CDS
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class CDS {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb;
+
+ pb = ProcessTools.createJavaProcessBuilder("-minimal", "-Xshare:dump");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Shared spaces are not supported in this VM")
+ .shouldHaveExitValue(1);
+
+ pb = ProcessTools.createJavaProcessBuilder("-minimal", "-Xshare:on");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Shared spaces are not supported in this VM")
+ .shouldHaveExitValue(1);
+
+ pb = ProcessTools.createJavaProcessBuilder("-minimal", "-Xshare:auto", "-version");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Shared spaces are not supported in this VM")
+ .shouldHaveExitValue(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/MinimalVM/CheckJNI.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2016, 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
+ * @requires vm.flavor == "minimal"
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @run driver CheckJNI
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class CheckJNI {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-minimal", "-Xcheck:jni", "-version");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Minimal VM warning: JNI CHECKING is not supported in this VM")
+ .shouldHaveExitValue(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/MinimalVM/Instrumentation.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2016, 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
+ * @library /test/lib
+ * @requires vm.flavor == "minimal"
+ * @modules java.base/jdk.internal.misc
+ * java.instrument
+ * @run driver Instrumentation
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class Instrumentation {
+
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-minimal", "-javaagent:redefineagent.jar", "-version");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Instrumentation agents are not supported in this VM")
+ .shouldHaveExitValue(1);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/MinimalVM/JMX.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2016, 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
+ * @requires vm.flavor == "minimal"
+ * @library /test/lib
+ * @run main/othervm JMX
+ */
+
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class JMX {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb;
+
+ pb = ProcessTools.createJavaProcessBuilder("-minimal", "-XX:+ManagementServer", "-version");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("ManagementServer is not supported in this VM.")
+ .shouldHaveExitValue(1);
+
+ pb = ProcessTools.createJavaProcessBuilder("-minimal", "-Dcom.sun.management ", "-version");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("-Dcom.sun.management is not supported in this VM.")
+ .shouldHaveExitValue(1);
+
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jcmd"), Long.toString(ProcessTools.getProcessId()), "VM.print_threads"});
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Could not find any processes matching ")
+ .shouldHaveExitValue(1);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/MinimalVM/JVMTI.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2016, 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
+ * @requires vm.flavor == "minimal"
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @run driver JVMTI
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class JVMTI {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
+ "-minimal",
+ "-agentlib:jdwp=server=y,transport=dt_socket,address=5000,suspend=n",
+ "-version");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Debugging agents are not supported in this VM")
+ .shouldHaveExitValue(1);
+
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/MinimalVM/NMT.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016, 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
+ * @requires vm.flavor == "minimal"
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @run driver NMT
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class NMT {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb;
+
+ pb = ProcessTools.createJavaProcessBuilder("-minimal", "-XX:NativeMemoryTracking=detail", "-version");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Native Memory Tracking is not supported in this VM")
+ .shouldHaveExitValue(1);
+
+ pb = ProcessTools.createJavaProcessBuilder("-minimal", "-XX:NativeMemoryTracking=summary", "-version");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Native Memory Tracking is not supported in this VM")
+ .shouldHaveExitValue(1);
+
+ pb = ProcessTools.createJavaProcessBuilder("-minimal", "-XX:NativeMemoryTracking=off", "-version");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Native Memory Tracking is not supported in this VM")
+ .shouldHaveExitValue(1);
+
+
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/MinimalVM/Xprof.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2016, 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
+ * @requires vm.flavor == "minimal"
+ * @modules java.base/jdk.internal.misc
+ * @library /test/lib
+ * @run driver Xprof
+ */
+
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+public class Xprof {
+
+ public static void main(String args[]) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-minimal", "-Xprof", "-version");
+ new OutputAnalyzer(pb.start())
+ .shouldContain("Flat profiling is not supported in this VM.")
+ .shouldHaveExitValue(1);
+
+ }
+}
--- a/hotspot/test/runtime/NMT/AutoshutdownNMT.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/AutoshutdownNMT.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,13 @@
* @test
* @key nmt
* @summary Test for deprecated message if -XX:-AutoShutdownNMT is specified
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class AutoshutdownNMT {
--- a/hotspot/test/runtime/NMT/BaselineWithParameter.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/BaselineWithParameter.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +26,15 @@
* @bug 8004802
* @key nmt jcmd regression
* @summary Regression test for invoking a jcmd with baseline=false, result was that the target VM crashed
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:NativeMemoryTracking=detail BaselineWithParameter
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class BaselineWithParameter {
--- a/hotspot/test/runtime/NMT/ChangeTrackingLevel.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/ChangeTrackingLevel.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,14 +27,13 @@
* @summary Test that you can decrease NMT tracking level but not increase it.
* @key nmt
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build ChangeTrackingLevel
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ChangeTrackingLevel
*/
-import jdk.test.lib.*;
import sun.hotspot.WhiteBox;
public class ChangeTrackingLevel {
--- a/hotspot/test/runtime/NMT/CheckForProperDetailStackTrace.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/CheckForProperDetailStackTrace.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,12 +25,14 @@
* @test
* @key nmt
* @summary Running with NMT detail should produce expected stack traces.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
--- a/hotspot/test/runtime/NMT/CommandLineDetail.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/CommandLineDetail.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @key nmt
* @summary Running with NMT detail should not result in an error
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CommandLineDetail {
--- a/hotspot/test/runtime/NMT/CommandLineEmptyArgument.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/CommandLineEmptyArgument.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @key nmt
* @summary Empty argument to NMT should result in an informative error message
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CommandLineEmptyArgument {
--- a/hotspot/test/runtime/NMT/CommandLineInvalidArgument.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/CommandLineInvalidArgument.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @key nmt
* @summary Invalid argument to NMT should result in an informative error message
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CommandLineInvalidArgument {
--- a/hotspot/test/runtime/NMT/CommandLineSummary.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/CommandLineSummary.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @key nmt
* @summary Running with NMT summary should not result in an error
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CommandLineSummary {
--- a/hotspot/test/runtime/NMT/CommandLineTurnOffNMT.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/CommandLineTurnOffNMT.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @key nmt
* @summary Turning off NMT should not result in an error
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CommandLineTurnOffNMT {
--- a/hotspot/test/runtime/NMT/CommitOverlappingRegions.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/CommitOverlappingRegions.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,16 +25,18 @@
* @test
* @summary Test commits of overlapping regions of memory.
* @key nmt jcmd
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build CommitOverlappingRegions
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail CommitOverlappingRegions
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import sun.hotspot.WhiteBox;
public class CommitOverlappingRegions {
--- a/hotspot/test/runtime/NMT/JcmdBaselineDetail.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/JcmdBaselineDetail.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,13 +25,15 @@
* @test
* @key nmt jcmd
* @summary Verify that jcmd correctly reports that baseline succeeds with NMT enabled with detailed tracking.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:NativeMemoryTracking=detail JcmdBaselineDetail
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class JcmdBaselineDetail {
--- a/hotspot/test/runtime/NMT/JcmdDetailDiff.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/JcmdDetailDiff.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,15 +25,17 @@
* @test
* @summary run NMT baseline, allocate memory and verify output from detail.diff
* @key nmt jcmd
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build JcmdDetailDiff
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail JcmdDetailDiff
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/NMT/JcmdScale.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/JcmdScale.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,15 @@
* @test
* @key nmt jcmd
* @summary Test the NMT scale parameter
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:NativeMemoryTracking=summary JcmdScale
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class JcmdScale {
--- a/hotspot/test/runtime/NMT/JcmdScaleDetail.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/JcmdScaleDetail.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,13 +25,15 @@
* @test
* @key nmt jcmd
* @summary Test the NMT scale parameter with detail tracking level
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:NativeMemoryTracking=detail JcmdScaleDetail
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class JcmdScaleDetail {
--- a/hotspot/test/runtime/NMT/JcmdSummaryDiff.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/JcmdSummaryDiff.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,15 +25,17 @@
* @test
* @summary run NMT baseline, allocate memory and verify output from summary.diff
* @key nmt jcmd
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build JcmdSummaryDiff
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary JcmdSummaryDiff
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/NMT/JcmdWithNMTDisabled.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/JcmdWithNMTDisabled.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,15 @@
* @test
* @key nmt jcmd
* @summary Verify that jcmd correctly reports that NMT is not enabled
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main JcmdWithNMTDisabled 1
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class JcmdWithNMTDisabled {
static ProcessBuilder pb = new ProcessBuilder();
--- a/hotspot/test/runtime/NMT/MallocRoundingReportTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/MallocRoundingReportTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,16 +25,18 @@
* @test
* @summary Test consistency of NMT by creating allocations of the Test type with various sizes and verifying visibility with jcmd
* @key nmt jcmd
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build MallocRoundingReportTest
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocRoundingReportTest
*
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/NMT/MallocSiteHashOverflow.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/MallocSiteHashOverflow.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,15 @@
* @requires sun.arch.data.model == "32"
* @key nmt jcmd stress
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build MallocSiteHashOverflow
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocSiteHashOverflow
*/
-import jdk.test.lib.*;
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import sun.hotspot.WhiteBox;
public class MallocSiteHashOverflow {
--- a/hotspot/test/runtime/NMT/MallocStressTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/MallocStressTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +25,10 @@
* @test
* @summary Stress test for malloc tracking
* @key nmt jcmd stress
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build MallocStressTest
+ * @build sun.hotspot.WhiteBox
* @ignore - This test is disabled since it will stress NMT and timeout during normal testing
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocStressTest
@@ -38,7 +38,10 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import jdk.test.lib.*;
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import sun.hotspot.WhiteBox;
public class MallocStressTest {
--- a/hotspot/test/runtime/NMT/MallocTestType.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/MallocTestType.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,16 +25,18 @@
* @test
* @summary Test consistency of NMT by leaking a few select allocations of the Test type and then verify visibility with jcmd
* @key nmt jcmd
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build MallocTestType
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTestType
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import sun.hotspot.WhiteBox;
public class MallocTestType {
--- a/hotspot/test/runtime/NMT/MallocTrackingVerify.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/MallocTrackingVerify.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +26,10 @@
* @bug 8054836
* @summary Test to verify correctness of malloc tracking
* @key nmt jcmd
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build MallocTrackingVerify
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail MallocTrackingVerify
*
@@ -38,7 +38,9 @@
import java.util.ArrayList;
import java.util.Random;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/NMT/NMTWithCDS.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/NMTWithCDS.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,13 @@
* @test
* @bug 8055061
* @key nmt
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main NMTWithCDS
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class NMTWithCDS {
--- a/hotspot/test/runtime/NMT/PrintNMTStatistics.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/PrintNMTStatistics.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,10 +27,11 @@
* @bug 8005936 8058606
* @summary Verify PrintNMTStatistics on normal JVM exit for detail and summary tracking level
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class PrintNMTStatistics {
--- a/hotspot/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/PrintNMTStatisticsWithNMTDisabled.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @key nmt
* @summary Trying to enable PrintNMTStatistics should result in a warning
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class PrintNMTStatisticsWithNMTDisabled {
--- a/hotspot/test/runtime/NMT/ReleaseCommittedMemory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/ReleaseCommittedMemory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,8 +27,8 @@
* @summary Release committed memory and make sure NMT handles it correctly
* @key nmt regression
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build ReleaseCommittedMemory
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ReleaseCommittedMemory
--- a/hotspot/test/runtime/NMT/ReleaseNoCommit.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/ReleaseNoCommit.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,17 +25,17 @@
* @test
* @summary Release uncommitted memory and make sure NMT handles it correctly
* @key nmt regression
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build ReleaseNoCommit
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=summary ReleaseNoCommit
*/
import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/NMT/ShutdownTwice.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/ShutdownTwice.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,15 @@
* @test
* @key nmt jcmd
* @summary Run shutdown twice
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:NativeMemoryTracking=detail ShutdownTwice
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class ShutdownTwice {
--- a/hotspot/test/runtime/NMT/SummaryAfterShutdown.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/SummaryAfterShutdown.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +25,15 @@
* @test
* @key nmt jcmd
* @summary Verify that jcmd correctly reports that NMT is not enabled after a shutdown
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:NativeMemoryTracking=detail SummaryAfterShutdown
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class SummaryAfterShutdown {
--- a/hotspot/test/runtime/NMT/SummarySanityCheck.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/SummarySanityCheck.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,16 +25,18 @@
* @test
* @key nmt jcmd
* @summary Sanity check the output of NMT
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build SummarySanityCheck
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:NativeMemoryTracking=summary -XX:+WhiteBoxAPI SummarySanityCheck
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
--- a/hotspot/test/runtime/NMT/ThreadedMallocTestType.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/ThreadedMallocTestType.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,16 +24,18 @@
/*
* @test
* @key nmt jcmd
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build ThreadedMallocTestType
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedMallocTestType
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import sun.hotspot.WhiteBox;
public class ThreadedMallocTestType {
--- a/hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/ThreadedVirtualAllocTestType.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,16 +24,18 @@
/*
* @test
* @key nmt jcmd
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build ThreadedVirtualAllocTestType
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail ThreadedVirtualAllocTestType
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import sun.hotspot.WhiteBox;
public class ThreadedVirtualAllocTestType {
--- a/hotspot/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/VirtualAllocCommitUncommitRecommit.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,16 +25,18 @@
* @test
* @summary Test reserve/commit/uncommit/release of virtual memory and that we track it correctly
* @key nmt jcmd
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build VirtualAllocCommitUncommitRecommit
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocCommitUncommitRecommit
*
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/NMT/VirtualAllocTestType.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/NMT/VirtualAllocTestType.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,16 +25,18 @@
* @test
* @summary Test Reserve/Commit/Uncommit/Release of virtual memory and that we track it correctly
* @key nmt jcmd
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build VirtualAllocTestType
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:NativeMemoryTracking=detail VirtualAllocTestType
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import sun.hotspot.WhiteBox;
public class VirtualAllocTestType {
--- a/hotspot/test/runtime/PerfMemDestroy/PerfMemDestroy.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/PerfMemDestroy/PerfMemDestroy.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
* @test
* @bug 8030955
* @summary Allow multiple calls to PerfMemory::destroy() without asserting.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main PerfMemDestroy
@@ -33,7 +33,8 @@
import java.io.File;
import java.util.Map;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class PerfMemDestroy {
public static void main(String args[]) throws Throwable {
--- a/hotspot/test/runtime/RedefineObject/TestRedefineObject.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/RedefineObject/TestRedefineObject.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -21,7 +21,10 @@
* questions.
*/
import java.io.PrintWriter;
-import jdk.test.lib.*;
+
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
/*
* Test to redefine java/lang/Object and verify that it doesn't crash on vtable
@@ -32,14 +35,14 @@
* @test
* @bug 8005056
* @bug 8009728
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.instrument
* java.management
* @build Agent
* @run main ClassFileInstaller Agent
* @run main TestRedefineObject
- * @run main/othervm -javaagent:agent.jar -XX:TraceRedefineClasses=5 Agent
+ * @run main/othervm -javaagent:agent.jar -Xlog:redefine+class+load=debug,redefine+class+timer=info Agent
*/
public class TestRedefineObject {
public static void main(String[] args) throws Exception {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/RedefineTests/ModifyAnonymous.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,171 @@
+/*
+ * Copyright (c) 2016, 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
+ * @library /test/lib
+ * @summary Test that retransforming and redefining anonymous classes gets UnmodifiableClassException
+ * @modules java.base/jdk.internal.misc
+ * @modules java.instrument
+ * jdk.jartool/sun.tools.jar
+ * @run main ModifyAnonymous buildagent
+ * @run main/othervm -javaagent:redefineagent.jar ModifyAnonymous
+ */
+
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.lang.NoSuchFieldException;
+import java.lang.NoSuchMethodException;
+import java.lang.RuntimeException;
+import java.lang.instrument.ClassDefinition;
+import java.lang.instrument.ClassFileTransformer;
+import java.lang.instrument.IllegalClassFormatException;
+import java.lang.instrument.Instrumentation;
+import java.security.ProtectionDomain;
+import jdk.test.lib.*;
+
+public class ModifyAnonymous {
+
+ public static class LambdaTransformer implements ClassFileTransformer {
+ @Override
+ public byte[] transform(ClassLoader loader, String className, Class<?> classBeingRedefined,
+ ProtectionDomain protectionDomain, byte[] classfileBuffer)
+ throws IllegalClassFormatException {
+ return null;
+ }
+ }
+
+ static Instrumentation inst = null;
+ static volatile boolean done = false;
+
+ public static void premain(String args, Instrumentation instrumentation) {
+
+ inst = instrumentation;
+ System.out.println("javaagent in da house!");
+ instrumentation.addTransformer(new LambdaTransformer());
+ }
+
+ private static void buildAgent() {
+ try {
+ ClassFileInstaller.main("ModifyAnonymous");
+ } catch (Exception e) {
+ throw new RuntimeException("Could not write agent classfile", e);
+ }
+
+ try {
+ PrintWriter pw = new PrintWriter("MANIFEST.MF");
+ pw.println("Premain-Class: ModifyAnonymous");
+ pw.println("Agent-Class: ModifyAnonymous");
+ pw.println("Can-Retransform-Classes: true");
+ pw.println("Can-Redefine-Classes: true");
+ pw.close();
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException("Could not write manifest file for the agent", e);
+ }
+
+ sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
+ if (!jarTool.run(new String[] { "-cmf", "MANIFEST.MF", "redefineagent.jar", "ModifyAnonymous.class" })) {
+ throw new RuntimeException("Could not write the agent jar file");
+ }
+ }
+
+ public static class InstanceMethodCallSiteApp {
+
+ public static void test() throws InterruptedException {
+ for (int i = 0; i < 2; i++) {
+ InstanceMethodCallSiteApp app = new InstanceMethodCallSiteApp();
+ Runnable r = app::doWork; // this creates an anonymous class
+ while (!done) {
+ r.run();
+ Thread.sleep(10);
+ }
+ }
+ }
+
+ public void doWork() {
+ System.out.print(".");
+ }
+ }
+
+ static void runTest() {
+ while (!done) {
+ Class[] allLoadedClasses = inst.getAllLoadedClasses();
+ for (Class clazz : allLoadedClasses) {
+ final String name = clazz.getName();
+ if (name.contains("$$Lambda$") && name.contains("App")) {
+ if (inst.isModifiableClass(clazz)) {
+ throw new RuntimeException ("Class should not be modifiable");
+ }
+ // Try to modify them anyway.
+ try {
+ System.out.println("retransform called for " + name);
+ inst.retransformClasses(clazz);
+ } catch(java.lang.instrument.UnmodifiableClassException t) {
+ System.out.println("PASSED: expecting UnmodifiableClassException");
+ t.printStackTrace();
+ }
+ try {
+ System.out.println("redefine called for " + name);
+ String newclass = "class Dummy {}";
+ byte[] bytecode = InMemoryJavaCompiler.compile("Dummy", newclass);
+ ClassDefinition cld = new ClassDefinition(clazz, bytecode);
+ inst.redefineClasses(new ClassDefinition[] { cld });
+ } catch(java.lang.instrument.UnmodifiableClassException t) {
+ System.out.println("PASSED: expecting UnmodifiableClassException");
+ t.printStackTrace();
+ } catch(java.lang.ClassNotFoundException e) {
+ throw new RuntimeException ("ClassNotFoundException thrown");
+ }
+ done = true;
+ }
+ }
+ }
+ }
+
+ public static void main(String argv[]) throws InterruptedException, RuntimeException {
+ if (argv.length == 1 && argv[0].equals("buildagent")) {
+ buildAgent();
+ return;
+ }
+
+ if (inst == null) {
+ throw new RuntimeException("Instrumentation object was null");
+ }
+
+ new Thread() {
+ public void run() {
+ runTest();
+ }
+ }.start();
+
+ // Test that NCDFE is not thrown for anonymous class:
+ // ModifyAnonymous$InstanceMethodCallSiteApp$$Lambda$18
+ try {
+ ModifyAnonymous test = new ModifyAnonymous();
+ InstanceMethodCallSiteApp.test();
+ } catch (NoClassDefFoundError e) {
+ throw new RuntimeException("FAILED: NoClassDefFoundError thrown for " + e.getMessage());
+ }
+ System.out.println("PASSED: NoClassDefFound error not thrown");
+ }
+}
--- a/hotspot/test/runtime/RedefineTests/RedefineAnnotations.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/RedefineTests/RedefineAnnotations.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @library /testlibrary
+ * @library /test/lib
* @summary Test that type annotations are retained after a retransform
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
--- a/hotspot/test/runtime/RedefineTests/RedefineFinalizer.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/RedefineTests/RedefineFinalizer.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,11 @@
* @test
* @bug 6904403
* @summary Don't assert if we redefine finalize method
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.compiler
* java.instrument
* jdk.jartool/sun.tools.jar
- * @build RedefineClassHelper
* @run main RedefineClassHelper
* @run main/othervm -javaagent:redefineagent.jar RedefineFinalizer
*/
--- a/hotspot/test/runtime/RedefineTests/RedefineRunningMethods.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/RedefineTests/RedefineRunningMethods.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,14 +25,13 @@
* @test
* @bug 8055008
* @summary Redefine EMCP and non-EMCP methods that are running in an infinite loop
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.compiler
* java.instrument
* jdk.jartool/sun.tools.jar
- * @build RedefineClassHelper
* @run main RedefineClassHelper
- * @run main/othervm -javaagent:redefineagent.jar -XX:TraceRedefineClasses=0x600 RedefineRunningMethods
+ * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+iklass+add=trace,redefine+class+iklass+purge=trace RedefineRunningMethods
*/
public class RedefineRunningMethods {
--- a/hotspot/test/runtime/RedefineTests/RedefineRunningMethodsWithBacktrace.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/RedefineTests/RedefineRunningMethodsWithBacktrace.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +25,11 @@
* @test
* @bug 8087315
* @summary Get old method's stack trace elements after GC
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.compiler
* java.instrument
* jdk.jartool/sun.tools.jar
- * @build RedefineClassHelper
* @run main RedefineClassHelper
* @run main/othervm -javaagent:redefineagent.jar RedefineRunningMethodsWithBacktrace
*/
--- a/hotspot/test/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/RedefineTests/RedefineRunningMethodsWithResolutionErrors.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,14 +25,13 @@
* @test
* @bug 8076110
* @summary Redefine running methods that have cached resolution errors
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.org.objectweb.asm
* java.instrument
* jdk.jartool/sun.tools.jar
- * @build RedefineClassHelper
* @run main RedefineClassHelper
- * @run main/othervm -javaagent:redefineagent.jar -XX:TraceRedefineClasses=0x600 RedefineRunningMethodsWithResolutionErrors
+ * @run main/othervm -javaagent:redefineagent.jar -Xlog:redefine+class+iklass+add=trace,redefine+class+iklass+purge=trace RedefineRunningMethodsWithResolutionErrors
*/
import jdk.internal.org.objectweb.asm.ClassWriter;
--- a/hotspot/test/runtime/ReservedStack/ReservedStackTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ReservedStack/ReservedStackTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,10 +23,9 @@
/*
* @test ReservedStackTest
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
- * @build jdk.test.lib.*
* @run main/othervm -Xint ReservedStackTest
* @run main/othervm -XX:-Inline -XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread ReservedStackTest
*/
--- a/hotspot/test/runtime/ReservedStack/ReservedStackTestCompiler.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ReservedStack/ReservedStackTestCompiler.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,10 +25,9 @@
* @test ReservedStackTestCompiler
* @summary Run ReservedStackTest with dedicated compilers C1 and C2.
* @requires vm.flavor == "server"
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.vm.annotation
- * @build jdk.test.lib.* ReservedStackTest
* @run main/othervm -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -XX:-Inline -XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread ReservedStackTest
* @run main/othervm -XX:-TieredCompilation -XX:-Inline -XX:CompileCommand=exclude,java/util/concurrent/locks/AbstractOwnableSynchronizer.setExclusiveOwnerThread ReservedStackTest
*/
--- a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency1.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,16 +25,18 @@
* @test
* @bug 8047290
* @summary Ensure that a Monitor::lock_without_safepoint_check fires an assert when it incorrectly acquires a lock which must always have safepoint checks.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build AssertSafepointCheckConsistency1
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main AssertSafepointCheckConsistency1
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency2.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,16 +25,18 @@
* @test
* @bug 8047290
* @summary Ensure that a Monitor::lock fires an assert when it incorrectly acquires a lock which must never have safepoint checks.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build AssertSafepointCheckConsistency2
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main AssertSafepointCheckConsistency2
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency3.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,16 +25,18 @@
* @test
* @bug 8047290
* @summary Ensure that Monitor::lock_without_safepoint_check does not assert when it correctly acquires a lock which must never have safepoint checks.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build AssertSafepointCheckConsistency3
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main AssertSafepointCheckConsistency3
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Safepoint/AssertSafepointCheckConsistency4.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,16 +25,18 @@
* @test
* @bug 8047290
* @summary Ensure that Monitor::lock does not assert when it correctly acquires a lock which must always have safepoint checks.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build AssertSafepointCheckConsistency4
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main AssertSafepointCheckConsistency4
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/SameObject/SameObject.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SameObject/SameObject.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
* Fixed in JDK1.3.1_10
* Fixed in JDK1.4.1_07
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @run main/othervm/native -Xcheck:jni SameObject
*/
public class SameObject {
--- a/hotspot/test/runtime/SelectionResolution/AbstractMethodErrorTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/AbstractMethodErrorTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate AbstractMethodErrorTest
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main/othervm/timeout=300 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies AbstractMethodErrorTest
*/
--- a/hotspot/test/runtime/SelectionResolution/IllegalAccessErrorTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/IllegalAccessErrorTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate IllegalAccessErrorTest
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies IllegalAccessErrorTest
*/
--- a/hotspot/test/runtime/SelectionResolution/InvokeInterfaceICCE.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/InvokeInterfaceICCE.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate IncompatibleClassChangeError
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main/othervm/timeout=500 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceICCE
*/
--- a/hotspot/test/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/InvokeInterfaceSuccessTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate InvokeInterfaceSuccessTest
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main/othervm/timeout=300 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeInterfaceSuccessTest
*/
--- a/hotspot/test/runtime/SelectionResolution/InvokeSpecialICCE.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/InvokeSpecialICCE.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate IncompatibleClassChangeError
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeSpecialICCE
*/
--- a/hotspot/test/runtime/SelectionResolution/InvokeSpecialSuccessTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/InvokeSpecialSuccessTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate InvokeSpecialSuccessTest
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeSpecialSuccessTest
*/
--- a/hotspot/test/runtime/SelectionResolution/InvokeStaticICCE.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/InvokeStaticICCE.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate IncompatibleClassChangeError
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeStaticICCE
*/
--- a/hotspot/test/runtime/SelectionResolution/InvokeStaticSuccessTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/InvokeStaticSuccessTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate InvokeStaticSuccessTest
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main InvokeStaticSuccessTest
*/
--- a/hotspot/test/runtime/SelectionResolution/InvokeVirtualICCE.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/InvokeVirtualICCE.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate IncompatibleClassChangeError
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main/othervm/timeout=1200 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualICCE
*/
--- a/hotspot/test/runtime/SelectionResolution/InvokeVirtualSuccessTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/InvokeVirtualSuccessTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate InvokeVirtualSuccessTest
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main/othervm/timeout=400 -XX:+IgnoreUnrecognizedVMOptions -XX:-VerifyDependencies InvokeVirtualSuccessTest
*/
--- a/hotspot/test/runtime/SelectionResolution/NoSuchMethodErrorTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SelectionResolution/NoSuchMethodErrorTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,6 @@
* generate NoSuchMethodError
* @modules java.base/jdk.internal.org.objectweb.asm
* @library /runtime/SelectionResolution/classes
- * @build selectionresolution.*
* @run main NoSuchMethodErrorTest
*/
--- a/hotspot/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/ArchiveDoesNotExist.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,13 +27,14 @@
* attempting to use CDS archive. JVM should exit gracefully
* when sharing mode is ON, and continue w/o sharing if sharing
* mode is AUTO.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main ArchiveDoesNotExist
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.io.File;
public class ArchiveDoesNotExist {
--- a/hotspot/test/runtime/SharedArchiveFile/BootAppendTests.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/BootAppendTests.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/**
* @test
* @summary Testing -Xbootclasspath/a support for CDS
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
@@ -32,7 +32,7 @@
* @compile javax/sound/sampled/MyClass.jasm
* @compile org/omg/CORBA/Context.jasm
* @compile nonjdk/myPackage/MyClass.java
- * @build jdk.test.lib.* LoadClass ClassFileInstaller
+ * @build LoadClass
* @run main/othervm BootAppendTests
*/
@@ -44,8 +44,8 @@
import java.nio.file.Path;
import java.nio.file.Paths;
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class BootAppendTests {
private static final String APP_CLASS = "LoadClass";
--- a/hotspot/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/CdsDifferentCompactStrings.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test CdsDifferentCompactStrings
* @summary CDS (class data sharing) requires the same -XX:[+-]CompactStrings
* setting between archive creation time and load time.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class CdsDifferentCompactStrings {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/CdsDifferentObjectAlignment.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +28,15 @@
* This is a negative test; using object alignment for loading that
* is different from object alignment for creating a CDS file
* should fail when loading.
- * @library /testlibrary
+ * @library /test/lib
* @bug 8025642
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
public class CdsDifferentObjectAlignment {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/CdsSameObjectAlignment.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,14 @@
* @test CdsSameObjectAlignment
* @summary Testing CDS (class data sharing) using varying object alignment.
* Using same object alignment for each dump/load pair
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
public class CdsSameObjectAlignment {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/DefaultUseWithClient.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
/*
* @test DefaultUseWithClient
* @summary Test default behavior of sharing with -client
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @ignore 8154204
@@ -32,7 +32,9 @@
* @bug 8032224
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
import java.io.File;
public class DefaultUseWithClient {
--- a/hotspot/test/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/DumpSymbolAndStringTable.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,13 +25,15 @@
* @test
* @bug 8059510
* @summary Test jcmd VM.symboltable and VM.stringtable options
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:+UnlockDiagnosticVMOptions DumpSymbolAndStringTable
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class DumpSymbolAndStringTable {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/SharedArchiveFile/LimitSharedSizes.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/LimitSharedSizes.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,14 +23,16 @@
/* @test LimitSharedSizes
* @summary Test handling of limits on shared space size
- * @library /testlibrary /runtime/CommandLine/OptionsValidation/common
+ * @library /test/lib /runtime/CommandLine/OptionsValidation/common
* @modules java.base/jdk.internal.misc
* java.management
* jdk.attach/sun.tools.attach
* @run main LimitSharedSizes
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
import optionsvalidation.JVMOptionsUtils;
public class LimitSharedSizes {
--- a/hotspot/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/MaxMetaspaceSize.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,12 +25,13 @@
* @test
* @bug 8067187
* @summary Testing CDS dumping with the -XX:MaxMetaspaceSize=<size> option
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class MaxMetaspaceSize {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/PrintSharedArchiveAndExit.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,13 @@
* @test
* @bug 8066670
* @summary Testing -XX:+PrintSharedArchiveAndExit option
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class PrintSharedArchiveAndExit {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/SASymbolTableTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,18 +27,21 @@
* Started failing on 2016.06.24 due to 8160376 on MacOS X so quarantine
* it on that platform:
* @requires os.family != "mac"
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* jdk.hotspot.agent/sun.jvm.hotspot.oops
* jdk.hotspot.agent/sun.jvm.hotspot.memory
* jdk.hotspot.agent/sun.jvm.hotspot.runtime
* jdk.hotspot.agent/sun.jvm.hotspot.tools
* java.management
- * @build SASymbolTableTestAgent SASymbolTableTestAttachee jdk.test.lib.*
+ * @build SASymbolTableTestAgent SASymbolTableTestAttachee
* @run main SASymbolTableTest
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.Platform;
/*
* The purpose of this test is to validate that we can use SA to
--- a/hotspot/test/runtime/SharedArchiveFile/SharedArchiveFile.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedArchiveFile.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +25,13 @@
* @test
* @bug 8014138
* @summary Testing new -XX:SharedArchiveFile=<file-name> option
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class SharedArchiveFile {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/SharedArchiveFile/SharedBaseAddress.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedBaseAddress.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,13 +25,14 @@
* @test SharedBaseAddress
* @summary Test variety of values for SharedBaseAddress, making sure
* VM handles normal values as well as edge values w/o a crash.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main SharedBaseAddress
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class SharedBaseAddress {
--- a/hotspot/test/runtime/SharedArchiveFile/SharedStrings.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedStrings.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,14 +29,15 @@
* @requires (sun.arch.data.model != "32") & (os.family != "windows")
* @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
* @requires vm.gc.G1
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build SharedStringsWb SharedStrings ClassFileInstaller sun.hotspot.WhiteBox
+ * @build SharedStringsWb sun.hotspot.WhiteBox
* @run main ClassFileInstaller -jar whitebox.jar sun.hotspot.WhiteBox
* @run main SharedStrings
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class SharedStrings {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/SharedArchiveFile/SharedStringsDedup.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedStringsDedup.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,13 +28,14 @@
* @requires (sun.arch.data.model != "32") & (os.family != "windows")
* @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
* @requires vm.gc.G1
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main SharedStringsDedup
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.io.File;
// The main purpose is to test the interaction between shared strings
--- a/hotspot/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedStringsRunAuto.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,13 +28,14 @@
* @requires (sun.arch.data.model != "32") & (os.family != "windows")
* @requires (vm.opt.UseCompressedOops == null) | (vm.opt.UseCompressedOops == true)
* @requires vm.gc.G1
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main SharedStringsRunAuto
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.io.File;
public class SharedStringsRunAuto {
--- a/hotspot/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/SharedSymbolTableBucketSize.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +25,13 @@
* @test
* @bug 8059510
* @summary Test SharedSymbolTableBucketSize option
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class SharedSymbolTableBucketSize {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/SharedArchiveFile/SpaceUtilizationCheck.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,13 +24,14 @@
/*
* @test SpaceUtilizationCheck
* @summary Check if the space utilization for shared spaces is adequate
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main SpaceUtilizationCheck
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
--- a/hotspot/test/runtime/Thread/Fibonacci.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Thread/Fibonacci.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +29,7 @@
* make this test inherently unstable on Windows with 32-bit VM data model.
* @requires !(os.family == "windows" & sun.arch.data.model == "32")
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @run main/othervm Fibonacci 15
*/
--- a/hotspot/test/runtime/Thread/TestThreadDumpMonitorContention.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Thread/TestThreadDumpMonitorContention.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,7 @@
* @summary Creates two threads contending for the same lock and checks
* whether jstack reports "locked" by more than one thread.
*
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm TestThreadDumpMonitorContention
@@ -43,7 +43,9 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class TestThreadDumpMonitorContention {
// jstack tends to be closely bound to the VM that we are running
--- a/hotspot/test/runtime/Thread/ThreadPriorities.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Thread/ThreadPriorities.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @summary Creates several threads with different java priorities and checks
* whether jstack reports correct priorities for them.
*
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main ThreadPriorities
@@ -38,7 +38,9 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
import static jdk.test.lib.Asserts.*;
public class ThreadPriorities {
--- a/hotspot/test/runtime/ThreadSignalMask/ThreadSignalMask.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/ThreadSignalMask/ThreadSignalMask.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
* @summary JDK 1.3.0 alters thread signal mask
* @requires (vm.simpleArch == "sparcv9")
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @compile Prog.java
* @run main/native ThreadSignalMask
*/
--- a/hotspot/test/runtime/Throwable/StackTraceLogging.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Throwable/StackTraceLogging.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,18 +25,17 @@
* @test
* @bug 8150778
* @summary check stacktrace logging
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @compile TestThrowable.java
* @run driver StackTraceLogging
*/
import java.io.File;
import java.util.Map;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class StackTraceLogging {
static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
--- a/hotspot/test/runtime/Throwable/TestThrowable.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Throwable/TestThrowable.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @bug 8150778
* @summary Test exception depths, and code to get stack traces
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @run main/othervm -XX:MaxJavaStackTraceDepth=1024 TestThrowable
*/
--- a/hotspot/test/runtime/Throwable/ThrowableIntrospectionSegfault.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Throwable/ThrowableIntrospectionSegfault.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,6 @@
* @bug 8033735
* @summary check backtrace field introspection
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
* @run main ThrowableIntrospectionSegfault
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/TransitiveOverrideCFV50/TransitiveOverrideCFV50.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) 2016, 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 8163808
+ * @modules java.base/jdk.internal.org.objectweb.asm
+ * @run main TransitiveOverrideCFV50
+ */
+
+import java.util.*;
+import java.io.File;
+import java.io.FileOutputStream;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import jdk.internal.org.objectweb.asm.AnnotationVisitor;
+import jdk.internal.org.objectweb.asm.Opcodes;
+
+/*
+ * Test mixed classfile version overriding handling.
+ * Key is to generate P2/C with an older classfile version <=50
+ * Correct response is B.m:2 for older classfiles
+ * This test was added to ensure no assertions in debug
+ * note: for P2/C classfile version >=51, correct answer becomes C.m:3
+ * public class P1.A { public int m() { return 1; }
+ *
+ * public class P1.B extends A { int m() { return 2; }
+ *
+ * public class P2.c extends P1.B { public int m() { return 3; }
+ */
+
+public class TransitiveOverrideCFV50 implements Opcodes{
+ static final String classP1A = "P1.A";
+ static final String classP1B = "P1.B";
+ static final String classP2C = "P2.C";
+
+ static final String callerName = classP2C;
+
+ public static void main(String[] args) throws Exception {
+ ClassLoader cl = new ClassLoader() {
+ public Class<?> loadClass(String name) throws ClassNotFoundException {
+ if (findLoadedClass(name) != null) {
+ return findLoadedClass(name);
+ }
+
+ if (classP1A.equals(name)) {
+ byte[] classFile = dumpP1A();
+ return defineClass(classP1A, classFile, 0, classFile.length);
+ }
+ if (classP1B.equals(name)) {
+ byte[] classFile = dumpP1B();
+ return defineClass(classP1B, classFile, 0, classFile.length);
+ }
+ if (classP2C.equals(name)) {
+ byte[] classFile = dumpP2C();
+ return defineClass(classP2C, classFile, 0, classFile.length);
+ }
+
+ return super.loadClass(name);
+ }
+ };
+
+ cl.loadClass(classP1A);
+ cl.loadClass(classP1B);
+ cl.loadClass(classP2C);
+
+ //cl.loadClass(callerName).getDeclaredMethod("test");
+ cl.loadClass(callerName).newInstance();
+
+ int result = (Integer)cl.loadClass(callerName).getDeclaredMethod("test").invoke(null);
+ if (result != 2) {
+ throw new RuntimeException("expected B.m:2, got " + result);
+ }
+ }
+
+ public static byte[] dumpP1A() {
+
+ ClassWriter cw = new ClassWriter(0);
+ MethodVisitor mv;
+
+ cw.visit(V1_7, ACC_PUBLIC + ACC_SUPER, "P1/A", null, "java/lang/Object", null);
+
+ {
+ mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+ mv.visitCode();
+ mv.visitVarInsn(ALOAD, 0);
+ mv.visitMethodInsn(INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+ mv.visitInsn(RETURN);
+ mv.visitMaxs(1, 1);
+ mv.visitEnd();
+ }
+ {
+ mv = cw.visitMethod(ACC_PUBLIC, "m", "()I", null, null);
+ mv.visitCode();
+ mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+ mv.visitLdcInsn("A.m");
+ mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false);
+ mv.visitIntInsn(BIPUSH, 1);
+ mv.visitInsn(IRETURN);
+ mv.visitMaxs(2, 1);
+ mv.visitEnd();
+ }
+ cw.visitEnd();
+
+ return cw.toByteArray();
+ }
+ public static byte[] dumpP1B() {
+
+ ClassWriter cw = new ClassWriter(0);
+ MethodVisitor mv;
+
+ cw.visit(V1_8, ACC_PUBLIC + ACC_SUPER, "P1/B", null, "P1/A", null);
+
+ {
+ mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+ mv.visitCode();
+ mv.visitVarInsn(ALOAD, 0);
+ mv.visitMethodInsn(INVOKESPECIAL, "P1/A", "<init>", "()V", false);
+ mv.visitInsn(RETURN);
+ mv.visitMaxs(1, 1);
+ mv.visitEnd();
+ }
+ {
+ mv = cw.visitMethod(0, "m", "()I", null, null);
+ mv.visitCode();
+ mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+ mv.visitLdcInsn("B.m");
+ mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false);
+ mv.visitIntInsn(BIPUSH, 2);
+ mv.visitInsn(IRETURN);
+ mv.visitMaxs(2, 1);
+ mv.visitEnd();
+ }
+ cw.visitEnd();
+
+ return cw.toByteArray();
+ }
+ public static byte[] dumpP2C() {
+
+ ClassWriter cw = new ClassWriter(0);
+ MethodVisitor mv;
+
+ cw.visit(V1_6, ACC_PUBLIC + ACC_SUPER, "P2/C", null, "P1/B", null);
+
+ {
+ mv = cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null);
+ mv.visitCode();
+ mv.visitVarInsn(ALOAD, 0);
+ mv.visitMethodInsn(INVOKESPECIAL, "P1/B", "<init>", "()V", false);
+ mv.visitInsn(RETURN);
+ mv.visitMaxs(1, 1);
+ mv.visitEnd();
+ }
+ {
+ mv = cw.visitMethod(ACC_PUBLIC, "m", "()I", null, null);
+ mv.visitCode();
+ mv.visitFieldInsn(GETSTATIC, "java/lang/System", "out", "Ljava/io/PrintStream;");
+ mv.visitLdcInsn("P2/C.m");
+ mv.visitMethodInsn(INVOKEVIRTUAL, "java/io/PrintStream", "println", "(Ljava/lang/String;)V", false);
+ mv.visitIntInsn(BIPUSH, 3);
+ mv.visitInsn(IRETURN);
+ mv.visitMaxs(2, 1);
+ mv.visitEnd();
+ }
+ {
+ mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, "test", "()I", null, null);
+ mv.visitCode();
+ mv.visitTypeInsn(NEW, "P2/C");
+ mv.visitInsn(DUP);
+ mv.visitMethodInsn(INVOKESPECIAL, "P2/C", "<init>", "()V", false);
+ mv.visitMethodInsn(INVOKEVIRTUAL, "P1/A", "m", "()I", false);
+ mv.visitInsn(IRETURN);
+ mv.visitMaxs(3, 2);
+ mv.visitEnd();
+ }
+
+ cw.visitEnd();
+
+ return cw.toByteArray();
+ }
+}
--- a/hotspot/test/runtime/Unsafe/AllocateInstance.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/AllocateInstance.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +24,13 @@
/*
* @test
* @summary Verifies the behaviour of Unsafe.allocateInstance
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main AllocateInstance
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/AllocateMemory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/AllocateMemory.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,13 +25,13 @@
* @test
* @requires vm.compMode != "Xcomp"
* @summary Verifies behaviour of Unsafe.allocateMemory
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:MallocMaxTestWords=100m AllocateMemory
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/CopyMemory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/CopyMemory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +24,13 @@
/*
* @test
* @summary Verifies behaviour of Unsafe.copyMemory
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main CopyMemory
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/DefineClass.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/DefineClass.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +24,7 @@
/*
* @test
* @summary Verifies the behaviour of Unsafe.defineClass
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
@@ -33,7 +33,8 @@
import java.security.ProtectionDomain;
import java.io.InputStream;
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/FieldOffset.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/FieldOffset.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 @@
/*
* @test
* @summary Verifies the behaviour of Unsafe.fieldOffset
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main FieldOffset
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import java.lang.reflect.*;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetField.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetField.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +24,13 @@
/*
* @test
* @summary Verifies behaviour of Unsafe.getField
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetField
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import java.lang.reflect.*;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetPutAddress.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetPutAddress.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +24,14 @@
/*
* @test
* Verify behaviour of Unsafe.get/putAddress and Unsafe.addressSize
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetPutAddress
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetPutBoolean.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetPutBoolean.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 @@
/*
* @test
* @summary Verify behaviour of Unsafe.get/putBoolean
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetPutBoolean
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetPutByte.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetPutByte.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 @@
/*
* @test
* @summary Verify behaviour of Unsafe.get/putByte
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetPutByte
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetPutChar.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetPutChar.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 @@
/*
* @test
* @summary Verify behaviour of Unsafe.get/putChar
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetPutChar
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetPutDouble.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetPutDouble.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 @@
/*
* @test
* @summary Verify behaviour of Unsafe.get/putDouble
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetPutDouble
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetPutFloat.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetPutFloat.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 @@
/*
* @test
* @summary Verify behaviour of Unsafe.get/putFloat
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetPutFloat
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetPutInt.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetPutInt.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 +23,14 @@
/*
* @test
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetPutInt
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetPutLong.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetPutLong.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 @@
/*
* @test
* @summary Verify behaviour of Unsafe.get/putLong
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetPutLong
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetPutObject.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetPutObject.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 @@
/*
* @test
* @summary Verify behaviour of Unsafe.get/putObject
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetPutObject
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetPutShort.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetPutShort.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 @@
/*
* @test
* @summary Verify behaviour of Unsafe.get/putShort
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main GetPutShort
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/GetUncompressedObject.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/GetUncompressedObject.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,15 +23,14 @@
/* @test
* @bug 8022853
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
- * @build jdk.test.lib.*
* @run main GetUncompressedObject
*/
import static jdk.test.lib.Asserts.*;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
public class GetUncompressedObject {
--- a/hotspot/test/runtime/Unsafe/NestedUnsafe.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/NestedUnsafe.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @summary Creates an anonymous class inside of an anonymous class.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
@@ -34,7 +34,8 @@
import java.security.ProtectionDomain;
import java.io.InputStream;
import java.lang.*;
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
@@ -79,7 +80,7 @@
" throw new RuntimeException(\"Exception: \" + ex.toString()); " +
" } " +
"} } ",
- "-XaddExports:java.base/jdk.internal.misc=ALL-UNNAMED");
+ "--add-exports=java.base/jdk.internal.misc=ALL-UNNAMED");
Class klass2 = unsafe.defineAnonymousClass(NestedUnsafe.class, klassbuf2, new Object[0]);
try {
klass2.getMethod("doit").invoke(null);
--- a/hotspot/test/runtime/Unsafe/PageSize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/PageSize.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,14 @@
/*
* @test
* @summary Make sure pageSize() returns a value that is a power of two
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main PageSize
*/
import java.lang.reflect.Field;
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/PrimitiveHostClass.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/PrimitiveHostClass.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,7 +31,6 @@
* @test PrimitiveHostClass
* @bug 8140665
* @summary Throws IllegalArgumentException if host class is a primitive class.
- * @library /testlibrary
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* @compile -XDignore.symbol.file PrimitiveHostClass.java
--- a/hotspot/test/runtime/Unsafe/RangeCheck.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/RangeCheck.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,12 +25,16 @@
* @test
* @bug 8001071
* @summary Add simple range check into VM implemenation of Unsafe access methods
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
+import jdk.test.lib.Utils;
+
import jdk.internal.misc.Unsafe;
public class RangeCheck {
--- a/hotspot/test/runtime/Unsafe/Reallocate.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/Reallocate.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,13 +25,13 @@
* @test
* @requires vm.compMode != "Xcomp"
* @bug 8058897
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:MallocMaxTestWords=100m Reallocate
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/SetMemory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/SetMemory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +24,13 @@
/*
* @test
* @summary Verifies that setMemory works correctly
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main SetMemory
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/Unsafe/ThrowException.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/Unsafe/ThrowException.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +24,13 @@
/*
* @test
* @summary Verify that throwException() can throw an exception
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main ThrowException
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/XCheckJniJsig/XCheckJSig.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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 @@
* @test
* @bug 7051189 8023393
* @summary Need to suppress info message if -Xcheck:jni is used with libjsig.so
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main XCheckJSig
@@ -33,7 +33,9 @@
import java.io.File;
import java.util.Map;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
public class XCheckJSig {
public static void main(String args[]) throws Throwable {
--- a/hotspot/test/runtime/classFileParserBug/ClassFileParserBug.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/classFileParserBug/ClassFileParserBug.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
/*
* @test
* @bug 8040018
- * @library /testlibrary
+ * @library /test/lib
* @summary Check for exception instead of assert.
* @modules java.base/jdk.internal.misc
* java.management
@@ -32,7 +32,8 @@
*/
import java.io.File;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class ClassFileParserBug {
public static void main(String args[]) throws Throwable {
--- a/hotspot/test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/classFileParserBug/TestEmptyBootstrapMethodsAttr.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
/*
* @test TestEmptyBootstrapMethodsAttr
* @bug 8041918
- * @library /testlibrary
+ * @library /test/lib
* @summary Test empty bootstrap_methods table within BootstrapMethods attribute
* @modules java.base/jdk.internal.misc
* java.management
@@ -33,7 +33,9 @@
*/
import java.io.File;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.JDKToolFinder;
public class TestEmptyBootstrapMethodsAttr {
--- a/hotspot/test/runtime/contended/Options.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/contended/Options.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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
@@ -21,14 +21,15 @@
* questions.
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
/*
* @test
* @bug 8006997
* @summary ContendedPaddingWidth should be range-checked
*
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main Options
--- a/hotspot/test/runtime/duplAttributes/DuplAttributesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/duplAttributes/DuplAttributesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
/*
* @test
* @bug 8040292
- * @library /testlibrary
+ * @library /test/lib
* @summary Throw exceptions when duplicate attributes are detected.
* @modules java.base/jdk.internal.misc
* java.management
@@ -32,7 +32,8 @@
*/
import java.io.File;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class DuplAttributesTest {
--- a/hotspot/test/runtime/execstack/Testexecstack.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/execstack/Testexecstack.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,14 +28,15 @@
* @bug 8025519
* @summary Stack guard pages lost after loading library with executable stack.
* @requires (os.family == "linux")
- * @library /testlibrary
- * @build jdk.test.lib.*
+ * @library /test/lib
+ * @modules java.base/jdk.internal.misc
* @compile Test.java
* @compile TestMT.java
* @run driver Testexecstack
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class Testexecstack {
--- a/hotspot/test/runtime/getSysPackage/GetSysPkgTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/getSysPackage/GetSysPkgTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,14 +26,16 @@
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.loader
* java.desktop
- * @library /testlibrary
+ * @library /test/lib
* @run main/othervm GetSysPkgTest
*/
import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
// Test that JVM get_system_package() returns the module location for defined packages.
public class GetSysPkgTest {
--- a/hotspot/test/runtime/interned/SanityTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/interned/SanityTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,8 +25,8 @@
* @test SanityTest
* @summary Sanity check of String.intern() & GC
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build SanityTest
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI SanityTest
--- a/hotspot/test/runtime/jni/ToStringInInterfaceTest/ToStringTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/jni/ToStringInInterfaceTest/ToStringTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,8 +23,7 @@
/* @test
* @bug 8072588
- * @build InterfaceWithToString
- * @build ImplementationOfWithToString
+ * @build InterfaceWithToString ImplementationOfWithToString
* @run main/native ToStringTest
*/
public final class ToStringTest {
--- a/hotspot/test/runtime/libadimalloc.solaris.sparc/Testlibadimalloc.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/libadimalloc.solaris.sparc/Testlibadimalloc.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,8 +28,7 @@
* @summary make sure the Solaris Sparc M7 libadimalloc.so library generates SIGSEGV's on buffer overflow
* @requires (os.family == "solaris" & os.arch == "sparcv9")
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build jdk.test.lib.*
+ * @library /test/lib
* @compile SEGVOverflow.java
* @run driver Testlibadimalloc
*/
@@ -37,7 +36,7 @@
import java.io.*;
import java.nio.file.*;
import java.util.*;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
public class Testlibadimalloc {
--- a/hotspot/test/runtime/logging/BiasedLockingTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/BiasedLockingTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,15 +25,14 @@
* @test
* @bug 8149383
* @summary -Xlog:biasedlocking should have logging from statements in the source code
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver BiasedLockingTest
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class BiasedLockingTest {
static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
--- a/hotspot/test/runtime/logging/ClassInitializationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/ClassInitializationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,15 +26,14 @@
* @test ClassInitializationTest
* @bug 8142976
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @compile BadMap50.jasm
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.Platform jdk.test.lib.ProcessTools
* @run driver ClassInitializationTest
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
public class ClassInitializationTest {
--- a/hotspot/test/runtime/logging/ClassLoadUnloadTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/ClassLoadUnloadTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,13 +26,14 @@
* @test ClassLoadUnloadTest
* @bug 8142506
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /runtime/testlibrary
+ * @library /test/lib /runtime/testlibrary
* @library classes
- * @build ClassUnloadCommon test.Empty jdk.test.lib.* jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
+ * @build test.Empty
* @run driver ClassLoadUnloadTest
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.util.ArrayList;
--- a/hotspot/test/runtime/logging/ClassResolutionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/ClassResolutionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,13 +26,12 @@
* @test ClassResolutionTest
* @bug 8144874
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
+ * @library /test/lib
* @run driver ClassResolutionTest
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
--- a/hotspot/test/runtime/logging/CompressedOopsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/CompressedOopsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,16 +26,15 @@
* @bug 8149991
* @requires (sun.arch.data.model == "64")
* @summary -Xlog:gc+heap+coops=info should have output from the code
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.Platform jdk.test.lib.ProcessTools
* @run driver CompressedOopsTest
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
public class CompressedOopsTest {
static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
--- a/hotspot/test/runtime/logging/DefaultMethodsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/DefaultMethodsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,15 +25,14 @@
* @test
* @bug 8139564
* @summary defaultmethods=debug should have logging from each of the statements in the code
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver DefaultMethodsTest
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class DefaultMethodsTest {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/logging/ExceptionsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/ExceptionsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,17 +25,16 @@
* @test
* @bug 8141211 8147477
* @summary exceptions=info output should have an exception message for interpreter methods
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver ExceptionsTest
*/
import java.io.File;
import java.util.Map;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class ExceptionsTest {
static void updateEnvironment(ProcessBuilder pb, String environmentVariable, String value) {
--- a/hotspot/test/runtime/logging/ItablesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/ItablesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @bug 8141564
* @summary itables=trace should have logging from each of the statements
* in the code
- * @library /testlibrary
+ * @library /test/lib
* @compile ClassB.java
* ItablesVtableTest.java
* @modules java.base/jdk.internal.misc
@@ -34,7 +34,9 @@
* @run driver ItablesTest
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
public class ItablesTest {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/logging/LoaderConstraintsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/LoaderConstraintsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,13 +26,12 @@
* @test LoaderConstraintsTest
* @bug 8149996
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /runtime/testlibrary
- * @library classes
- * @build ClassUnloadCommon test.Empty jdk.test.lib.* jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
+ * @library /test/lib /runtime/testlibrary classes
* @run driver LoaderConstraintsTest
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.lang.ref.WeakReference;
import java.lang.reflect.Method;
import java.util.ArrayList;
--- a/hotspot/test/runtime/logging/ModulesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/ModulesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,15 +24,14 @@
/*
* @test
* @summary modules=debug should have logging from statements in the code
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run main ModulesTest
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class ModulesTest {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/logging/MonitorInflationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/MonitorInflationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,15 +25,14 @@
* @test
* @bug 8133885
* @summary monitorinflation=debug should have logging from each of the statements in the code
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver MonitorInflationTest
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class MonitorInflationTest {
static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
--- a/hotspot/test/runtime/logging/MonitorMismatchTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/MonitorMismatchTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,14 +26,13 @@
* @test MonitorMismatchTest
* @bug 8150084
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @compile MonitorMismatchHelper.jasm
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools jdk.test.lib.Platform
* @run driver MonitorMismatchTest
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Platform;
public class MonitorMismatchTest {
--- a/hotspot/test/runtime/logging/OsCpuLoggingTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/OsCpuLoggingTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,16 +25,17 @@
* @test
* @bug 8151939
* @summary os+cpu output should contain some os,cpu information
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver OsCpuLoggingTest
*/
import java.io.File;
import java.util.Map;
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class OsCpuLoggingTest {
--- a/hotspot/test/runtime/logging/ProtectionDomainVerificationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/ProtectionDomainVerificationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,14 +25,13 @@
* @test ProtectionDomainVerificationTest
* @bug 8149064
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.Platform jdk.test.lib.ProcessTools
+ * @library /test/lib
* @run driver ProtectionDomainVerificationTest
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
public class ProtectionDomainVerificationTest {
--- a/hotspot/test/runtime/logging/RemovedDevelopFlagsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/RemovedDevelopFlagsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,11 +26,12 @@
* @test RemovedDevelopFlagsTest
* @bug 8146632
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
+ * @library /test/lib
* @run driver RemovedDevelopFlagsTest
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class RemovedDevelopFlagsTest {
public static ProcessBuilder pb;
--- a/hotspot/test/runtime/logging/SafepointCleanupTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/SafepointCleanupTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,15 +25,14 @@
* @test
* @bug 8149991
* @summary safepoint+cleanup=info should have output from the code
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver SafepointCleanupTest
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class SafepointCleanupTest {
static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
--- a/hotspot/test/runtime/logging/SafepointTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/SafepointTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,16 +25,15 @@
* @test
* @bug 8140348
* @summary safepoint=trace should have output from each log statement in the code
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver SafepointTest
*/
import java.lang.ref.WeakReference;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class SafepointTest {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/logging/StartupTimeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/StartupTimeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,15 +25,14 @@
* @test
* @bug 8148630
* @summary -Xlog:startuptime should produce logging from the source code
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver StartupTimeTest
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class StartupTimeTest {
static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
--- a/hotspot/test/runtime/logging/ThreadLoggingTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/ThreadLoggingTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,18 +26,17 @@
* @test
* @bug 8149036 8150619
* @summary os+thread output should contain logging calls for thread start stop attaches detaches
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver ThreadLoggingTest
* @author Thomas Stuefe (SAP)
*/
import java.io.File;
import java.util.Map;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class ThreadLoggingTest {
--- a/hotspot/test/runtime/logging/VMOperationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/VMOperationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,16 +25,15 @@
* @test
* @bug 8143157
* @summary vmoperation=debug should have logging output
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver VMOperationTest
*/
import java.lang.ref.WeakReference;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class VMOperationTest {
public static void main(String[] args) throws Exception {
--- a/hotspot/test/runtime/logging/VerificationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/VerificationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,15 +25,14 @@
* @test
* @bug 8150083
* @summary verification=info output should have output from the code
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build jdk.test.lib.OutputAnalyzer jdk.test.lib.ProcessTools
* @run driver VerificationTest
*/
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class VerificationTest {
static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
--- a/hotspot/test/runtime/logging/VtablesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/logging/VtablesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @test
* @bug 8141564
* @summary vtables=trace should have logging from each of the statements in the code
- * @library /testlibrary
+ * @library /test/lib
* @compile ClassB.java
* p1/A.java
* p2/B.jcod
@@ -36,7 +36,9 @@
* @run driver VtablesTest
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class VtablesTest {
public static void main(String[] args) throws Exception {
@@ -46,10 +48,10 @@
output.shouldContain("copy vtable from ClassA to ClassB");
output.shouldContain("Initializing: ClassB");
output.shouldContain("adding ClassB.Method1()V");
- output.shouldContain("] overriding with ClassB::ClassB.Method2()V");
+ output.shouldContain("] overriding with ClassB.Method2()V");
output.shouldContain("invokevirtual resolved method: caller-class:ClassB");
output.shouldContain("invokevirtual selected method: receiver-class:ClassB");
- output.shouldContain("NOT overriding with p2.D::p2.D.nooverride()V");
+ output.shouldContain("NOT overriding with p2.D.nooverride()V");
output.shouldHaveExitValue(0);
pb = ProcessTools.createJavaProcessBuilder("-Xlog:vtables=trace", "p1/C");
--- a/hotspot/test/runtime/memory/LargePages/TestLargePageSizeInBytes.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/memory/LargePages/TestLargePageSizeInBytes.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,15 +24,15 @@
/* @test TestLargePageSizeInBytes
* @summary Tests that the flag -XX:LargePageSizeInBytes does not cause warnings on Solaris
* @bug 8049536
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver TestLargePageSizeInBytes
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
public class TestLargePageSizeInBytes {
private static long M = 1024L * 1024L;
--- a/hotspot/test/runtime/memory/LargePages/TestLargePagesFlags.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/memory/LargePages/TestLargePagesFlags.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,15 +23,15 @@
/* @test TestLargePagesFlags
* @summary Tests how large pages are choosen depending on the given large pages flag combinations.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main TestLargePagesFlags
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
import java.util.ArrayList;
public class TestLargePagesFlags {
--- a/hotspot/test/runtime/memory/ReadFromNoaccessArea.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/memory/ReadFromNoaccessArea.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,16 +24,18 @@
/*
* @test
* @summary Test that touching noaccess area in class ReservedHeapSpace results in SIGSEGV/ACCESS_VIOLATION
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build ReadFromNoaccessArea
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ReadFromNoaccessArea
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import sun.hotspot.WhiteBox;
public class ReadFromNoaccessArea {
--- a/hotspot/test/runtime/memory/ReadVMPageSize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/memory/ReadVMPageSize.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,13 +25,12 @@
* @test
* @summary Using WhiteBox to get VM page size
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build ReadVMPageSize
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ReadVMPageSize
*/
-import jdk.test.lib.*;
import sun.hotspot.WhiteBox;
public class ReadVMPageSize {
--- a/hotspot/test/runtime/memory/ReserveMemory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/memory/ReserveMemory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,16 +28,17 @@
* @bug 8012015
* @requires !(os.family == "aix")
* @summary Make sure reserved (but uncommitted) memory is not accessible
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build ReserveMemory
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ReserveMemory
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
import sun.hotspot.WhiteBox;
--- a/hotspot/test/runtime/memory/RunUnitTestsConcurrently.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/memory/RunUnitTestsConcurrently.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,16 +24,16 @@
/*
* @test
* @summary Test launches unit tests inside vm concurrently
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build RunUnitTestsConcurrently
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI RunUnitTestsConcurrently 30 15000
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
import sun.hotspot.WhiteBox;
public class RunUnitTestsConcurrently {
--- a/hotspot/test/runtime/memory/StressVirtualSpaceResize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/memory/StressVirtualSpaceResize.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,8 +25,8 @@
* @test
* @summary Stress test that expands/shrinks VirtualSpace
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build StressVirtualSpaceResize
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StressVirtualSpaceResize
--- a/hotspot/test/runtime/modules/AccModuleTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccModuleTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,15 +23,12 @@
/*
* @test
- * @library /testlibrary
* @modules java.base/jdk.internal.misc
* @compile acc_module.jcod
- * @build AccModuleTest
* @run main AccModuleTest
*/
import java.io.File;
-import jdk.test.lib.*;
public class AccModuleTest {
--- a/hotspot/test/runtime/modules/AccessCheck/CheckRead.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/CheckRead.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test that if module m1 can not read module m2, then class p1.c1
* in module m1 can not access p2.c2 in module m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build CheckRead
* @run main/othervm -Xbootclasspath/a:. CheckRead
*/
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_CheckRead.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test that if module m1 can not read module m2, then class p1.c1
* in module m1 can not access p2.c2 in module m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build DiffCL_CheckRead
* @run main/othervm -Xbootclasspath/a:. DiffCL_CheckRead
*/
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualOther.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,11 +29,10 @@
* is exported specifically to module m3, then class p1.c1 in m1 can not
* access p2.c2 in m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build DiffCL_ExpQualOther
* @run main/othervm -Xbootclasspath/a:. DiffCL_ExpQualOther
*/
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpQualToM1.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary class p1.c1 defined in m1 tries to access p2.c2 defined in m2.
* Access allowed since m1 can read m2 and package p2 is exported to m1.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build DiffCL_ExpQualToM1
* @run main/othervm -Xbootclasspath/a:. DiffCL_ExpQualToM1
*/
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_ExpUnqual.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test that if module m1 can read module m2, and package p2 in m2 is
* exported unqualifiedly, then class p1.c1 in m1 can read p2.c2 in m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build DiffCL_ExpUnqual
* @run main/othervm -Xbootclasspath/a:. DiffCL_ExpUnqual
*/
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_PkgNotExp.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test that if module m1 can read module m2, but package p2 in m2 is not
* exported, then class p1.c1 in m1 can not read p2.c2 in m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build DiffCL_PkgNotExp
* @run main/othervm -Xbootclasspath/a:. DiffCL_PkgNotExp
*/
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_Umod.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_Umod.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
/*
* @test
* @summary class p1.c1 defined in m1 tries to access p2.c2 defined in unnamed module.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.module
* @compile myloaders/MyDiffClassLoader.java
@@ -34,7 +34,6 @@
* @compile p1/c1.java
* @compile p1/c1ReadEdgeDiffLoader.java
* @compile p1/c1Loose.java
- * @build DiffCL_Umod
* @run main/othervm -Xbootclasspath/a:. DiffCL_Umod
*/
--- a/hotspot/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/DiffCL_UmodUpkg.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,12 +28,11 @@
* @summary class p3.c3 defined in module m1 tries to access c4 defined in an unnamed package
* and an unnamed module.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile c4.java
* @compile p3/c3.jcod
* @compile p3/c3ReadEdgeDiffLoader.jcod
- * @build DiffCL_UmodUpkg
* @run main/othervm -Xbootclasspath/a:. DiffCL_UmodUpkg
*/
--- a/hotspot/test/runtime/modules/AccessCheck/ExpQualOther.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/ExpQualOther.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,11 +29,10 @@
* is exported specifically to module m3, then class p1.c1 in m1 can not
* access p2.c2 in m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build ExpQualOther
* @run main/othervm -Xbootclasspath/a:. ExpQualOther
*/
--- a/hotspot/test/runtime/modules/AccessCheck/ExpQualToM1.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/ExpQualToM1.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test that if module m1 can read module m2, AND package p2 in m2 is
* exported qualifiedly to m1, then class p1.c1 in m1 can read p2.c2 in m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build ExpQualToM1
* @run main/othervm -Xbootclasspath/a:. ExpQualToM1
*/
--- a/hotspot/test/runtime/modules/AccessCheck/ExpUnqual.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/ExpUnqual.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test that if module m1 can read module m2, AND package p2 in module2 is
* exported unqualifiedly, then class p1.c1 in m1 can read p2.c2 in m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build ExpUnqual
* @run main/othervm -Xbootclasspath/a:. ExpUnqual
*/
--- a/hotspot/test/runtime/modules/AccessCheck/ExportAllUnnamed.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/ExportAllUnnamed.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,13 +27,12 @@
* @test
* @summary Test if package p2 in module m2 is exported to all unnamed,
* then class p1.c1 in an unnamed module can read p2.c2 in module m2.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.module
* @compile myloaders/MySameClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build ExportAllUnnamed
* @run main/othervm -Xbootclasspath/a:. ExportAllUnnamed
*/
--- a/hotspot/test/runtime/modules/AccessCheck/PkgNotExp.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/PkgNotExp.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test that if module m1 can read module m2, but package p2 in m2 is not
* exported, then class p1.c1 in m1 can not read p2.c2 in m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build PkgNotExp
* @run main/othervm -Xbootclasspath/a:. PkgNotExp
*/
--- a/hotspot/test/runtime/modules/AccessCheck/Umod.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/Umod.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
/*
* @test
* @summary class p1.c1 defined in m1 tries to access p2.c2 defined in unnamed module.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.base/jdk.internal.module
* @compile myloaders/MySameClassLoader.java
@@ -34,7 +34,6 @@
* @compile p1/c1.java
* @compile p1/c1ReadEdge.java
* @compile p1/c1Loose.java
- * @build Umod
* @run main/othervm -Xbootclasspath/a:. Umod
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpQualOther.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,11 +29,10 @@
* Access is denied, since an unnamed module can read all modules but p2 in module
* m2 is exported specifically to module m1, not to all modules.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build UmodDiffCL_ExpQualOther
* @run main/othervm -Xbootclasspath/a:. UmodDiffCL_ExpQualOther
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_ExpUnqual.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,11 +29,10 @@
* Access allowed, an unnamed module can read all modules and p2 in module m2
* which is exported unqualifiedly.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build UmodDiffCL_ExpUnqual
* @run main/othervm -Xbootclasspath/a:. UmodDiffCL_ExpUnqual
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_PkgNotExp.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,10 +29,9 @@
* Access is denied since even though unnamed module can read all modules, p2
* in module m2 is not exported at all.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile p1/c1.java
- * @build UmodDiffCL_PkgNotExp
* @run main/othervm -Xbootclasspath/a:. UmodDiffCL_PkgNotExp
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_Umod.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_Umod.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +32,6 @@
* @compile myloaders/MyDiffClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build UmodDiffCL_Umod
* @run main/othervm -Xbootclasspath/a:. UmodDiffCL_Umod
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_UmodUpkg.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodDiffCL_UmodUpkg.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
* @compile myloaders/MyDiffClassLoader.java
* @compile c4.java
* @compile p3/c3.jcod
- * @build UmodDiffCL_UmodUpkg
* @run main/othervm -Xbootclasspath/a:. UmodDiffCL_UmodUpkg
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUPkg.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUPkg.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,12 +27,11 @@
* @test
* @summary class p3.c3 defined in module m1 tries to access c4 defined in unnamed module.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile c4.java
* @compile p3/c3.jcod
* @compile p3/c3ReadEdge.jcod
- * @build UmodUPkg
* @run main/othervm -Xbootclasspath/a:. UmodUPkg
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_ExpQualOther.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,11 +29,10 @@
* Access is denied, since an unnamed module can read all modules but p6 in module
* m2 is exported specifically to module m1, not to all modules.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile p6/c6.java
* @compile c5.java
- * @build UmodUpkgDiffCL_ExpQualOther
* @run main/othervm -Xbootclasspath/a:. UmodUpkgDiffCL_ExpQualOther
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_NotExp.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary class c5 in an unnamed module can read module m2, but package p6 in module m2 is not exported.
* Access denied since even though unnamed module can read all modules, p6 in module m2 is not exported at all.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MyDiffClassLoader.java
* @compile p6/c6.java
* @compile c5.java
- * @build UmodUpkgDiffCL_NotExp
* @run main/othervm -Xbootclasspath/a:. UmodUpkgDiffCL_NotExp
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_Umod.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUpkgDiffCL_Umod.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +30,6 @@
* @compile myloaders/MyDiffClassLoader.java
* @compile p6/c6.java
* @compile c5.java
- * @build UmodUpkgDiffCL_Umod
* @run main/othervm -Xbootclasspath/a:. UmodUpkgDiffCL_Umod
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_ExpQualOther.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test that if class c5 in an unnamed module can read package p6 in module m2, but package p6 in module m2 is
* exported qualifiedly to module m3, then class c5 in an unnamed module can not read p6.c6 in module m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile p6/c6.java
* @compile c5.java
- * @build UmodUpkg_ExpQualOther
* @run main/othervm -Xbootclasspath/a:. UmodUpkg_ExpQualOther
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_NotExp.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test if package p6 in module m2 is not exported, then class c5
* in an unnamed module can not access p6.c2 in module m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile p6/c6.java
* @compile c5.java
- * @build UmodUpkg_NotExp
* @run main/othervm -Xbootclasspath/a:. UmodUpkg_NotExp
*/
--- a/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_Umod.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/UmodUpkg_Umod.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +30,6 @@
* @compile myloaders/MySameClassLoader.java
* @compile p6/c6.java
* @compile c5.java
- * @build UmodUpkg_Umod
* @run main/othervm -Xbootclasspath/a:. UmodUpkg_Umod
*/
--- a/hotspot/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/Umod_ExpQualOther.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test that if package p2 in module m2 is exported to module m3,
* then class p1.c1 in an unnamed module can not read p2.c2 in module m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build Umod_ExpQualOther
* @run main/othervm -Xbootclasspath/a:. Umod_ExpQualOther
*/
--- a/hotspot/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/Umod_ExpUnqual.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test if package p2 in module m2 is exported unqualifiedly,
* then class p1.c1 in an unnamed module can read p2.c2 in module m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build Umod_ExpUnqual
* @run main/othervm -Xbootclasspath/a:. Umod_ExpUnqual
*/
--- a/hotspot/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/Umod_PkgNotExp.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,10 @@
* @summary Test if package p2 in module m2 is not exported, then class p1.c1
* in an unnamed module can not access p2.c2 in module m2.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile myloaders/MySameClassLoader.java
* @compile p2/c2.java
* @compile p1/c1.java
- * @build Umod_PkgNotExp
* @run main/othervm -Xbootclasspath/a:. Umod_PkgNotExp
*/
--- a/hotspot/test/runtime/modules/AccessCheck/Umod_UmodUpkg.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheck/Umod_UmodUpkg.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,6 @@
* @compile myloaders/MySameClassLoader.java
* @compile c4.java
* @compile p3/c3.jcod
- * @build Umod_UmodUpkg
* @run main/othervm -Xbootclasspath/a:. Umod_UmodUpkg
*/
--- a/hotspot/test/runtime/modules/AccessCheckAllUnnamed.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheckAllUnnamed.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @compile p1/c1.java
* @build sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/AccessCheckExp.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheckExp.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @compile p1/c1.java
* @build sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/AccessCheckJavaBase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheckJavaBase.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @build sun.hotspot.WhiteBox
* @compile/module=java.base java/lang/reflect/ModuleHelper.java
--- a/hotspot/test/runtime/modules/AccessCheckRead.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheckRead.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @compile p1/c1.java
* @build sun.hotspot.WhiteBox
@@ -34,7 +34,6 @@
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI AccessCheckRead
*/
-import jdk.test.lib.*;
import java.lang.reflect.Module;
import static jdk.test.lib.Asserts.*;
--- a/hotspot/test/runtime/modules/AccessCheckSuper.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheckSuper.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @compile p3/c3.java
* @build sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/AccessCheckUnnamed.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheckUnnamed.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @compile p1/c1.java
* @build sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/AccessCheckWorks.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/AccessCheckWorks.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @compile p1/c1.java
* @build sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/ExportTwice.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/ExportTwice.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @compile p1/c1.java
* @build sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/IgnoreModulePropertiesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/IgnoreModulePropertiesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,10 +26,11 @@
* @bug 8136930
* @summary Test that the VM ignores explicitly specified module internal properties.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
// Test that the VM ignores module related properties such as "jdk.module.addmods"
// and jdk.module.addreads.0" that can only be set using module options.
--- a/hotspot/test/runtime/modules/JVMAddModuleExportToAllUnnamed.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/JVMAddModuleExportToAllUnnamed.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @compile p1/c1.java
* @build sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/JVMAddModuleExports.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/JVMAddModuleExports.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @build sun.hotspot.WhiteBox
* @compile/module=java.base java/lang/reflect/ModuleHelper.java
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/JVMAddModuleExportsToAll.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/JVMAddModuleExportsToAll.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @compile p1/c1.java
* @build sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/JVMAddModulePackage.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/JVMAddModulePackage.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @build sun.hotspot.WhiteBox
* @compile/module=java.base java/lang/reflect/ModuleHelper.java
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/JVMAddReadsModule.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/JVMAddReadsModule.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @build sun.hotspot.WhiteBox
* @compile/module=java.base java/lang/reflect/ModuleHelper.java
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/JVMCanReadModule.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/JVMCanReadModule.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @build sun.hotspot.WhiteBox
* @compile/module=java.base java/lang/reflect/ModuleHelper.java
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/JVMDefineModule.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/JVMDefineModule.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @build sun.hotspot.WhiteBox
* @compile/module=java.base java/lang/reflect/ModuleHelper.java
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/JVMGetModuleByPkgName.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/JVMGetModuleByPkgName.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @compile p2/c2.java
* @build sun.hotspot.WhiteBox
* @compile/module=java.base java/lang/reflect/ModuleHelper.java
--- a/hotspot/test/runtime/modules/JVMIsExportedToModule.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/JVMIsExportedToModule.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/*
* @test
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @build sun.hotspot.WhiteBox
* @compile/module=java.base java/lang/reflect/ModuleHelper.java
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/LoadUnloadModuleStress.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/LoadUnloadModuleStress.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
* @test
* @summary Ensure module information is cleaned when owning class loader unloads
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ..
+ * @library /test/lib ..
* @build sun.hotspot.WhiteBox
* @compile/module=java.base java/lang/reflect/ModuleHelper.java
* @run main ClassFileInstaller sun.hotspot.WhiteBox
--- a/hotspot/test/runtime/modules/ModuleOptionsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/ModuleOptionsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,10 +27,11 @@
* @summary Test that the VM only recognizes the last specified --add-modules
* and --list-modules options
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
// Test that the VM behaves correctly when processing module related options.
public class ModuleOptionsTest {
--- a/hotspot/test/runtime/modules/ModuleOptionsWarn.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/ModuleOptionsWarn.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,10 +26,11 @@
* @bug 8162415
* @summary Test warnings for ignored properties.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
// Test that the VM behaves correctly when processing command line module system properties.
public class ModuleOptionsWarn {
--- a/hotspot/test/runtime/modules/ModuleStress/ExportModuleStressTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/ModuleStress/ExportModuleStressTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,15 +26,15 @@
* @bug 8156871
* @summary package in the boot layer is repeatedly exported to unique module created in layers on top of the boot layer
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile ../CompilerUtils.java
- * @build ExportModuleStressTest
* @run main/othervm ExportModuleStressTest
*/
import java.nio.file.Path;
import java.nio.file.Paths;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class ExportModuleStressTest {
--- a/hotspot/test/runtime/modules/ModuleStress/ModuleStress.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/ModuleStress/ModuleStress.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,16 +28,17 @@
* @bug 8159262
* @summary Test differing scenarios where a module's readability list and a package's exportability list should be walked
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile ../AccessCheck/ModuleLibrary.java
* @compile ModuleSameCLMain.java
* @compile ModuleNonBuiltinCLMain.java
* @compile CustomSystemClassLoader.java
- * @build ModuleStress
* @run main/othervm ModuleStress
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.InMemoryJavaCompiler;
import java.io.File;
public class ModuleStress {
--- a/hotspot/test/runtime/modules/ModuleStress/ModuleStressGC.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/ModuleStress/ModuleStressGC.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,15 +26,15 @@
* @bug 8159262
* @summary layers over the boot layer are repeatedly created, during this iteration, GCs are forced to verify correct walk of module and package lists.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @compile ../CompilerUtils.java
- * @build ModuleStressGC
* @run main/othervm ModuleStressGC
*/
import java.nio.file.Path;
import java.nio.file.Paths;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class ModuleStressGC {
--- a/hotspot/test/runtime/modules/PatchModule/BasicJarBuilder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/PatchModule/BasicJarBuilder.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,8 +29,6 @@
* Output: A jar containing compiled classes, placed in a test classes folder
*/
-import jdk.test.lib.*;
-
import java.io.File;
import java.util.ArrayList;
import sun.tools.jar.Main;
--- a/hotspot/test/runtime/modules/PatchModule/PatchModule2Dirs.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModule2Dirs.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,12 +25,14 @@
* @test
* @summary Make sure --patch-module works with multiple directories.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @compile PatchModule2DirsMain.java
* @run main PatchModule2Dirs
*/
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import java.io.File;
public class PatchModule2Dirs {
--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleCDS.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleCDS.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,13 +23,14 @@
/*
* @test
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @run main PatchModuleCDS
*/
import java.io.File;
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class PatchModuleCDS {
--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleDupJavaBase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleDupJavaBase.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,10 +25,11 @@
* @test
* @summary VM exit initialization results if java.base is specificed more than once to --patch-module.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class PatchModuleDupJavaBase {
// The VM should exit initialization if java.base is specified
--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleDupModule.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleDupModule.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,10 +25,11 @@
* @test
* @summary Module system initialization exception results if a module is specificed twice to --patch-module.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class PatchModuleDupModule {
--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleJavaBase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleJavaBase.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,12 +26,14 @@
* @bug 8130399
* @summary Make sure --patch-module works for java.base.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @compile PatchModuleMain.java
* @run main PatchModuleJavaBase
*/
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class PatchModuleJavaBase {
--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,12 +26,14 @@
* @bug 8130399
* @summary Make sure --patch-module works for modules besides java.base.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @compile PatchModuleMain.java
* @run main PatchModuleTest
*/
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class PatchModuleTest {
--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleTestJar.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleTestJar.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,15 +24,16 @@
/*
* @test
* @summary Make sure --patch-module works when a jar file is specified for a module
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* jdk.jartool/sun.tools.jar
- * @build BasicJarBuilder
* @compile PatchModuleMain.java
* @run main PatchModuleTestJar
*/
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class PatchModuleTestJar {
private static String moduleJar;
--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleTestJarDir.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleTestJarDir.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,17 +24,18 @@
/*
* @test
* @summary Make sure --patch-module works when a jar file and a directory is specified for a module
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* jdk.jartool/sun.tools.jar
- * @build BasicJarBuilder
* @compile PatchModule2DirsMain.java
* @run main PatchModuleTestJarDir
*/
import java.io.File;
import java.nio.file.Files;
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class PatchModuleTestJarDir {
private static String moduleJar;
--- a/hotspot/test/runtime/modules/PatchModule/PatchModuleTraceCL.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/PatchModule/PatchModuleTraceCL.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,13 +27,15 @@
* @summary Make sure -Xlog:classload=info works properly with "modules" jimage,
--patch-module, and with -Xbootclasspath/a
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @compile PatchModuleMain.java
* @run main PatchModuleTraceCL
*/
import java.io.File;
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class PatchModuleTraceCL {
--- a/hotspot/test/runtime/modules/Visibility/PatchModuleVisibility.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/Visibility/PatchModuleVisibility.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @summary Ensure that a newly introduced java.base package placed within the --patch-module
* directory is considered part of the boot loader's visibility boundary
* @requires !(os.family == "windows")
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm PatchModuleVisibility
@@ -36,7 +36,9 @@
import java.nio.file.Files;
import java.nio.file.Paths;
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class PatchModuleVisibility {
--- a/hotspot/test/runtime/modules/Visibility/XbootcpNoVisibility.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/Visibility/XbootcpNoVisibility.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,13 +25,15 @@
* @test
* @summary Ensure that a class defined within a java.base package can not
* be located via -Xbootclasspath/a
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm XbootcpNoVisibility
*/
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class XbootcpNoVisibility {
public static void main(String args[]) throws Exception {
--- a/hotspot/test/runtime/modules/Visibility/XbootcpVisibility.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/modules/Visibility/XbootcpVisibility.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @summary Ensure that a package whose module has not been defined to the boot loader
* is correctly located with -Xbootclasspath/a
* @requires !(os.family == "windows")
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm XbootcpVisibility
@@ -36,7 +36,9 @@
import java.nio.file.Files;
import java.nio.file.Paths;
-import jdk.test.lib.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class XbootcpVisibility {
--- a/hotspot/test/runtime/os/AvailableProcessors.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/os/AvailableProcessors.java Mon Sep 12 22:04:48 2016 +0000
@@ -21,8 +21,8 @@
* questions.
*/
import java.io.File;
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import java.util.ArrayList;
/*
@@ -31,8 +31,7 @@
* @summary Check that availableProcessors reports the correct value when running in a cpuset on linux
* @requires os.family == "linux"
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build jdk.test.lib.*
+ * @library /test/lib
* @run driver AvailableProcessors
*/
public class AvailableProcessors {
--- a/hotspot/test/runtime/verifier/OverriderMsg.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/verifier/OverriderMsg.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +26,13 @@
import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.MethodVisitor;
import static jdk.internal.org.objectweb.asm.Opcodes.*;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
/*
* @test OverriderMsg
* @bug 8026894
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* java.management
--- a/hotspot/test/runtime/verifier/TestANewArray.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/verifier/TestANewArray.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +28,13 @@
import jdk.internal.org.objectweb.asm.MethodVisitor;
import static jdk.internal.org.objectweb.asm.Opcodes.*;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
/*
* @test
* @summary Test that anewarray bytecode is valid only if it specifies 255 or fewer dimensions.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* java.management
--- a/hotspot/test/runtime/verifier/TestMultiANewArray.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/verifier/TestMultiANewArray.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +26,13 @@
import jdk.internal.org.objectweb.asm.ClassWriter;
import jdk.internal.org.objectweb.asm.MethodVisitor;
import static jdk.internal.org.objectweb.asm.Opcodes.*;
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
/*
* @test TestMultiANewArray
* @bug 8038076
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* java.management
--- a/hotspot/test/runtime/verifier/TraceClassRes.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/verifier/TraceClassRes.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,10 +26,11 @@
* @bug 8076318
* @summary split verifier needs to add TraceClassResolution
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
// Test that the verifier outputs the classes it loads if -XX:+TraceClassResolution is specified"
public class TraceClassRes {
--- a/hotspot/test/runtime/whitebox/WBStackSize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/runtime/whitebox/WBStackSize.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,8 +25,8 @@
* @test WBStackSize
* @summary verify that whitebox functions getThreadFullStackSize() and getThreadRemainingStackSize are working
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build WBStackSize
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xss512k WBStackSize
--- a/hotspot/test/sanity/MismatchedWhiteBox/WhiteBox.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/sanity/MismatchedWhiteBox/WhiteBox.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @summary verify that whitebox can be used even if not all functions are declared in java-part
* @author igor.ignatyev@oracle.com
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @compile WhiteBox.java
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-CheckIntrinsics sun.hotspot.WhiteBox
--- a/hotspot/test/sanity/WBApi.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/sanity/WBApi.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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,8 +25,8 @@
* @test WBApi
* @summary verify that whitebox functions can be linked and executed
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build WBApi
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI WBApi
--- a/hotspot/test/serviceability/ParserTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/ParserTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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,8 +25,8 @@
* @test
* @summary Test that the diagnostic command arguemnt parser works
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib
- * @build ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.parser.*
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI ParserTest
--- a/hotspot/test/serviceability/attach/AttachSetGetFlag.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/attach/AttachSetGetFlag.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,13 +25,12 @@
* @test
* @bug 8054823
* @summary Tests the setFlag and printFlag attach command
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.attach/sun.tools.attach
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.* AttachSetGetFlag
* @run main AttachSetGetFlag
*/
@@ -47,7 +46,7 @@
import jdk.test.lib.Asserts;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
import com.sun.tools.attach.VirtualMachine;
public class AttachSetGetFlag {
--- a/hotspot/test/serviceability/attach/AttachWithStalePidFile.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/attach/AttachWithStalePidFile.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,12 +28,12 @@
* @summary Regression test for attach issue where stale pid files in /tmp lead to connection issues
* @modules java.base/jdk.internal.misc
* @modules jdk.attach/sun.tools.attach
- * @library /testlibrary
- * @build jdk.test.lib.* AttachWithStalePidFileTarget
+ * @library /test/lib
* @run main AttachWithStalePidFile
*/
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.ProcessTools;
import com.sun.tools.attach.VirtualMachine;
import sun.tools.attach.HotSpotVirtualMachine;
import java.lang.reflect.Field;
--- a/hotspot/test/serviceability/dcmd/compiler/CodeCacheTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/compiler/CodeCacheTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,13 +24,11 @@
/*
* @test CodeCacheTest
* @bug 8054889
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng/othervm -XX:+SegmentedCodeCache CodeCacheTest
* @run testng/othervm -XX:-SegmentedCodeCache CodeCacheTest
* @run testng/othervm -Xint -XX:+SegmentedCodeCache CodeCacheTest
@@ -40,7 +38,7 @@
import org.testng.annotations.Test;
import org.testng.Assert;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
--- a/hotspot/test/serviceability/dcmd/compiler/CodelistTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/compiler/CodelistTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,15 +24,12 @@
/*
* @test CodelistTest
* @bug 8054889
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * jdk.test.lib.dcmd.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCodeCacheFlushing -Xmixed CodelistTest
@@ -48,7 +45,7 @@
import compiler.testlibrary.CompilerUtils;
import compiler.whitebox.CompilerWhiteBoxTest;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
import org.testng.annotations.Test;
--- a/hotspot/test/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/compiler/CompilerDirectivesDCMDTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,18 +24,15 @@
/*
* @test CompilerDirectivesDCMDTest
* @bug 8137167
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
- * @run main ClassFileInstaller jdk.test.lib.Platform
* @run testng/othervm CompilerDirectivesDCMDTest
* @summary Test of diagnostic command
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
import jdk.test.lib.Platform;
--- a/hotspot/test/serviceability/dcmd/compiler/CompilerQueueTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/compiler/CompilerQueueTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,16 +24,13 @@
/*
* @test CompilerQueueTest
* @bug 8054889
- * @library /testlibrary /test/lib /
+ * @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
* @summary Test of diagnostic command Compiler.queue
- * @build jdk.test.lib.*
- * jdk.test.lib.dcmd.*
- * sun.hotspot.WhiteBox
- * compiler.testlibrary.CompilerUtils
+ * @build sun.hotspot.WhiteBox
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run testng/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -Xmixed -XX:+WhiteBoxAPI CompilerQueueTest
@@ -42,7 +39,7 @@
*/
import compiler.testlibrary.CompilerUtils;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
import org.testng.annotations.Test;
--- a/hotspot/test/serviceability/dcmd/framework/HelpTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/framework/HelpTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -21,7 +21,7 @@
* questions.
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.PidJcmdExecutor;
import jdk.test.lib.dcmd.MainClassJcmdExecutor;
@@ -32,13 +32,11 @@
/*
* @test
* @summary Test of diagnostic command help (tests all DCMD executors)
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng/othervm -XX:+UsePerfData HelpTest
*/
public class HelpTest {
--- a/hotspot/test/serviceability/dcmd/framework/InvalidCommandTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/framework/InvalidCommandTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -21,7 +21,7 @@
* questions.
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.PidJcmdExecutor;
import jdk.test.lib.dcmd.MainClassJcmdExecutor;
@@ -32,13 +32,11 @@
/*
* @test
* @summary Test of invalid diagnostic command (tests all DCMD executors)
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng/othervm -XX:+UsePerfData InvalidCommandTest
*/
public class InvalidCommandTest {
--- a/hotspot/test/serviceability/dcmd/framework/VMVersionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/framework/VMVersionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -21,7 +21,7 @@
* questions.
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.PidJcmdExecutor;
import jdk.test.lib.dcmd.MainClassJcmdExecutor;
@@ -33,13 +33,11 @@
/*
* @test
* @summary Test of diagnostic command VM.version (tests all DCMD executors)
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng/othervm -XX:+UsePerfData VMVersionTest
*/
public class VMVersionTest {
--- a/hotspot/test/serviceability/dcmd/gc/ClassHistogramAllTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/gc/ClassHistogramAllTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
* @summary Test of diagnostic command GC.class_histogram -all=true
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
- * @build ClassHistogramTest
* @run testng ClassHistogramAllTest
*/
public class ClassHistogramAllTest extends ClassHistogramTest {
--- a/hotspot/test/serviceability/dcmd/gc/ClassHistogramTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/gc/ClassHistogramTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,20 +25,18 @@
import java.util.regex.Pattern;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
/*
* @test
* @summary Test of diagnostic command GC.class_histogram
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng ClassHistogramTest
*/
public class ClassHistogramTest {
--- a/hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/gc/FinalizerInfoTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,19 +28,17 @@
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.PidJcmdExecutor;
/*
* @test
* @summary
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.xml
* java.management
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng FinalizerInfoTest
*/
public class FinalizerInfoTest {
--- a/hotspot/test/serviceability/dcmd/gc/HeapDumpAllTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/gc/HeapDumpAllTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,19 +24,11 @@
/*
* @test
* @summary Test of diagnostic command GC.heap_dump -all=true
- * @library /testlibrary
- * @library /test/lib/share/classes
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
- * @build jdk.test.lib.hprof.*
- * @build jdk.test.lib.hprof.model.*
- * @build jdk.test.lib.hprof.parser.*
- * @build jdk.test.lib.hprof.util.*
- * @build HeapDumpTest
* @run testng HeapDumpAllTest
*/
public class HeapDumpAllTest extends HeapDumpTest {
--- a/hotspot/test/serviceability/dcmd/gc/HeapDumpTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/gc/HeapDumpTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -33,25 +33,18 @@
import jdk.test.lib.hprof.model.Snapshot;
import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.PidJcmdExecutor;
/*
* @test
* @summary Test of diagnostic command GC.heap_dump
- * @library /testlibrary
- * @library /test/lib/share/classes
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
- * @build jdk.test.lib.hprof.*
- * @build jdk.test.lib.hprof.model.*
- * @build jdk.test.lib.hprof.parser.*
- * @build jdk.test.lib.hprof.util.*
* @run testng HeapDumpTest
*/
public class HeapDumpTest {
--- a/hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/gc/HeapInfoTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,18 +28,16 @@
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.PidJcmdExecutor;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
/*
* @test
* @summary Test of diagnostic command GC.heap_info
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.xml
* java.management
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng HeapInfoTest
*/
public class HeapInfoTest {
--- a/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/gc/RunFinalizationTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,16 +30,12 @@
/*
* @test
* @summary Test of diagnostic command GC.run_finalization
- * @library /testlibrary
- * @library /test/lib/share/classes
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
- * @build jdk.test.lib.process.*
- * @build RunFinalizationTest FinalizationRunner
+ * @build FinalizationRunner
* @run main RunFinalizationTest
*/
public class RunFinalizationTest {
--- a/hotspot/test/serviceability/dcmd/gc/RunGCTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/gc/RunGCTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,20 +29,18 @@
import java.nio.file.Path;
import java.nio.file.Paths;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
/*
* @test
* @summary Test of diagnostic command GC.run
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng/othervm -Xlog:gc=debug:RunGC.gclog -XX:-ExplicitGCInvokesConcurrent RunGCTest
*/
public class RunGCTest {
--- a/hotspot/test/serviceability/dcmd/jvmti/DataDumpDcmdTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/jvmti/DataDumpDcmdTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -21,7 +21,7 @@
* questions.
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
import jdk.test.lib.dcmd.PidJcmdExecutor;
@@ -32,8 +32,7 @@
* @bug 8054890
* @summary Test of JVMTI.data_dump diagnostic command
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build jdk.test.lib.*
+ * @library /test/lib
* @run testng DataDumpDcmdTest
*/
--- a/hotspot/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,8 @@
import java.util.jar.JarEntry;
import java.util.jar.JarOutputStream;
import java.util.jar.Manifest;
-import jdk.test.lib.*;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.*;
import org.testng.annotations.Test;
@@ -35,13 +36,13 @@
*
* @test
* @bug 8147388
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.instrument
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build ClassFileInstaller jdk.test.lib.* SimpleJvmtiAgent
+ * @build SimpleJvmtiAgent
* @ignore 8150318
* @run main ClassFileInstaller SimpleJvmtiAgent
* @run testng LoadAgentDcmdTest
@@ -59,7 +60,7 @@
"'-Dtest.jdk=/path/to/jdk'.");
}
- Path libpath = Paths.get(jdkPath, Platform.jdkLibPath(), Platform.sharedObjectName("instrument"));
+ Path libpath = Paths.get(jdkPath, jdkLibPath(), sharedObjectName("instrument"));
if (!libpath.toFile().exists()) {
throw new FileNotFoundException(
@@ -129,6 +130,32 @@
throw new RuntimeException(e);
}
}
+ /**
+ * return path to library inside jdk tree
+ */
+ public static String jdkLibPath() {
+ if (Platform.isWindows()) {
+ return "bin";
+ }
+ if (Platform.isOSX()) {
+ return "lib";
+ }
+
+ return "lib/" + Platform.getOsArch();
+ }
+
+ /**
+ * Build name of shared object according to platform rules
+ */
+ public static String sharedObjectName(String name) {
+ if (Platform.isWindows()) {
+ return name + ".dll";
+ }
+ if (Platform.isOSX()) {
+ return "lib" + name + ".dylib";
+ }
+ return "lib" + name + ".so";
+ }
@Test
public void jmx() throws Throwable {
--- a/hotspot/test/serviceability/dcmd/thread/PrintConcurrentLocksTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/thread/PrintConcurrentLocksTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
* @summary Test of diagnostic command Thread.print -l=true
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
- * @build PrintTest
* @run testng PrintConcurrentLocksTest
*/
public class PrintConcurrentLocksTest extends PrintTest {
--- a/hotspot/test/serviceability/dcmd/thread/PrintTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/thread/PrintTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +24,7 @@
import org.testng.annotations.Test;
import org.testng.Assert;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
@@ -37,13 +37,11 @@
/*
* @test
* @summary Test of diagnostic command Thread.print
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng PrintTest
*/
public class PrintTest {
--- a/hotspot/test/serviceability/dcmd/vm/ClassHierarchyTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/vm/ClassHierarchyTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,20 +24,18 @@
/*
* @test
* @summary Test of diagnostic command VM.class_hierarchy
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng ClassHierarchyTest
*/
import org.testng.annotations.Test;
import org.testng.Assert;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
--- a/hotspot/test/serviceability/dcmd/vm/ClassLoaderStatsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/vm/ClassLoaderStatsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,20 +24,18 @@
/*
* @test
* @summary Test of diagnostic command VM.classloader_stats
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng ClassLoaderStatsTest
*/
import org.testng.annotations.Test;
import org.testng.Assert;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
--- a/hotspot/test/serviceability/dcmd/vm/CommandLineTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/vm/CommandLineTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -21,7 +21,7 @@
* questions.
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import org.testng.annotations.Test;
import jdk.test.lib.dcmd.CommandExecutor;
@@ -30,13 +30,11 @@
/*
* @test
* @summary Test of diagnostic command VM.command_line
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+ThereShouldNotBeAnyVMOptionNamedLikeThis CommandLineTest
*/
public class CommandLineTest {
--- a/hotspot/test/serviceability/dcmd/vm/DynLibsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/vm/DynLibsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,13 +1,13 @@
import org.testng.annotations.Test;
import org.testng.Assert;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Platform;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,13 +32,11 @@
/*
* @test
* @summary Test of VM.dynlib diagnostic command via MBean
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng DynLibsTest
*/
--- a/hotspot/test/serviceability/dcmd/vm/FlagsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/vm/FlagsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -21,7 +21,7 @@
* questions.
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
import org.testng.annotations.Test;
@@ -29,13 +29,11 @@
/*
* @test
* @summary Test of diagnostic command VM.flags
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng/othervm -Xmx129m -XX:+UnlockDiagnosticVMOptions -XX:+IgnoreUnrecognizedVMOptions -XX:+ThereShouldNotBeAnyVMOptionNamedLikeThis_Right -XX:-TieredCompilation FlagsTest
*/
public class FlagsTest {
--- a/hotspot/test/serviceability/dcmd/vm/SetVMFlagTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/vm/SetVMFlagTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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
@@ -21,7 +21,7 @@
* questions.
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
import org.testng.annotations.Test;
@@ -32,9 +32,7 @@
* @bug 8054890
* @summary Test of VM.set_flag diagnostic command
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
+ * @library /test/lib
* @run testng SetVMFlagTest
*/
--- a/hotspot/test/serviceability/dcmd/vm/SystemPropertiesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/vm/SystemPropertiesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,20 +23,18 @@
import org.testng.annotations.Test;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
/*
* @test
* @summary Test of diagnostic command VM.system_properties
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng SystemPropertiesTest
*/
public class SystemPropertiesTest {
--- a/hotspot/test/serviceability/dcmd/vm/UptimeTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/dcmd/vm/UptimeTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,7 +24,7 @@
import org.testng.annotations.Test;
import org.testng.Assert;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.dcmd.CommandExecutor;
import jdk.test.lib.dcmd.JMXExecutor;
@@ -34,13 +34,11 @@
/*
* @test
* @summary Test of diagnostic command VM.uptime
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
- * @build jdk.test.lib.dcmd.*
* @run testng UptimeTest
*/
public class UptimeTest {
--- a/hotspot/test/serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/jvmti/GetModulesInfo/JvmtiGetAllModulesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/**
* @test
* @summary Verifies the JVMTI GetAllModules API
- * @library /testlibrary
+ * @library /test/lib
* @run main/othervm -agentlib:JvmtiGetAllModulesTest JvmtiGetAllModulesTest
*
*/
--- a/hotspot/test/serviceability/jvmti/GetObjectSizeClass.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/jvmti/GetObjectSizeClass.java Mon Sep 12 22:04:48 2016 +0000
@@ -21,19 +21,22 @@
* questions.
*/
import java.io.PrintWriter;
-import jdk.test.lib.*;
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
/*
* @test
* @bug 8075030
* @summary JvmtiEnv::GetObjectSize reports incorrect java.lang.Class instance size
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.instrument
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build ClassFileInstaller jdk.test.lib.* GetObjectSizeClassAgent
+ * @build GetObjectSizeClassAgent
* @run main ClassFileInstaller GetObjectSizeClassAgent
* @run main GetObjectSizeClass
*/
--- a/hotspot/test/serviceability/jvmti/GetObjectSizeOverflow.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/jvmti/GetObjectSizeOverflow.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -21,20 +21,23 @@
* questions.
*/
import java.io.PrintWriter;
-import jdk.test.lib.*;
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.Platform;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
/*
* Test to verify GetObjectSize does not overflow on a 600M element int[]
*
* @test
* @bug 8027230
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.instrument
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build ClassFileInstaller jdk.test.lib.* GetObjectSizeOverflowAgent
+ * @build GetObjectSizeOverflowAgent
* @run main ClassFileInstaller GetObjectSizeOverflowAgent
* @run main GetObjectSizeOverflow
*/
--- a/hotspot/test/serviceability/jvmti/TestLambdaFormRetransformation.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/jvmti/TestLambdaFormRetransformation.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @test
* @bug 8008678
* @summary JSR 292: constant pool reconstitution must support pseudo strings
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.instrument
* java.management
@@ -46,9 +46,9 @@
import java.security.ProtectionDomain;
import java.util.Arrays;
-import jdk.test.lib.ExitCode;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ExitCode;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestLambdaFormRetransformation {
private static String MANIFEST = String.format("Manifest-Version: 1.0\n" +
--- a/hotspot/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/jvmti/TestRedefineWithUnresolvedClass.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,22 +25,22 @@
* @test
* @summary Redefine a class with an UnresolvedClass reference in the constant pool.
* @bug 8035150
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.instrument
* java.management
* jdk.jartool/sun.tools.jar
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.* UnresolvedClassAgent
+ * @build UnresolvedClassAgent
* @run main TestRedefineWithUnresolvedClass
*/
import java.io.File;
import java.util.Arrays;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class TestRedefineWithUnresolvedClass {
--- a/hotspot/test/serviceability/logging/TestBasicLogOutput.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/logging/TestBasicLogOutput.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,11 +25,11 @@
* @test TestBasicLogOutput
* @summary Ensure logging can be enabled and successfully prints to stdout.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestBasicLogOutput {
--- a/hotspot/test/serviceability/logging/TestDefaultLogOutput.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/logging/TestDefaultLogOutput.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,11 +25,11 @@
* @test TestDefaultLogOutput
* @summary Ensure logging is default on stdout.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestDefaultLogOutput {
--- a/hotspot/test/serviceability/logging/TestLogRotation.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/logging/TestLogRotation.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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,13 +24,13 @@
/*
* @test TestLogRotation.java
* @summary test flags for log rotation
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main/othervm/timeout=600 TestLogRotation
*
*/
-import jdk.test.lib.*;
+import jdk.test.lib.process.ProcessTools;
import java.io.File;
import java.io.FilenameFilter;
import java.util.ArrayList;
--- a/hotspot/test/serviceability/logging/TestMultipleXlogArgs.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/logging/TestMultipleXlogArgs.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,11 +25,11 @@
* @test TestMultipleXlogArgs
* @summary Ensure multiple -Xlog arguments aggregate the logging options.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestMultipleXlogArgs {
--- a/hotspot/test/serviceability/logging/TestQuotedLogOutputs.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/logging/TestQuotedLogOutputs.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
* @test TestQuotedLogOutputs
* @summary Ensure proper parsing of quoted output names for -Xlog arguments.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
import java.io.File;
@@ -33,8 +33,8 @@
import java.nio.file.Paths;
import jdk.test.lib.Asserts;
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
public class TestQuotedLogOutputs {
--- a/hotspot/test/serviceability/sa/DeadlockDetectionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/sa/DeadlockDetectionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,19 +32,15 @@
import jdk.test.lib.Utils;
import jdk.test.lib.Platform;
import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
/*
* @test
* @summary Test deadlock detection
- * @library /test/lib/share/classes
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management
- * @build jdk.test.lib.*
- * @build jdk.test.lib.apps.*
- * @build DeadlockDetectionTest
* @run main DeadlockDetectionTest
*/
--- a/hotspot/test/serviceability/sa/TestInstanceKlassSize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/sa/TestInstanceKlassSize.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,8 +31,8 @@
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import jdk.test.lib.apps.LingeredApp;
import jdk.test.lib.Asserts;
@@ -42,16 +42,16 @@
/*
* @test
- * @library /test/lib/share/classes
- * @library /testlibrary
- * @build jdk.test.lib.*
- * @build jdk.test.lib.apps.*
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules jdk.hotspot.agent
* @modules jdk.hotspot.agent/sun.jvm.hotspot
* @modules jdk.hotspot.agent/sun.jvm.hotspot.utilities
* @modules jdk.hotspot.agent/sun.jvm.hotspot.oops
- * @compile -XDignore.symbol.file=true -Xmodule:jdk.hotspot.agent TestInstanceKlassSize.java
+ * @compile -XDignore.symbol.file=true -Xmodule:jdk.hotspot.agent
+ * -XaddExports:java.base/jdk.internal.misc=jdk.hotspot.agent
+ * -XaddExports:java.management/java.lang.management=jdk.hotspot.agent
+ * TestInstanceKlassSize.java
* @run main/othervm TestInstanceKlassSize
*/
--- a/hotspot/test/serviceability/sa/TestInstanceKlassSizeForInterface.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/sa/TestInstanceKlassSizeForInterface.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,23 +29,23 @@
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.Utils;
import jdk.test.lib.Asserts;
/*
* @test
- * @library /test/lib/share/classes
- * @library /testlibrary
- * @build jdk.test.lib.*
- * @build jdk.test.lib.apps.*
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules jdk.hotspot.agent
* @modules jdk.hotspot.agent/sun.jvm.hotspot
* @modules jdk.hotspot.agent/sun.jvm.hotspot.utilities
* @modules jdk.hotspot.agent/sun.jvm.hotspot.oops
- * @compile -XDignore.symbol.file=true -Xmodule:jdk.hotspot.agent TestInstanceKlassSizeForInterface.java
+ * @compile -XDignore.symbol.file=true -Xmodule:jdk.hotspot.agent
+ * -XaddExports:java.base/jdk.internal.misc=jdk.hotspot.agent
+ * -XaddExports:java.management/java.lang.management=jdk.hotspot.agent
+ * TestInstanceKlassSizeForInterface.java
* @run main/othervm TestInstanceKlassSizeForInterface
*/
--- a/hotspot/test/serviceability/sa/jmap-hashcode/Test8028623.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/sa/jmap-hashcode/Test8028623.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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
@@ -22,9 +22,9 @@
*/
import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.OutputBuffer;
+import jdk.test.lib.process.OutputBuffer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.ProcessTools;
import java.io.File;
@@ -32,12 +32,11 @@
* @test
* @bug 8028623
* @summary Test hashing of extended characters in Serviceability Agent.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.*
* @compile -encoding utf8 Test8028623.java
* @run main/othervm -XX:+UsePerfData Test8028623
*/
--- a/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/sa/jmap-hprof/JMapHProfLargeHeapTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -32,11 +32,10 @@
import java.util.Scanner;
import jdk.test.lib.Asserts;
-import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.Platform;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
/*
* @test
@@ -46,12 +45,12 @@
* Started failing on 2016.06.24 due to 8160376 on MacOS X so quarantine
* it on that platform:
* @requires os.family != "mac"
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management/sun.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build jdk.test.lib.* JMapHProfLargeHeapProc
+ * @build JMapHProfLargeHeapProc
* @run main JMapHProfLargeHeapTest
*/
--- a/hotspot/test/serviceability/sa/sadebugd/SADebugDTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/sa/sadebugd/SADebugDTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,7 @@
* @summary Checks that the jshdb debugd utility sucessfully starts
* and tries to attach to a running process
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
*
* @ignore 8163805
* @run main/othervm SADebugDTest
--- a/hotspot/test/serviceability/threads/TestFalseDeadLock.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/threads/TestFalseDeadLock.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,7 @@
* @bug 8016304
* @summary Make sure no deadlock is reported for this program which has no deadlocks.
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
* @run main/othervm TestFalseDeadLock
*/
--- a/hotspot/test/serviceability/tmtools/jstack/DaemonThreadTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstack/DaemonThreadTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,10 +26,8 @@
* @summary Create daemon and non-deamon threads.
* Check the correctness of thread's status from jstack.
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
- * @build common.*
- *
* @run main/othervm -XX:+UsePerfData DaemonThreadTest
*/
import common.ToolResults;
--- a/hotspot/test/serviceability/tmtools/jstack/JstackThreadTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstack/JstackThreadTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,8 +23,8 @@
import java.util.Arrays;
import jdk.test.lib.JDKToolLauncher;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import utils.Utils;
import java.util.concurrent.CountDownLatch;
@@ -33,8 +33,7 @@
* @bug 8151442
* @summary jstack doesn't close quotation marks properly with threads' name greater than 1996 characters
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
- * @build jdk.test.lib.*
+ * @library /test/lib
* @run main JstackThreadTest
*/
public class JstackThreadTest {
--- a/hotspot/test/serviceability/tmtools/jstack/SpreadLockTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstack/SpreadLockTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,10 +28,8 @@
* After checking that lock info is correct invoke another method
* and get the lock again. Repeat this action.
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
- * @build common.*
- *
* @run main/othervm -XX:+UsePerfData SpreadLockTest
*/
import common.ToolResults;
--- a/hotspot/test/serviceability/tmtools/jstack/ThreadNamesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstack/ThreadNamesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,10 +25,8 @@
* @test
* @summary Checks that jstack correctly prints the thread names
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
- * @build common.*
- *
* @run main/othervm -XX:+UsePerfData ThreadNamesTest
*/
import common.ToolResults;
--- a/hotspot/test/serviceability/tmtools/jstack/TraveledLockTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstack/TraveledLockTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,10 +28,8 @@
* After checking that lock info is correct free the lock and
* invoke another method. Repeat this action.
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
- * @build common.*
- *
* @run main/othervm -XX:+UsePerfData TraveledLockTest
*/
import common.ToolResults;
--- a/hotspot/test/serviceability/tmtools/jstack/WaitNotifyThreadTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstack/WaitNotifyThreadTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,10 +28,8 @@
* monitor info have to disappear from the stack.
* Repeats the same scenario calling interrupt() method
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
- * @build common.*
- *
* @run main/othervm -XX:+UsePerfData WaitNotifyThreadTest
*/
import common.ToolResults;
--- a/hotspot/test/serviceability/tmtools/jstat/GcCapacityTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcCapacityTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,9 @@
* @summary Test checks the consistency of the output
* displayed with jstat -gccapacity.
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
* @requires vm.opt.ExplicitGCInvokesConcurrent != true
- * @build common.*
- * @build utils.*
* @run main/othervm -XX:+UsePerfData -Xmx128M GcCapacityTest
*/
public class GcCapacityTest {
--- a/hotspot/test/serviceability/tmtools/jstat/GcCauseTest01.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcCauseTest01.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,12 +29,9 @@
* collection runs jstat. jstat should show that after garbage collection number of GC events and garbage
* collection time increase.
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
* @requires vm.opt.ExplicitGCInvokesConcurrent != true
- * @build common.*
- * @build utils.*
- *
* @run main/othervm -XX:+UsePerfData -Xmx128M GcCauseTest01
*/
import utils.*;
--- a/hotspot/test/serviceability/tmtools/jstat/GcCauseTest02.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcCauseTest02.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,8 @@
* tests forces debuggee application eat ~70% of heap and runs jstat.
* jstat should show that ~70% of heap (OC/OU ~= 70%).
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
- * @build common.*
- * @build utils.*
- *
* @run main/othervm -XX:+UsePerfData -Xmx128M -XX:MaxMetaspaceSize=128M GcCauseTest02
*/
import utils.*;
--- a/hotspot/test/serviceability/tmtools/jstat/GcCauseTest03.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcCauseTest03.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,11 +28,8 @@
* test forces debuggee application call System.gc(), runs jstat and checks that
* cause of last garbage collection displayed by jstat (LGCC) is 'System.gc()'.
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
- * @build common.*
- * @build utils.*
- *
* @run main/othervm -XX:+UsePerfData -Xmx128M -XX:MaxMetaspaceSize=128M GcCauseTest03
*/
import utils.*;
--- a/hotspot/test/serviceability/tmtools/jstat/GcNewTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcNewTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -30,10 +30,8 @@
* collection runs jstat. jstat should show that after garbage collection number of GC events and garbage
* collection time increase.
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
- * @build common.*
- * @build utils.*
* @run main/othervm -XX:+UsePerfData -Xmx128M GcNewTest
*/
--- a/hotspot/test/serviceability/tmtools/jstat/GcTest01.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcTest01.java Mon Sep 12 22:04:48 2016 +0000
@@ -32,12 +32,9 @@
* number of GC events and garbage
* collection time increase.
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
* @requires vm.opt.ExplicitGCInvokesConcurrent != true
- * @build common.*
- * @build utils.*
- *
* @run main/othervm -XX:+UsePerfData -Xmx128M GcTest01
*/
import utils.*;
--- a/hotspot/test/serviceability/tmtools/jstat/GcTest02.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/serviceability/tmtools/jstat/GcTest02.java Mon Sep 12 22:04:48 2016 +0000
@@ -29,10 +29,8 @@
* tests forces debuggee application eat ~70% of heap and runs jstat.
* jstat should show that ~70% of heap is utilized (OC/OU ~= 70%).
* @modules java.base/jdk.internal.misc
- * @library /test/lib/share/classes
+ * @library /test/lib
* @library ../share
- * @build common.*
- * @build utils.*
* @ignore 8155570
* @run main/othervm -XX:+UsePerfData -Xmx128M -XX:MaxMetaspaceSize=128M GcTest02
*/
--- a/hotspot/test/testlibrary/ClassFileInstaller.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,257 +0,0 @@
-/*
- * Copyright (c) 2016, 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.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.io.ByteArrayInputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-/**
- * Dump a class file for a class on the class path in the current directory, or
- * in the specified JAR file. This class is usually used when you build a class
- * from a test library, but want to use this class in a sub-process.
- *
- * For example, to build the following library class:
- * test/lib/sun/hotspot/WhiteBox.java
- *
- * You would use the following tags:
- *
- * @library /test/lib
- * @build sun.hotspot.WhiteBox
- *
- * JTREG would build the class file under
- * ${JTWork}/classes/test/lib/sun/hotspot/WhiteBox.class
- *
- * With you run your main test class using "@run main MyMainClass", JTREG would setup the
- * -classpath to include "${JTWork}/classes/test/lib/", so MyMainClass would be able to
- * load the WhiteBox class.
- *
- * However, if you run a sub process, and do not wish to use the exact same -classpath,
- * You can use ClassFileInstaller to ensure that WhiteBox is available in the current
- * directory of your test:
- *
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- *
- * Or, you can use the -jar option to store the class in the specified JAR file. If a relative
- * path name is given, the JAR file would be relative to the current directory of
- *
- * @run main ClassFileInstaller -jar myjar.jar sun.hotspot.WhiteBox
- */
-public class ClassFileInstaller {
- /**
- * You can enable debug tracing of ClassFileInstaller by running JTREG with
- * jtreg -DClassFileInstaller.debug=true ... <names of tests>
- */
- public static boolean DEBUG = Boolean.getBoolean("ClassFileInstaller.debug");
-
- /**
- * @param args The names of the classes to dump
- * @throws Exception
- */
- public static void main(String... args) throws Exception {
- if (args.length > 1 && args[0].equals("-jar")) {
- if (args.length < 2) {
- throw new RuntimeException("Usage: ClassFileInstaller <options> <classes>\n" +
- "where possible options include:\n" +
- " -jar <path> Write to the JAR file <path>");
- }
- writeJar(args[1], null, args, 2, args.length);
- } else {
- if (DEBUG) {
- System.out.println("ClassFileInstaller: Writing to " + System.getProperty("user.dir"));
- }
- for (String arg : args) {
- writeClassToDisk(arg);
- }
- }
- }
-
- public static class Manifest {
- private InputStream in;
-
- private Manifest(InputStream in) {
- this.in = in;
- }
-
- static Manifest fromSourceFile(String fileName) throws Exception {
- String pathName = System.getProperty("test.src") + File.separator + fileName;
- return new Manifest(new FileInputStream(pathName));
- }
-
- // Example:
- // String manifest = "Premain-Class: RedefineClassHelper\n" +
- // "Can-Redefine-Classes: true\n";
- // ClassFileInstaller.writeJar("redefineagent.jar",
- // ClassFileInstaller.Manifest.fromString(manifest),
- // "RedefineClassHelper");
- static Manifest fromString(String manifest) throws Exception {
- return new Manifest(new ByteArrayInputStream(manifest.getBytes()));
- }
-
- public InputStream getInputStream() {
- return in;
- }
- }
-
- private static void writeJar(String jarFile, Manifest manifest, String classes[], int from, int to) throws Exception {
- if (DEBUG) {
- System.out.println("ClassFileInstaller: Writing to " + getJarPath(jarFile));
- }
-
- (new File(jarFile)).delete();
- FileOutputStream fos = new FileOutputStream(jarFile);
- ZipOutputStream zos = new ZipOutputStream(fos);
-
- // The manifest must be the first or second entry. See comments in JarInputStream
- // constructor and JDK-5046178.
- if (manifest != null) {
- writeToDisk(zos, "META-INF/MANIFEST.MF", manifest.getInputStream());
- }
-
- for (int i=from; i<to; i++) {
- writeClassToDisk(zos, classes[i]);
- }
-
- zos.close();
- fos.close();
- }
-
- /*
- * You can call ClassFileInstaller.writeJar() from your main test class instead of
- * using "@run ClassFileInstaller -jar ...". E.g.,
- *
- * String jarPath = ClassFileInstaller.getJarPath("myjar.jar", "sun.hotspot.WhiteBox")
- *
- * If you call this API, make sure you build ClassFileInstaller with the following tags:
- *
- * @library testlibrary
- * @build ClassFileInstaller
- */
- public static String writeJar(String jarFile, String... classes) throws Exception {
- writeJar(jarFile, null, classes, 0, classes.length);
- return getJarPath(jarFile);
- }
-
- public static String writeJar(String jarFile, Manifest manifest, String... classes) throws Exception {
- writeJar(jarFile, manifest, classes, 0, classes.length);
- return getJarPath(jarFile);
- }
-
- /**
- * This returns the absolute path to the file specified in "@ClassFileInstaller -jar myjar.jar",
- * In your test program, instead of using the JAR file name directly:
- *
- * String jarPath = "myjar.jar";
- *
- * you should call this function, like:
- *
- * String jarPath = ClassFileInstaller.getJarPath("myjar.jar")
- *
- * The reasons are:
- * (1) Using absolute path makes it easy to cut-and-paste from the JTR file and rerun your
- * test in any directory.
- * (2) In the future, we may make the JAR file name unique to avoid clobbering
- * during parallel JTREG execution.
- *
- */
- public static String getJarPath(String jarFileName) {
- return new File(jarFileName).getAbsolutePath();
- }
-
- public static void writeClassToDisk(String className) throws Exception {
- writeClassToDisk((ZipOutputStream)null, className);
- }
- private static void writeClassToDisk(ZipOutputStream zos, String className) throws Exception {
- writeClassToDisk(zos, className, "");
- }
-
- public static void writeClassToDisk(String className, String prependPath) throws Exception {
- writeClassToDisk(null, className, prependPath);
- }
- private static void writeClassToDisk(ZipOutputStream zos, String className, String prependPath) throws Exception {
- ClassLoader cl = ClassFileInstaller.class.getClassLoader();
-
- // Convert dotted class name to a path to a class file
- String pathName = className.replace('.', '/').concat(".class");
- InputStream is = cl.getResourceAsStream(pathName);
- if (is == null) {
- throw new RuntimeException("Failed to find " + pathName);
- }
- if (prependPath.length() > 0) {
- pathName = prependPath + "/" + pathName;
- }
- writeToDisk(zos, pathName, is);
- }
-
- public static void writeClassToDisk(String className, byte[] bytecode) throws Exception {
- writeClassToDisk(null, className, bytecode);
- }
- private static void writeClassToDisk(ZipOutputStream zos, String className, byte[] bytecode) throws Exception {
- writeClassToDisk(zos, className, bytecode, "");
- }
-
- public static void writeClassToDisk(String className, byte[] bytecode, String prependPath) throws Exception {
- writeClassToDisk(null, className, bytecode, prependPath);
- }
- private static void writeClassToDisk(ZipOutputStream zos, String className, byte[] bytecode, String prependPath) throws Exception {
- // Convert dotted class name to a path to a class file
- String pathName = className.replace('.', '/').concat(".class");
- if (prependPath.length() > 0) {
- pathName = prependPath + "/" + pathName;
- }
- writeToDisk(zos, pathName, new ByteArrayInputStream(bytecode));
- }
-
- private static void writeToDisk(ZipOutputStream zos, String pathName, InputStream is) throws Exception {
- if (DEBUG) {
- System.out.println("ClassFileInstaller: Writing " + pathName);
- }
- if (zos != null) {
- ZipEntry ze = new ZipEntry(pathName);
- zos.putNextEntry(ze);
- byte[] buf = new byte[1024];
- int len;
- while ((len = is.read(buf))>0){
- zos.write(buf, 0, len);
- }
- } else {
- // Create the class file's package directory
- Path p = Paths.get(pathName);
- if (pathName.contains("/")) {
- Files.createDirectories(p.getParent());
- }
- // Create the class file
- Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
- }
- is.close();
- }
-}
--- a/hotspot/test/testlibrary/RedefineClassHelper.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-import java.io.PrintWriter;
-import java.lang.instrument.*;
-import jdk.test.lib.*;
-
-/*
- * Helper class to write tests that redefine classes.
- * When main method is run, it will create a redefineagent.jar that can be used
- * with the -javaagent option to support redefining classes in jtreg tests.
- *
- * See sample test in test/testlibrary_tests/RedefineClassTest.java
- */
-public class RedefineClassHelper {
-
- public static Instrumentation instrumentation;
- public static void premain(String agentArgs, Instrumentation inst) {
- instrumentation = inst;
- }
-
- /**
- * Redefine a class
- *
- * @param clazz Class to redefine
- * @param javacode String with the new java code for the class to be redefined
- */
- public static void redefineClass(Class clazz, String javacode) throws Exception {
- byte[] bytecode = InMemoryJavaCompiler.compile(clazz.getName(), javacode);
- redefineClass(clazz, bytecode);
- }
-
- /**
- * Redefine a class
- *
- * @param clazz Class to redefine
- * @param bytecode byte[] with the new class
- */
- public static void redefineClass(Class clazz, byte[] bytecode) throws Exception {
- instrumentation.redefineClasses(new ClassDefinition(clazz, bytecode));
- }
-
- /**
- * Main method to be invoked before test to create the redefineagent.jar
- */
- public static void main(String[] args) throws Exception {
- ClassFileInstaller.main("RedefineClassHelper");
-
- PrintWriter pw = new PrintWriter("MANIFEST.MF");
- pw.println("Premain-Class: RedefineClassHelper");
- pw.println("Can-Redefine-Classes: true");
- pw.close();
-
- sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
- if (!jarTool.run(new String[] { "-cmf", "MANIFEST.MF", "redefineagent.jar", "RedefineClassHelper.class" })) {
- throw new Exception("jar operation failed");
- }
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/AllocationHelper.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
-* Copyright (c) 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.
-*/
-
-package jdk.test.lib;
-
-import java.util.LinkedList;
-import java.util.concurrent.Callable;
-
-/**
- * Helper class which allocates memory.
- *
- * Typical usage:
- * <pre>
- * {@code
- * AllocationHelper allocator = new AllocationHelper(MAX_ITERATIONS, ARRAY_LENGTH, CHUNK_SIZE,
- * () -> (verifier()));
- * // Allocate byte[CHUNK_SIZE] ARRAY_LENGTH times. Total allocated bytes will be CHUNK_SIZE * ARRAY_LENGTH + refs length.
- * // Then invoke verifier and iterate MAX_ITERATIONS times.
- * allocator.allocateMemoryAndVerify();
- * }
- * </pre>
- */
-public final class AllocationHelper {
-
- private final int arrayLength;
- private final int maxIterations;
- private final int chunkSize;
-
- // garbageStorage is used to store link to garbage to prevent optimization.
- private static Object garbageStorage;
- private byte garbage[][];
- private final Callable<?> verifierInstance;
-
- /**
- * Create an AllocationHelper with specified iteration count, array length, chunk size and verifier.
- *
- * @param maxIterations
- * @param arrayLength
- * @param chunkSize
- * @param verifier - Callable instance which will be invoked after all allocation cycle. Can be null;
- */
- public AllocationHelper(int maxIterations, int arrayLength, int chunkSize, Callable<?> verifier) {
- if ((arrayLength <= 0) || (maxIterations <= 0) || (chunkSize <= 0)) {
- throw new IllegalArgumentException("maxIterations, arrayLength and chunkSize should be greater then 0.");
- }
- this.arrayLength = arrayLength;
- this.maxIterations = maxIterations;
- this.chunkSize = chunkSize;
- verifierInstance = verifier;
- garbage = new byte[this.arrayLength][];
- garbageStorage = garbage;
- }
-
- private void allocateMemoryOneIteration() {
- for (int j = 0; j < arrayLength; j++) {
- garbage[j] = new byte[chunkSize];
- }
- }
-
- /**
- * Allocate memory and invoke Verifier during all iteration.
- *
- * @throws java.lang.Exception
- */
- public void allocateMemoryAndVerify() throws Exception {
- for (int i = 0; i < maxIterations; i++) {
- allocateMemoryOneIteration();
- if (verifierInstance != null) {
- verifierInstance.call();
- }
- }
- }
-
- /**
- * The same as allocateMemoryAndVerify() but hides OOME
- *
- * @throws Exception
- */
- public void allocateMemoryAndVerifyNoOOME() throws Exception {
- try {
- allocateMemoryAndVerify();
- } catch (OutOfMemoryError e) {
- // exit on OOME
- }
- }
-
- /**
- * Release link to allocated garbage to make it available for further GC
- */
- public void release() {
- if (garbage != null) {
- garbage = null;
- garbageStorage = null;
- }
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/Asserts.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,454 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-/**
- * Asserts that can be used for verifying assumptions in tests.
- *
- * An assertion will throw a {@link RuntimeException} if the assertion isn't
- * valid. All the asserts can be imported into a test by using a static
- * import:
- *
- * <pre>
- * {@code
- * import static jdk.test.lib.Asserts.*;
- * }
- *
- * Always provide a message describing the assumption if the line number of the
- * failing assertion isn't enough to understand why the assumption failed. For
- * example, if the assertion is in a loop or in a method that is called
- * multiple times, then the line number won't provide enough context to
- * understand the failure.
- * </pre>
- * @deprecated This class is deprecated. Use the one from
- * {@code <root>/test/lib/share/classes/jdk/test/lib}
- */
-@Deprecated
-public class Asserts {
-
- /**
- * Shorthand for {@link #assertLessThan(T, T)}.
- *
- * @see #assertLessThan(T, T)
- */
- public static <T extends Comparable<T>> void assertLT(T lhs, T rhs) {
- assertLessThan(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertLessThan(T, T, String)}.
- *
- * @see #assertLessThan(T, T, String)
- */
- public static <T extends Comparable<T>> void assertLT(T lhs, T rhs, String msg) {
- assertLessThan(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertLessThan(T, T, String)} with a default message.
- *
- * @see #assertLessThan(T, T, String)
- */
- public static <T extends Comparable<T>> void assertLessThan(T lhs, T rhs) {
- assertLessThan(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is less than {@code rhs}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption.
- * @throws RuntimeException if the assertion isn't valid.
- */
- public static <T extends Comparable<T>>void assertLessThan(T lhs, T rhs, String msg) {
- assertTrue(compare(lhs, rhs, msg) < 0, getMessage(lhs, rhs, "<", msg));
- }
-
- /**
- * Shorthand for {@link #assertLessThanOrEqual(T, T)}.
- *
- * @see #assertLessThanOrEqual(T, T)
- */
- public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs) {
- assertLessThanOrEqual(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertLessThanOrEqual(T, T, String)}.
- *
- * @see #assertLessThanOrEqual(T, T, String)
- */
- public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs, String msg) {
- assertLessThanOrEqual(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertLessThanOrEqual(T, T, String)} with a default message.
- *
- * @see #assertLessThanOrEqual(T, T, String)
- */
- public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs) {
- assertLessThanOrEqual(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is less than or equal to {@code rhs}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption.
- * @throws RuntimeException if the assertion isn't valid.
- */
- public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs, String msg) {
- assertTrue(compare(lhs, rhs, msg) <= 0, getMessage(lhs, rhs, "<=", msg));
- }
-
- /**
- * Shorthand for {@link #assertEquals(T, T)}.
- *
- * @see #assertEquals(T, T)
- */
- public static void assertEQ(Object lhs, Object rhs) {
- assertEquals(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertEquals(T, T, String)}.
- *
- * @see #assertEquals(T, T, String)
- */
- public static void assertEQ(Object lhs, Object rhs, String msg) {
- assertEquals(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertEquals(T, T, String)} with a default message.
- *
- * @see #assertEquals(T, T, String)
- */
- public static void assertEquals(Object lhs, Object rhs) {
- assertEquals(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is equal to {@code rhs}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption.
- * @throws RuntimeException if the assertion isn't valid.
- */
- public static void assertEquals(Object lhs, Object rhs, String msg) {
- if (lhs == null) {
- if (rhs != null) {
- error(msg);
- }
- } else {
- assertTrue(lhs.equals(rhs), getMessage(lhs, rhs, "==", msg));
- }
- }
-
- /**
- * Shorthand for {@link #assertGreaterThanOrEqual(T, T)}.
- *
- * @see #assertGreaterThanOrEqual(T, T)
- */
- public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs) {
- assertGreaterThanOrEqual(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertGreaterThanOrEqual(T, T, String)}.
- *
- * @see #assertGreaterThanOrEqual(T, T, String)
- */
- public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs, String msg) {
- assertGreaterThanOrEqual(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertGreaterThanOrEqual(T, T, String)} with a default message.
- *
- * @see #assertGreaterThanOrEqual(T, T, String)
- */
- public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs) {
- assertGreaterThanOrEqual(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is greater than or equal to {@code rhs}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption.
- * @throws RuntimeException if the assertion isn't valid.
- */
- public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs, String msg) {
- assertTrue(compare(lhs, rhs, msg) >= 0, getMessage(lhs, rhs, ">=", msg));
- }
-
- /**
- * Shorthand for {@link #assertGreaterThan(T, T)}.
- *
- * @see #assertGreaterThan(T, T)
- */
- public static <T extends Comparable<T>> void assertGT(T lhs, T rhs) {
- assertGreaterThan(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertGreaterThan(T, T, String)}.
- *
- * @see #assertGreaterThan(T, T, String)
- */
- public static <T extends Comparable<T>> void assertGT(T lhs, T rhs, String msg) {
- assertGreaterThan(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertGreaterThan(T, T, String)} with a default message.
- *
- * @see #assertGreaterThan(T, T, String)
- */
- public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs) {
- assertGreaterThan(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is greater than {@code rhs}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption.
- * @throws RuntimeException if the assertion isn't valid.
- */
- public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs, String msg) {
- assertTrue(compare(lhs, rhs, msg) > 0, getMessage(lhs, rhs, ">", msg));
- }
-
- /**
- * Shorthand for {@link #assertNotEquals(T, T)}.
- *
- * @see #assertNotEquals(T, T)
- */
- public static void assertNE(Object lhs, Object rhs) {
- assertNotEquals(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertNotEquals(T, T, String)}.
- *
- * @see #assertNotEquals(T, T, String)
- */
- public static void assertNE(Object lhs, Object rhs, String msg) {
- assertNotEquals(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertNotEquals(T, T, String)} with a default message.
- *
- * @see #assertNotEquals(T, T, String)
- */
- public static void assertNotEquals(Object lhs, Object rhs) {
- assertNotEquals(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is not equal to {@code rhs}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption.
- * @throws RuntimeException if the assertion isn't valid.
- */
- public static void assertNotEquals(Object lhs, Object rhs, String msg) {
- if (lhs == null) {
- if (rhs == null) {
- error(msg);
- }
- } else {
- assertFalse(lhs.equals(rhs), getMessage(lhs, rhs,"!=", msg));
- }
- }
-
- /**
- * Calls {@link #assertNull(Object, String)} with a default message.
- *
- * @see #assertNull(Object, String)
- */
- public static void assertNull(Object o) {
- assertNull(o, "Expected " + format(o) + " to be null");
- }
-
- /**
- * Asserts that {@code o} is null.
- *
- * @param o The reference assumed to be null.
- * @param msg A description of the assumption.
- * @throws RuntimeException if the assertion isn't valid.
- */
- public static void assertNull(Object o, String msg) {
- assertEquals(o, null, msg);
- }
-
- /**
- * Calls {@link #assertNotNull(Object, String)} with a default message.
- *
- * @see #assertNotNull(Object, String)
- */
- public static void assertNotNull(Object o) {
- assertNotNull(o, "Expected non null reference");
- }
-
- /**
- * Asserts that {@code o} is <i>not</i> null.
- *
- * @param o The reference assumed <i>not</i> to be null,
- * @param msg A description of the assumption.
- * @throws RuntimeException if the assertion isn't valid.
- */
- public static void assertNotNull(Object o, String msg) {
- assertNotEquals(o, null, msg);
- }
-
- /**
- * Calls {@link #assertFalse(boolean, String)} with a default message.
- *
- * @see #assertFalse(boolean, String)
- */
- public static void assertFalse(boolean value) {
- assertFalse(value, "Expected value to be false");
- }
-
- /**
- * Asserts that {@code value} is {@code false}.
- *
- * @param value The value assumed to be false.
- * @param msg A description of the assumption.
- * @throws RuntimeException if the assertion isn't valid.
- */
- public static void assertFalse(boolean value, String msg) {
- assertTrue(!value, msg);
- }
-
- /**
- * Calls {@link #assertTrue(boolean, String)} with a default message.
- *
- * @see #assertTrue(boolean, String)
- */
- public static void assertTrue(boolean value) {
- assertTrue(value, "Expected value to be true");
- }
-
- /**
- * Asserts that {@code value} is {@code true}.
- *
- * @param value The value assumed to be true.
- * @param msg A description of the assumption.
- * @throws RuntimeException if the assertion isn't valid.
- */
- public static void assertTrue(boolean value, String msg) {
- if (!value) {
- error(msg);
- }
- }
-
- /**
- * Asserts that two strings are equal.
- *
- * If strings are not equals, then exception message
- * will contain {@code msg} followed by list of mismatched lines.
- *
- * @param str1 First string to compare.
- * @param str2 Second string to compare.
- * @param msg A description of the assumption.
- * @throws RuntimeException if strings are not equal.
- */
- public static void assertStringsEqual(String str1, String str2,
- String msg) {
- String lineSeparator = System.getProperty("line.separator");
- String str1Lines[] = str1.split(lineSeparator);
- String str2Lines[] = str2.split(lineSeparator);
-
- int minLength = Math.min(str1Lines.length, str2Lines.length);
- String longestStringLines[] = ((str1Lines.length == minLength) ?
- str2Lines : str1Lines);
-
- boolean stringsAreDifferent = false;
-
- StringBuilder messageBuilder = new StringBuilder(msg);
-
- messageBuilder.append("\n");
-
- for (int line = 0; line < minLength; line++) {
- if (!str1Lines[line].equals(str2Lines[line])) {
- messageBuilder.append(String.
- format("[line %d] '%s' differs " +
- "from '%s'\n",
- line,
- str1Lines[line],
- str2Lines[line]));
- stringsAreDifferent = true;
- }
- }
-
- if (minLength < longestStringLines.length) {
- String stringName = ((longestStringLines == str1Lines) ?
- "first" : "second");
- messageBuilder.append(String.format("Only %s string contains " +
- "following lines:\n",
- stringName));
- stringsAreDifferent = true;
- for(int line = minLength; line < longestStringLines.length; line++) {
- messageBuilder.append(String.
- format("[line %d] '%s'", line,
- longestStringLines[line]));
- }
- }
-
- if (stringsAreDifferent) {
- error(messageBuilder.toString());
- }
- }
-
- private static <T extends Comparable<T>> int compare(T lhs, T rhs, String msg) {
- assertNotNull(lhs, msg);
- assertNotNull(rhs, msg);
- return lhs.compareTo(rhs);
- }
-
- private static String format(Object o) {
- return o == null? "null" : o.toString();
- }
-
- private static void error(String msg) {
- throw new RuntimeException(msg);
- }
-
- private static String getMessage(Object lhs, Object rhs, String op, String msg) {
- return (msg == null ? "" : msg + " ") + "(assert failed: " + format(lhs) + " " + op + " " + format(rhs) + ")";
- }
-}
-
--- a/hotspot/test/testlibrary/jdk/test/lib/BuildHelper.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-package jdk.test.lib;
-
-import java.io.File;
-import java.io.FileReader;
-import java.util.Properties;
-
-public class BuildHelper {
-
- /**
- * Commercial builds should have the BUILD_TYPE set to commercial
- * within the release file, found at the root of the JDK.
- */
- public static boolean isCommercialBuild() throws Exception {
- String buildType = getReleaseProperty("BUILD_TYPE","notFound");
- return buildType.equals("commercial");
- }
-
-
- /**
- * Return the value for property key, or defaultValue if no property not found.
- * If present, double quotes are trimmed.
- */
- public static String getReleaseProperty(String key, String defaultValue) throws Exception {
- Properties properties = getReleaseProperties();
- String value = properties.getProperty(key, defaultValue);
- return trimDoubleQuotes(value);
- }
-
- /**
- * Return the value for property key, or null if no property not found.
- * If present, double quotes are trimmed.
- */
- public static String getReleaseProperty(String key) throws Exception {
- return getReleaseProperty(key, null);
- }
-
- /**
- * Get properties from the release file
- */
- public static Properties getReleaseProperties() throws Exception {
- Properties properties = new Properties();
- properties.load(new FileReader(getReleaseFile()));
- return properties;
- }
-
- /**
- * Every JDK has a release file in its root.
- * @return A handler to the release file.
- */
- public static File getReleaseFile() throws Exception {
- String jdkPath = getJDKRoot();
- File releaseFile = new File(jdkPath,"release");
- if ( ! releaseFile.canRead() ) {
- throw new Exception("Release file is not readable, or it is absent: " +
- releaseFile.getCanonicalPath());
- }
- return releaseFile;
- }
-
- /**
- * Returns path to the JDK under test.
- * This path is obtained through the test.jdk property, usually set by JTREG.
- */
- public static String getJDKRoot() {
- String jdkPath = System.getProperty("test.jdk");
- if (jdkPath == null) {
- throw new RuntimeException("System property 'test.jdk' not set. This property is normally set by jtreg. "
- + "When running test separately, set this property using '-Dtest.jdk=/path/to/jdk'.");
- }
- return jdkPath;
- }
-
- /**
- * Trim double quotes from the beginning and the end of the given string.
- * @param original string to trim.
- * @return a new trimmed string.
- */
- public static String trimDoubleQuotes(String original) {
- if (original == null) { return null; }
- String trimmed = original.replaceAll("^\"+|\"+$", "");
- return trimmed;
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/ByteCodeLoader.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.security.SecureClassLoader;
-
-/**
- * {@code ByteCodeLoader} can be used for easy loading of byte code already
- * present in memory.
- *
- * {@code InMemoryCompiler} can be used for compiling source code in a string
- * into byte code, which then can be loaded with {@code ByteCodeLoader}.
- *
- * @see InMemoryCompiler
- */
-public class ByteCodeLoader extends SecureClassLoader {
- private final String className;
- private final byte[] byteCode;
- private volatile Class<?> holder;
-
- /**
- * Creates a new {@code ByteCodeLoader} ready to load a class with the
- * given name and the given byte code.
- *
- * @param className The name of the class
- * @param byteCode The byte code of the class
- */
- public ByteCodeLoader(String className, byte[] byteCode) {
- this.className = className;
- this.byteCode = byteCode;
- }
-
- @Override
- public Class<?> loadClass(String name) throws ClassNotFoundException {
- if (!name.equals(className)) {
- return super.loadClass(name);
- }
- if (holder == null) {
- synchronized(this) {
- if (holder == null) {
- holder = findClass(name);
- }
- }
- }
- return holder;
- }
-
- @Override
- protected Class<?> findClass(String name) throws ClassNotFoundException {
- if (!name.equals(className)) {
- throw new ClassNotFoundException(name);
- }
-
- return defineClass(name, byteCode, 0, byteCode.length);
- }
-
- /**
- * Utility method for creating a new {@code ByteCodeLoader} and then
- * directly load the given byte code.
- *
- * @param className The name of the class
- * @param byteCode The byte code for the class
- * @throws ClassNotFoundException if the class can't be loaded
- * @return A {@see Class} object representing the class
- */
- public static Class<?> load(String className, byte[] byteCode) throws ClassNotFoundException {
- return new ByteCodeLoader(className, byteCode).loadClass(className);
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/DynamicVMOption.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-package jdk.test.lib;
-
-import com.sun.management.HotSpotDiagnosticMXBean;
-import java.lang.management.ManagementFactory;
-
-/**
- * A utility class to work with VM options which could be altered during
- * execution.
- *
- * This class is a wrapper around {@code com.sun.management.VMOption}.
- * It provides more convenient interface to read/write the values.
- *
- */
-public class DynamicVMOption {
-
- private final HotSpotDiagnosticMXBean mxBean;
-
- /**
- * VM option name, like "MinHeapFreeRatio".
- */
- public final String name;
-
- /**
- * Creates an instance of DynamicVMOption.
- *
- * @param name the VM option name
- */
- public DynamicVMOption(String name) {
- this.name = name;
- mxBean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
- }
-
- /**
- * Sets a new value for the option.
- * Trying to set not applicable value will cause IllegalArgumentException.
- * Behavior with null is undefined, most likely NPE will be thrown.
- *
- * @param newValue the value to be set
- * @see #getValue()
- * @throws IllegalArgumentException if newValue is not applicable to the option
- */
- public final void setValue(String newValue) {
- mxBean.setVMOption(name, newValue);
- }
-
- /**
- * Returns the value of option.
- *
- * @return the current option value
- * @see #setValue(java.lang.String)
- */
- public final String getValue() {
- return mxBean.getVMOption(name).getValue();
- }
-
- /**
- * Returns true, if option is writable, false otherwise.
- *
- * @return true, if option is writable, false otherwise
- */
- public final boolean isWriteable() {
- return mxBean.getVMOption(name).isWriteable();
- }
-
- /**
- * Checks if the given value is applicable for the option.
- *
- * This method tries to set the option to the new value. If no exception
- * has been thrown the value is treated as valid.
- *
- * Calling this method will not change the option value. After an attempt
- * to set a new value, the option will be restored to its previous value.
- *
- * @param value the value to verify
- * @return true if option could be set to the given value
- */
- public boolean isValidValue(String value) {
- boolean isValid = true;
- String oldValue = getValue();
- try {
- setValue(value);
- } catch (NullPointerException e) {
- if (value == null) {
- isValid = false;
- }
- } catch (IllegalArgumentException e) {
- isValid = false;
- } finally {
- setValue(oldValue);
- }
- return isValid;
- }
-
- /**
- * Returns the value of the given VM option as String.
- *
- * This is a simple shortcut for {@code new DynamicVMOption(name).getValue()}
- *
- * @param name the name of VM option
- * @return value as a string
- * @see #getValue()
- */
- public static String getString(String name) {
- return new DynamicVMOption(name).getValue();
- }
-
- /**
- * Returns the value of the given option as int.
- *
- * @param name the name of VM option
- * @return value parsed as integer
- * @see #getString(java.lang.String)
- *
- */
- public static int getInt(String name) {
- return Integer.parseInt(getString(name));
- }
-
- /**
- * Sets the VM option to a new value.
- *
- * This is a simple shortcut for {@code new DynamicVMOption(name).setValue(value)}
- *
- * @param name the name of VM option
- * @param value the value to be set
- * @see #setValue(java.lang.String)
- */
- public static void setString(String name, String value) {
- new DynamicVMOption(name).setValue(value);
- }
-
- /**
- * Sets the VM option value to a new integer value.
- *
- * @param name the name of VM option
- * @param value the integer value to be set
- * @see #setString(java.lang.String, java.lang.String)
- */
- public static void setInt(String name, int value) {
- new DynamicVMOption(name).setValue(Integer.toString(value));
- }
-
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/ExitCode.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-package jdk.test.lib;
-
-/**
- * Exit code values that could be returned by the JVM.
- */
-public enum ExitCode {
- OK(0),
- FAIL(1),
- CRASH(134);
-
- public final int value;
-
- ExitCode(int value) {
- this.value = value;
- }
-}
-
--- a/hotspot/test/testlibrary/jdk/test/lib/FileInstaller.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib;
-
-import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.BasicFileAttributes;
-
-/**
- * Copy a resource: file or directory recursively, using relative path(src and dst)
- * which are applied to test source directory(src) and current directory(dst)
- */
-public class FileInstaller {
- /**
- * @param args source and destination
- * @throws IOException if an I/O error occurs
- */
- public static void main(String[] args) throws IOException {
- if (args.length != 2) {
- throw new IllegalArgumentException("Unexpected number of arguments for file copy");
- }
- Path src = Paths.get(Utils.TEST_SRC, args[0]).toAbsolutePath();
- Path dst = Paths.get(args[1]).toAbsolutePath();
- if (src.toFile().exists()) {
- if (src.toFile().isDirectory()) {
- Files.walkFileTree(src, new CopyFileVisitor(src, dst));
- } else {
- Path dstDir = dst.getParent();
- if (!dstDir.toFile().exists()) {
- Files.createDirectories(dstDir);
- }
- Files.copy(src, dst, StandardCopyOption.REPLACE_EXISTING);
- }
- } else {
- throw new IOException("Can't find source " + src);
- }
- }
-
- private static class CopyFileVisitor extends SimpleFileVisitor<Path> {
- private final Path copyFrom;
- private final Path copyTo;
-
- public CopyFileVisitor(Path copyFrom, Path copyTo) {
- this.copyFrom = copyFrom;
- this.copyTo = copyTo;
- }
-
- @Override
- public FileVisitResult preVisitDirectory(Path file,
- BasicFileAttributes attrs) throws IOException {
- Path relativePath = file.relativize(copyFrom);
- Path destination = copyTo.resolve(relativePath);
- if (!destination.toFile().exists()) {
- Files.createDirectories(destination);
- }
- return FileVisitResult.CONTINUE;
- }
-
- @Override
- public FileVisitResult visitFile(Path file,
- BasicFileAttributes attrs) throws IOException {
- if (!file.toFile().isFile()) {
- return FileVisitResult.CONTINUE;
- }
- Path relativePath = copyFrom.relativize(file);
- Path destination = copyTo.resolve(relativePath);
- Files.copy(file, destination, StandardCopyOption.COPY_ATTRIBUTES);
- return FileVisitResult.CONTINUE;
- }
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/HeapRegionUsageTool.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/*
-* Copyright (c) 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.
-*/
-
-package jdk.test.lib;
-
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryPoolMXBean;
-import java.lang.management.MemoryUsage;
-
-/**
- * Utility class used by tests to get heap region usage.
- */
-public final class HeapRegionUsageTool {
-
- /**
- * Get MemoryUsage from MemoryPoolMXBean which name matches passed string.
- *
- * @param name
- * @return MemoryUsage
- */
- private static MemoryUsage getUsage(String name){
- for (MemoryPoolMXBean pool : ManagementFactory.getMemoryPoolMXBeans()) {
- if (pool.getName().matches(name)) {
- return pool.getUsage();
- }
- }
- return null;
- }
-
- /**
- * Get MemoryUsage of Eden space.
- *
- * @return MemoryUsage
- */
- public static MemoryUsage getEdenUsage() {
- return getUsage(".*Eden.*");
- }
-
- /**
- * Get MemoryUsage of Survivor space.
- *
- * @return MemoryUsage
- */
- public static MemoryUsage getSurvivorUsage() {
- return getUsage(".*Survivor.*");
- }
-
- /**
- * Get memory usage of Tenured space
- *
- * @return MemoryUsage
- */
- public static MemoryUsage getOldUsage() {
- return getUsage(".*(Old|Tenured).*");
- }
-
- /**
- * Get heap usage.
- *
- * @return MemoryUsage
- */
- public static MemoryUsage getHeapUsage() {
- return ManagementFactory.getMemoryMXBean().getHeapMemoryUsage();
- }
-
- /**
- * Helper function to align up.
- *
- * @param value
- * @param alignment
- * @return aligned value
- */
- public static long alignUp(long value, long alignment) {
- return (value + alignment - 1) & ~(alignment - 1);
- }
-
- /**
- * Helper function to align down.
- *
- * @param value
- * @param alignment
- * @return aligned value
- */
- public static long alignDown(long value, long alignment) {
- return value & ~(alignment - 1);
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/InMemoryJavaCompiler.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-
-import java.net.URI;
-import java.util.Arrays;
-
-import javax.tools.ForwardingJavaFileManager;
-import javax.tools.FileObject;
-import javax.tools.JavaCompiler;
-import javax.tools.JavaCompiler.CompilationTask;
-import javax.tools.JavaFileObject;
-import javax.tools.JavaFileObject.Kind;
-import javax.tools.SimpleJavaFileObject;
-import javax.tools.ToolProvider;
-
-/**
- * {@code InMemoryJavaCompiler} can be used for compiling a {@link
- * CharSequence} to a {@code byte[]}.
- *
- * The compiler will not use the file system at all, instead using a {@link
- * ByteArrayOutputStream} for storing the byte code. For the source code, any
- * kind of {@link CharSequence} can be used, e.g. {@link String}, {@link
- * StringBuffer} or {@link StringBuilder}.
- *
- * The {@code InMemoryCompiler} can easily be used together with a {@code
- * ByteClassLoader} to easily compile and load source code in a {@link String}:
- *
- * <pre>
- * {@code
- * import jdk.test.lib.InMemoryJavaCompiler;
- * import jdk.test.lib.ByteClassLoader;
- *
- * class Example {
- * public static void main(String[] args) {
- * String className = "Foo";
- * String sourceCode = "public class " + className + " {" +
- * " public void bar() {" +
- * " System.out.println("Hello from bar!");" +
- * " }" +
- * "}";
- * byte[] byteCode = InMemoryJavaCompiler.compile(className, sourceCode);
- * Class fooClass = ByteClassLoader.load(className, byteCode);
- * }
- * }
- * }
- * </pre>
- */
-public class InMemoryJavaCompiler {
- private static class MemoryJavaFileObject extends SimpleJavaFileObject {
- private final String className;
- private final CharSequence sourceCode;
- private final ByteArrayOutputStream byteCode;
-
- public MemoryJavaFileObject(String className, CharSequence sourceCode) {
- super(URI.create("string:///" + className.replace('.','/') + Kind.SOURCE.extension), Kind.SOURCE);
- this.className = className;
- this.sourceCode = sourceCode;
- this.byteCode = new ByteArrayOutputStream();
- }
-
- @Override
- public CharSequence getCharContent(boolean ignoreEncodingErrors) {
- return sourceCode;
- }
-
- @Override
- public OutputStream openOutputStream() throws IOException {
- return byteCode;
- }
-
- public byte[] getByteCode() {
- return byteCode.toByteArray();
- }
-
- public String getClassName() {
- return className;
- }
- }
-
- private static class FileManagerWrapper extends ForwardingJavaFileManager {
- private MemoryJavaFileObject file;
-
- public FileManagerWrapper(MemoryJavaFileObject file) {
- super(getCompiler().getStandardFileManager(null, null, null));
- this.file = file;
- }
-
- @Override
- public JavaFileObject getJavaFileForOutput(Location location, String className,
- Kind kind, FileObject sibling)
- throws IOException {
- if (!file.getClassName().equals(className)) {
- throw new IOException("Expected class with name " + file.getClassName() +
- ", but got " + className);
- }
- return file;
- }
- }
-
- /**
- * Compiles the class with the given name and source code.
- *
- * @param className The name of the class
- * @param sourceCode The source code for the class with name {@code className}
- * @param options additional command line options
- * @throws RuntimeException if the compilation did not succeed
- * @return The resulting byte code from the compilation
- */
- public static byte[] compile(String className, CharSequence sourceCode, String... options) {
- MemoryJavaFileObject file = new MemoryJavaFileObject(className, sourceCode);
- CompilationTask task = getCompilationTask(file, options);
-
- if(!task.call()) {
- throw new RuntimeException("Could not compile " + className + " with source code " + sourceCode);
- }
-
- return file.getByteCode();
- }
-
- private static JavaCompiler getCompiler() {
- return ToolProvider.getSystemJavaCompiler();
- }
-
- private static CompilationTask getCompilationTask(MemoryJavaFileObject file, String... options) {
- return getCompiler().getTask(null, new FileManagerWrapper(file), null, Arrays.asList(options), null, Arrays.asList(file));
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/InfiniteLoop.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-package jdk.test.lib;
-
-import java.util.Objects;
-
-/**
- * Class which runs another Runnable in infinite loop with certain pauses
- * between cycles.
- */
-public class InfiniteLoop implements Runnable {
- private final Runnable target;
- private final long mills;
-
-
- /**
- * @param target a target to run in a loop
- * @param mills the length of pause time in milliseconds
- * @throws NullPointerException if target is null
- * @throws IllegalArgumentException if the value of millis is negative
- */
- public InfiniteLoop(Runnable target, long mills) {
- Objects.requireNonNull(target);
- if (mills < 0) {
- throw new IllegalArgumentException("mills < 0");
- }
- this.target = target;
- this.mills = mills;
- }
-
- @Override
- public void run() {
- try {
- while (true) {
- target.run();
- if (mills > 0) {
- Thread.sleep(mills);
- }
- }
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new Error(e);
- }
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/InputArguments.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.lang.management.RuntimeMXBean;
-import java.lang.management.ManagementFactory;
-import java.util.List;
-
-/**
- * This class provides access to the input arguments to the VM.
- */
-public class InputArguments {
- private static final List<String> args;
-
- static {
- RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean();
- args = runtimeMxBean.getInputArguments();
- }
-
- /**
- * Returns true if {@code arg} is an input argument to the VM.
- *
- * This is useful for checking boolean flags such as -XX:+UseSerialGC or
- * -XX:-UsePerfData.
- *
- * @param arg The name of the argument.
- * @return {@code true} if the given argument is an input argument,
- * otherwise {@code false}.
- */
- public static boolean contains(String arg) {
- return args.contains(arg);
- }
-
- /**
- * Returns true if {@code prefix} is the start of an input argument to the
- * VM.
- *
- * This is useful for checking if flags describing a quantity, such as
- * -XX:+MaxMetaspaceSize=100m, is set without having to know the quantity.
- * To check if the flag -XX:MaxMetaspaceSize is set, use
- * {@code InputArguments.containsPrefix("-XX:MaxMetaspaceSize")}.
- *
- * @param prefix The start of the argument.
- * @return {@code true} if the given argument is the start of an input
- * argument, otherwise {@code false}.
- */
- public static boolean containsPrefix(String prefix) {
- for (String arg : args) {
- if (arg.startsWith(prefix)) {
- return true;
- }
- }
- return false;
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/JDKToolFinder.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.io.FileNotFoundException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-/**
- * @deprecated This class is deprecated. Use the one from
- * {@code <root>/test/lib/share/classes/jdk/test/lib}
- */
-@Deprecated
-public final class JDKToolFinder {
-
- private JDKToolFinder() {
- }
-
- /**
- * Returns the full path to an executable in jdk/bin based on System
- * property {@code test.jdk} or {@code compile.jdk} (both are set by the jtreg test suite)
- *
- * @return Full path to an executable in jdk/bin
- */
- public static String getJDKTool(String tool) {
-
- // First try to find the executable in test.jdk
- try {
- return getTool(tool, "test.jdk");
- } catch (FileNotFoundException e) {
-
- }
-
- // Now see if it's available in compile.jdk
- try {
- return getTool(tool, "compile.jdk");
- } catch (FileNotFoundException e) {
- throw new RuntimeException("Failed to find " + tool +
- ", looked in test.jdk (" + System.getProperty("test.jdk") +
- ") and compile.jdk (" + System.getProperty("compile.jdk") + ")");
- }
- }
-
- /**
- * Returns the full path to an executable in jdk/bin based on System
- * property {@code compile.jdk}
- *
- * @return Full path to an executable in jdk/bin
- */
- public static String getCompileJDKTool(String tool) {
- try {
- return getTool(tool, "compile.jdk");
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Returns the full path to an executable in jdk/bin based on System
- * property {@code test.jdk}
- *
- * @return Full path to an executable in jdk/bin
- */
- public static String getTestJDKTool(String tool) {
- try {
- return getTool(tool, "test.jdk");
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
-
- private static String getTool(String tool, String property) throws FileNotFoundException {
- String jdkPath = System.getProperty(property);
-
- if (jdkPath == null) {
- throw new RuntimeException(
- "System property '" + property + "' not set. This property is normally set by jtreg. "
- + "When running test separately, set this property using '-D" + property + "=/path/to/jdk'.");
- }
-
- Path toolName = Paths.get("bin", tool + (Platform.isWindows() ? ".exe" : ""));
-
- Path jdkTool = Paths.get(jdkPath, toolName.toString());
- if (!jdkTool.toFile().exists()) {
- throw new FileNotFoundException("Could not find file " + jdkTool.toAbsolutePath());
- }
-
- return jdkTool.toAbsolutePath().toString();
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/JDKToolLauncher.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * A utility for constructing command lines for starting JDK tool processes.
- *
- * The JDKToolLauncher can in particular be combined with a
- * java.lang.ProcessBuilder to easily run a JDK tool. For example, the following
- * code run {@code jmap -heap} against a process with GC logging turned on for
- * the {@code jmap} process:
- *
- * <pre>
- * {@code
- * JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
- * .addVMArg("-XX:+PrintGC");
- * .addVMArg("-XX:+PrintGCDetails")
- * .addToolArg("-heap")
- * .addToolArg(pid);
- * ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
- * Process p = pb.start();
- * }
- * </pre>
- * @deprecated This class is deprecated. Use the one from
- * {@code <root>/test/lib/share/classes/jdk/test/lib}
- */
-@Deprecated
-public class JDKToolLauncher {
- private final String executable;
- private final List<String> vmArgs = new ArrayList<String>();
- private final List<String> toolArgs = new ArrayList<String>();
-
- private JDKToolLauncher(String tool, boolean useCompilerJDK) {
- if (useCompilerJDK) {
- executable = JDKToolFinder.getJDKTool(tool);
- } else {
- executable = JDKToolFinder.getTestJDKTool(tool);
- }
- vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
- }
-
- /**
- * Creates a new JDKToolLauncher for the specified tool. Using tools path
- * from the compiler JDK.
- *
- * @param tool
- * The name of the tool
- * @return A new JDKToolLauncher
- */
- public static JDKToolLauncher create(String tool) {
- return new JDKToolLauncher(tool, true);
- }
-
- /**
- * Creates a new JDKToolLauncher for the specified tool in the Tested JDK.
- *
- * @param tool
- * The name of the tool
- *
- * @return A new JDKToolLauncher
- */
- public static JDKToolLauncher createUsingTestJDK(String tool) {
- return new JDKToolLauncher(tool, false);
- }
-
- /**
- * Adds an argument to the JVM running the tool.
- *
- * The JVM arguments are passed to the underlying JVM running the tool.
- * Arguments will automatically be prepended with "-J".
- *
- * Any platform specific arguments required for running the tool are
- * automatically added.
- *
- *
- * @param arg
- * The argument to VM running the tool
- * @return The JDKToolLauncher instance
- */
- public JDKToolLauncher addVMArg(String arg) {
- vmArgs.add(arg);
- return this;
- }
-
- /**
- * Adds an argument to the tool.
- *
- * @param arg
- * The argument to the tool
- * @return The JDKToolLauncher instance
- */
- public JDKToolLauncher addToolArg(String arg) {
- toolArgs.add(arg);
- return this;
- }
-
- /**
- * Returns the command that can be used for running the tool.
- *
- * @return An array whose elements are the arguments of the command.
- */
- public String[] getCommand() {
- List<String> command = new ArrayList<String>();
- command.add(executable);
- // Add -J in front of all vmArgs
- for (String arg : vmArgs) {
- command.add("-J" + arg);
- }
- command.addAll(toolArgs);
- return command.toArray(new String[command.size()]);
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/OutputAnalyzer.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,440 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public final class OutputAnalyzer {
-
- private final String stdout;
- private final String stderr;
- private final int exitValue;
-
- /**
- * Create an OutputAnalyzer, a utility class for verifying output and exit
- * value from a Process
- *
- * @param process Process to analyze
- * @throws IOException If an I/O error occurs.
- *
- * @deprecated This class is deprecated. Use the one from
- * {@code <root>/test/lib/share/classes/jdk/test/lib/process}
- */
- @Deprecated
- public OutputAnalyzer(Process process) throws IOException {
- OutputBuffer output = ProcessTools.getOutput(process);
- exitValue = process.exitValue();
- this.stdout = output.getStdout();
- this.stderr = output.getStderr();
- }
-
- /**
- * Create an OutputAnalyzer, a utility class for verifying output
- *
- * @param buf String buffer to analyze
- */
- public OutputAnalyzer(String buf) {
- this(buf, buf);
- }
-
- /**
- * Create an OutputAnalyzer, a utility class for verifying output
- *
- * @param stdout stdout buffer to analyze
- * @param stderr stderr buffer to analyze
- */
- public OutputAnalyzer(String stdout, String stderr) {
- this.stdout = stdout;
- this.stderr = stderr;
- exitValue = -1;
- }
-
- /**
- * Verify that the stdout contents of output buffer is empty
- *
- * @throws RuntimeException
- * If stdout was not empty
- */
- public void stdoutShouldBeEmpty() {
- if (!getStdout().isEmpty()) {
- reportDiagnosticSummary();
- throw new RuntimeException("stdout was not empty");
- }
- }
-
- /**
- * Verify that the stderr contents of output buffer is empty
- *
- * @throws RuntimeException
- * If stderr was not empty
- */
- public void stderrShouldBeEmpty() {
- if (!getStderr().isEmpty()) {
- reportDiagnosticSummary();
- throw new RuntimeException("stderr was not empty");
- }
- }
-
- /**
- * Verify that the stdout contents of output buffer is not empty
- *
- * @throws RuntimeException
- * If stdout was empty
- */
- public void stdoutShouldNotBeEmpty() {
- if (getStdout().isEmpty()) {
- reportDiagnosticSummary();
- throw new RuntimeException("stdout was empty");
- }
- }
-
- /**
- * Verify that the stderr contents of output buffer is not empty
- *
- * @throws RuntimeException
- * If stderr was empty
- */
- public void stderrShouldNotBeEmpty() {
- if (getStderr().isEmpty()) {
- reportDiagnosticSummary();
- throw new RuntimeException("stderr was empty");
- }
- }
-
- /**
- * Verify that the stdout and stderr contents of output buffer contains the string
- *
- * @param expectedString String that buffer should contain
- * @throws RuntimeException If the string was not found
- */
- public OutputAnalyzer shouldContain(String expectedString) {
- if (!stdout.contains(expectedString) && !stderr.contains(expectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout contents of output buffer contains the string
- *
- * @param expectedString String that buffer should contain
- * @throws RuntimeException If the string was not found
- */
- public OutputAnalyzer stdoutShouldContain(String expectedString) {
- if (!stdout.contains(expectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + expectedString + "' missing from stdout \n");
- }
- return this;
- }
-
- /**
- * Verify that the stderr contents of output buffer contains the string
- *
- * @param expectedString String that buffer should contain
- * @throws RuntimeException If the string was not found
- */
- public OutputAnalyzer stderrShouldContain(String expectedString) {
- if (!stderr.contains(expectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + expectedString + "' missing from stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout and stderr contents of output buffer does not contain the string
- *
- * @param expectedString String that the buffer should not contain
- * @throws RuntimeException If the string was found
- */
- public OutputAnalyzer shouldNotContain(String notExpectedString) {
- if (stdout.contains(notExpectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
- }
- if (stderr.contains(notExpectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout contents of output buffer does not contain the string
- *
- * @param expectedString String that the buffer should not contain
- * @throws RuntimeException If the string was found
- */
- public OutputAnalyzer stdoutShouldNotContain(String notExpectedString) {
- if (stdout.contains(notExpectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
- }
- return this;
- }
-
- /**
- * Verify that the stderr contents of output buffer does not contain the string
- *
- * @param expectedString String that the buffer should not contain
- * @throws RuntimeException If the string was found
- */
- public OutputAnalyzer stderrShouldNotContain(String notExpectedString) {
- if (stderr.contains(notExpectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout and stderr contents of output buffer matches
- * the pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was not found
- */
- public OutputAnalyzer shouldMatch(String pattern) {
- Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (!stdoutMatcher.find() && !stderrMatcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' missing from stdout/stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout contents of output buffer matches the
- * pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was not found
- */
- public OutputAnalyzer stdoutShouldMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (!matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' missing from stdout \n");
- }
- return this;
- }
-
- /**
- * Verify that the stderr contents of output buffer matches the
- * pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was not found
- */
- public OutputAnalyzer stderrShouldMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (!matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' missing from stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout and stderr contents of output buffer does not
- * match the pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was found
- */
- public OutputAnalyzer shouldNotMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' found in stdout: '" + matcher.group() + "' \n");
- }
- matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' found in stderr: '" + matcher.group() + "' \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout contents of output buffer does not match the
- * pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was found
- */
- public OutputAnalyzer stdoutShouldNotMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' found in stdout \n");
- }
- return this;
- }
-
- /**
- * Verify that the stderr contents of output buffer does not match the
- * pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was found
- */
- public OutputAnalyzer stderrShouldNotMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' found in stderr \n");
- }
- return this;
- }
-
- /**
- * Get the captured group of the first string matching the pattern.
- * stderr is searched before stdout.
- *
- * @param pattern The multi-line pattern to match
- * @param group The group to capture
- * @return The matched string or null if no match was found
- */
- public String firstMatch(String pattern, int group) {
- Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (stderrMatcher.find()) {
- return stderrMatcher.group(group);
- }
- if (stdoutMatcher.find()) {
- return stdoutMatcher.group(group);
- }
- return null;
- }
-
- /**
- * Get the first string matching the pattern.
- * stderr is searched before stdout.
- *
- * @param pattern The multi-line pattern to match
- * @return The matched string or null if no match was found
- */
- public String firstMatch(String pattern) {
- return firstMatch(pattern, 0);
- }
-
- /**
- * Verify the exit value of the process
- *
- * @param expectedExitValue Expected exit value from process
- * @throws RuntimeException If the exit value from the process did not match the expected value
- */
- public OutputAnalyzer shouldHaveExitValue(int expectedExitValue) {
- if (getExitValue() != expectedExitValue) {
- reportDiagnosticSummary();
- throw new RuntimeException("Expected to get exit value of ["
- + expectedExitValue + "]\n");
- }
- return this;
- }
-
-
- /**
- * Report summary that will help to diagnose the problem
- * Currently includes:
- * - standard input produced by the process under test
- * - standard output
- * - exit code
- * Note: the command line is printed by the ProcessTools
- */
- public void reportDiagnosticSummary() {
- String msg =
- " stdout: [" + stdout + "];\n" +
- " stderr: [" + stderr + "]\n" +
- " exitValue = " + getExitValue() + "\n";
-
- System.err.println(msg);
- }
-
-
- /**
- * Get the contents of the output buffer (stdout and stderr)
- *
- * @return Content of the output buffer
- */
- public String getOutput() {
- return stdout + stderr;
- }
-
- /**
- * Get the contents of the stdout buffer
- *
- * @return Content of the stdout buffer
- */
- public String getStdout() {
- return stdout;
- }
-
- /**
- * Get the contents of the stderr buffer
- *
- * @return Content of the stderr buffer
- */
- public String getStderr() {
- return stderr;
- }
-
- /**
- * Get the process exit value
- *
- * @return Process exit value
- */
- public int getExitValue() {
- return exitValue;
- }
-
- /**
- * Get the contents of the output buffer (stdout and stderr) as list of strings.
- * Output will be split by newlines.
- *
- * @return Contents of the output buffer as list of strings
- */
- public List<String> asLines() {
- return asLines(getOutput());
- }
-
- private List<String> asLines(String buffer) {
- return Arrays.asList(buffer.split("(\\r\\n|\\n|\\r)"));
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/OutputBuffer.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-/**
- * @deprecated This class is deprecated. Use the one from
- * {@code <root>/test/lib/share/classes/jdk/test/lib/process}
- */
-@Deprecated
-public class OutputBuffer {
- private final String stdout;
- private final String stderr;
-
- /**
- * Create an OutputBuffer, a class for storing and managing stdout and stderr
- * results separately
- *
- * @param stdout stdout result
- * @param stderr stderr result
- */
- public OutputBuffer(String stdout, String stderr) {
- this.stdout = stdout;
- this.stderr = stderr;
- }
-
- /**
- * Returns the stdout result
- *
- * @return stdout result
- */
- public String getStdout() {
- return stdout;
- }
-
- /**
- * Returns the stderr result
- *
- * @return stderr result
- */
- public String getStderr() {
- return stderr;
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/Pair.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib;
-
-import java.util.Objects;
-
-/**
- * Pair - a two element tuple
- *
- * @param <F> first type
- * @param <S> second type
- */
-public class Pair<F, S> {
- public final F first;
- public final S second;
-
- public Pair(F first, S second) {
- this.first = first;
- this.second = second;
- }
-
- @Override
- public String toString() {
- return "(" + first + ":" + second + ")";
- }
-
- @Override
- public boolean equals(Object other) {
- if (other instanceof Pair<?, ?>) {
- Pair<?, ?> otherPair = (Pair<?, ?>) other;
- return Objects.equals(first, otherPair.first) &&
- Objects.equals(second, otherPair.second);
- }
- return false;
- }
-
- @Override
- public int hashCode() {
- if (first == null) {
- return (second == null) ? 0 : second.hashCode();
- } else if (second == null) {
- return first.hashCode();
- } else {
- return first.hashCode() * 17 + second.hashCode();
- }
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/Platform.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,242 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, 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 jdk.test.lib;
-
-import java.util.regex.Pattern;
-
-/**
- * @deprecated This class is deprecated. Use the one from
- * {@code <root>/test/lib/share/classes/jdk/test/lib}
- */
-@Deprecated
-public class Platform {
- public static final String vmName = System.getProperty("java.vm.name");
- public static final String vmInfo = System.getProperty("java.vm.info");
- private static final String osName = System.getProperty("os.name");
- private static final String dataModel = System.getProperty("sun.arch.data.model");
- private static final String vmVersion = System.getProperty("java.vm.version");
- private static final String jdkDebug = System.getProperty("jdk.debug");
- private static final String osArch = System.getProperty("os.arch");
- private static final String userName = System.getProperty("user.name");
- private static final String compiler = System.getProperty("sun.management.compiler");
-
- public static boolean isClient() {
- return vmName.endsWith(" Client VM");
- }
-
- public static boolean isServer() {
- return vmName.endsWith(" Server VM");
- }
-
- public static boolean isGraal() {
- return vmName.endsWith(" Graal VM");
- }
-
- public static boolean isZero() {
- return vmName.endsWith(" Zero VM");
- }
-
- public static boolean isMinimal() {
- return vmName.endsWith(" Minimal VM");
- }
-
- public static boolean isTieredSupported() {
- return compiler.contains("Tiered Compilers");
- }
-
- public static boolean isInt() {
- return vmInfo.contains("interpreted");
- }
-
- public static boolean isMixed() {
- return vmInfo.contains("mixed");
- }
-
- public static boolean isComp() {
- return vmInfo.contains("compiled");
- }
-
- public static boolean is32bit() {
- return dataModel.equals("32");
- }
-
- public static boolean is64bit() {
- return dataModel.equals("64");
- }
-
- public static boolean isAix() {
- return isOs("aix");
- }
-
- public static boolean isLinux() {
- return isOs("linux");
- }
-
- public static boolean isOSX() {
- return isOs("mac");
- }
-
- public static boolean isSolaris() {
- return isOs("sunos");
- }
-
- public static boolean isWindows() {
- return isOs("win");
- }
-
- private static boolean isOs(String osname) {
- return osName.toLowerCase().startsWith(osname.toLowerCase());
- }
-
- public static String getOsName() {
- return osName;
- }
-
- public static boolean isDebugBuild() {
- return (jdkDebug.toLowerCase().contains("debug"));
- }
-
- public static String getVMVersion() {
- return vmVersion;
- }
-
- // Returns true for sparc and sparcv9.
- public static boolean isSparc() {
- return isArch("sparc.*");
- }
-
- public static boolean isARM() {
- return isArch("arm.*");
- }
-
- public static boolean isPPC() {
- return isArch("ppc.*");
- }
-
- public static boolean isX86() {
- // On Linux it's 'i386', Windows 'x86' without '_64' suffix.
- return isArch("(i386)|(x86(?!_64))");
- }
-
- public static boolean isX64() {
- // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64'
- return isArch("(amd64)|(x86_64)");
- }
-
- public static boolean isAArch64() {
- return isArch("aarch64");
- }
-
- private static boolean isArch(String archnameRE) {
- return Pattern.compile(archnameRE, Pattern.CASE_INSENSITIVE)
- .matcher(osArch)
- .matches();
- }
-
- public static String getOsArch() {
- return osArch;
- }
-
- /**
- * Return a boolean for whether we expect to be able to attach
- * the SA to our own processes on this system.
- */
- public static boolean shouldSAAttach() throws Exception {
-
- if (isAix()) {
- return false; // SA not implemented.
- } else if (isLinux()) {
- return canPtraceAttachLinux();
- } else if (isOSX()) {
- return canAttachOSX();
- } else {
- // Other platforms expected to work:
- return true;
- }
- }
-
- /**
- * On Linux, first check the SELinux boolean "deny_ptrace" and return false
- * as we expect to be denied if that is "1". Then expect permission to attach
- * if we are root, so return true. Then return false for an expected denial
- * if "ptrace_scope" is 1, and true otherwise.
- */
- public static boolean canPtraceAttachLinux() throws Exception {
-
- // SELinux deny_ptrace:
- String deny_ptrace = Utils.fileAsString("/sys/fs/selinux/booleans/deny_ptrace");
- if (deny_ptrace != null && deny_ptrace.contains("1")) {
- // ptrace will be denied:
- return false;
- }
-
- if (userName.equals("root")) {
- return true;
- }
-
- // ptrace_scope:
- String ptrace_scope = Utils.fileAsString("/proc/sys/kernel/yama/ptrace_scope");
- if (ptrace_scope != null && ptrace_scope.contains("1")) {
- // ptrace will be denied:
- return false;
- }
-
- // Otherwise expect to be permitted:
- return true;
- }
-
- /**
- * On OSX, expect permission to attach only if we are root.
- */
- public static boolean canAttachOSX() throws Exception {
- return userName.equals("root");
- }
-
- /**
- * return path to library inside jdk tree
- */
- public static String jdkLibPath() {
- if (isWindows()) {
- return "bin";
- }
- if (isOSX()) {
- return "lib";
- }
-
- return "lib/" + getOsArch();
- }
-
- /**
- * Build name of shared object according to platform rules
- */
- public static String sharedObjectName(String name) {
- if (isWindows()) {
- return name + ".dll";
- }
- if (isOSX()) {
- return "lib" + name + ".dylib";
- }
- return "lib" + name + ".so";
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/ProcessTools.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.lang.management.RuntimeMXBean;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * @deprecated This class is deprecated. Use the one from
- * {@code <root>/test/lib/share/classes/jdk/test/lib/process}
- */
-@Deprecated
-public final class ProcessTools {
-
- private ProcessTools() {
- }
-
- /**
- * Pumps stdout and stderr from running the process into a String.
- *
- * @param processBuilder ProcessBuilder to run.
- * @return Output from process.
- * @throws IOException If an I/O error occurs.
- */
- public static OutputBuffer getOutput(ProcessBuilder processBuilder) throws IOException {
- return getOutput(processBuilder.start());
- }
-
- /**
- * Pumps stdout and stderr the running process into a String.
- *
- * @param process Process to pump.
- * @return Output from process.
- * @throws IOException If an I/O error occurs.
- */
- public static OutputBuffer getOutput(Process process) throws IOException {
- ByteArrayOutputStream stderrBuffer = new ByteArrayOutputStream();
- ByteArrayOutputStream stdoutBuffer = new ByteArrayOutputStream();
- StreamPumper outPumper = new StreamPumper(process.getInputStream(), stdoutBuffer);
- StreamPumper errPumper = new StreamPumper(process.getErrorStream(), stderrBuffer);
- Thread outPumperThread = new Thread(outPumper);
- Thread errPumperThread = new Thread(errPumper);
-
- outPumperThread.setDaemon(true);
- errPumperThread.setDaemon(true);
-
- outPumperThread.start();
- errPumperThread.start();
-
- try {
- process.waitFor();
- outPumperThread.join();
- errPumperThread.join();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- return null;
- }
-
- return new OutputBuffer(stdoutBuffer.toString(), stderrBuffer.toString());
- }
-
- /**
- * Get the process id of the current running Java process
- *
- * @return Process id
- */
- public static long getProcessId() throws Exception {
- return ProcessHandle.current().getPid();
- }
-
- /**
- * Gets the array of strings containing input arguments passed to the VM
- *
- * @return arguments
- */
- public static String[] getVmInputArgs() {
- RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean();
- List<String> args = runtime.getInputArguments();
- return args.toArray(new String[args.size()]);
- }
-
- /**
- * Get platform specific VM arguments (e.g. -d64 on 64bit Solaris)
- *
- * @return String[] with platform specific arguments, empty if there are none
- */
- public static String[] getPlatformSpecificVMArgs() {
-
- if (Platform.is64bit() && Platform.isSolaris()) {
- return new String[] { "-d64" };
- }
-
- return new String[] {};
- }
-
- /**
- * Create ProcessBuilder using the java launcher from the jdk to be tested and
- * with any platform specific arguments prepended
- */
- public static ProcessBuilder createJavaProcessBuilder(String... command) throws Exception {
- return createJavaProcessBuilder(false, command);
- }
-
- public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmAndJavaOptions, String... command) throws Exception {
- String javapath = JDKToolFinder.getJDKTool("java");
-
- ArrayList<String> args = new ArrayList<>();
- args.add(javapath);
- Collections.addAll(args, getPlatformSpecificVMArgs());
-
- args.add("-cp");
- args.add(System.getProperty("java.class.path"));
-
- if (addTestVmAndJavaOptions) {
- Collections.addAll(args, Utils.getTestJavaOpts());
- }
-
- Collections.addAll(args, command);
-
- // Reporting
- StringBuilder cmdLine = new StringBuilder();
- for (String cmd : args) {
- cmdLine.append(cmd).append(' ');
- }
- System.out.println("Command line: [" + cmdLine.toString() + "]");
-
- return new ProcessBuilder(args.toArray(new String[args.size()]));
- }
-
- /**
- * Executes a test jvm process, waits for it to finish and returns the process output.
- * The default jvm options from jtreg, test.vm.opts and test.java.opts, are added.
- * The java from the test.jdk is used to execute the command.
- *
- * The command line will be like:
- * {test.jdk}/bin/java {test.vm.opts} {test.java.opts} cmds
- *
- * @param cmds User specifed arguments.
- * @return The output from the process.
- */
- public static OutputAnalyzer executeTestJvm(String... cmds) throws Throwable {
- ProcessBuilder pb = createJavaProcessBuilder(Utils.addTestJavaOpts(cmds));
- return executeProcess(pb);
- }
-
- /**
- * Executes a test jvm process, waits for it to finish and returns the process output.
- * The default jvm options from the test's run command, jtreg, test.vm.opts and test.java.opts, are added.
- * The java from the test.jdk is used to execute the command.
- *
- * The command line will be like:
- * {test.jdk}/bin/java {test.fromRun.opts} {test.vm.opts} {test.java.opts} cmds
- *
- * @param cmds User specifed arguments.
- * @return The output from the process.
- */
- public static OutputAnalyzer executeTestJvmAllArgs(String... cmds) throws Throwable {
- List<String> argsList = new ArrayList<>();
- String[] testArgs = getVmInputArgs();
- Collections.addAll(argsList, testArgs);
- Collections.addAll(argsList, Utils.addTestJavaOpts(cmds));
- ProcessBuilder pb = createJavaProcessBuilder(argsList.toArray(new String[argsList.size()]));
- return executeProcess(pb);
- }
-
- /**
- * Executes a process, waits for it to finish and returns the process output.
- * The process will have exited before this method returns.
- * @param pb The ProcessBuilder to execute.
- * @return The {@linkplain OutputAnalyzer} instance wrapping the process.
- */
- public static OutputAnalyzer executeProcess(ProcessBuilder pb) throws Exception {
- OutputAnalyzer output = null;
- Process p = null;
- boolean failed = false;
- try {
- p = pb.start();
- output = new OutputAnalyzer(p);
- p.waitFor();
-
- return output;
- } catch (Throwable t) {
- if (p != null) {
- p.destroyForcibly().waitFor();
- }
-
- failed = true;
- System.out.println("executeProcess() failed: " + t);
- throw t;
- } finally {
- if (failed) {
- System.err.println(getProcessLog(pb, output));
- }
- }
- }
-
- /**
- * Executes a process, waits for it to finish and returns the process output.
- * @param cmds The command line to execute.
- * @return The output from the process.
- */
- public static OutputAnalyzer executeProcess(String... cmds) throws Throwable {
- return executeProcess(new ProcessBuilder(cmds));
- }
-
- /**
- * Used to log command line, stdout, stderr and exit code from an executed process.
- * @param pb The executed process.
- * @param output The output from the process.
- */
- public static String getProcessLog(ProcessBuilder pb, OutputAnalyzer output) {
- String stderr = output == null ? "null" : output.getStderr();
- String stdout = output == null ? "null" : output.getStdout();
- String exitValue = output == null ? "null": Integer.toString(output.getExitValue());
- StringBuilder logMsg = new StringBuilder();
- final String nl = System.getProperty("line.separator");
- logMsg.append("--- ProcessLog ---" + nl);
- logMsg.append("cmd: " + getCommandLine(pb) + nl);
- logMsg.append("exitvalue: " + exitValue + nl);
- logMsg.append("stderr: " + stderr + nl);
- logMsg.append("stdout: " + stdout + nl);
- return logMsg.toString();
- }
-
- /**
- * @return The full command line for the ProcessBuilder.
- */
- public static String getCommandLine(ProcessBuilder pb) {
- if (pb == null) {
- return "null";
- }
- StringBuilder cmd = new StringBuilder();
- for (String s : pb.command()) {
- cmd.append(s).append(" ");
- }
- return cmd.toString().trim();
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/StreamPumper.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-
-/**
- * @deprecated This class is deprecated. Use the one from
- * {@code <root>/test/lib/share/classes/jdk/test/lib/process}
- */
-@Deprecated
-public final class StreamPumper implements Runnable {
-
- private static final int BUF_SIZE = 256;
-
- private final OutputStream out;
- private final InputStream in;
-
- /**
- * Create a StreamPumper that reads from in and writes to out.
- *
- * @param in The stream to read from.
- * @param out The stream to write to.
- */
- public StreamPumper(InputStream in, OutputStream out) {
- this.in = in;
- this.out = out;
- }
-
- /**
- * Implements Thread.run(). Continuously read from <code>in</code> and write
- * to <code>out</code> until <code>in</code> has reached end of stream. Abort
- * on interruption. Abort on IOExceptions.
- */
- @Override
- public void run() {
- int length;
- InputStream localIn = in;
- OutputStream localOut = out;
- byte[] buffer = new byte[BUF_SIZE];
-
- try {
- while (!Thread.interrupted() && (length = localIn.read(buffer)) > 0) {
- localOut.write(buffer, 0, length);
- }
- } catch (IOException e) {
- // Just abort if something like this happens.
- e.printStackTrace();
- } finally {
- try {
- localOut.flush();
- in.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/TimeLimitedRunner.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-package jdk.test.lib;
-
-import java.util.Objects;
-import java.util.concurrent.Callable;
-
-/**
- * Auxiliary class to run target w/ given timeout.
- */
-public class TimeLimitedRunner implements Callable<Void> {
- private final long stoptime;
- private final long timeout;
- private final double factor;
- private final Callable<Boolean> target;
-
- /**
- * @param timeout a timeout. zero means no time limitation
- * @param factor a multiplier used to estimate next iteration time
- * @param target a target to run
- * @throws NullPointerException if target is null
- * @throws IllegalArgumentException if timeout is negative or
- factor isn't positive
- */
- public TimeLimitedRunner(long timeout, double factor,
- Callable<Boolean> target) {
- Objects.requireNonNull(target, "target must not be null");
- if (timeout < 0) {
- throw new IllegalArgumentException("timeout[" + timeout + "] < 0");
- }
- if (factor <= 0d) {
- throw new IllegalArgumentException("factor[" + factor + "] <= 0");
- }
- this.stoptime = System.currentTimeMillis() + timeout;
- this.timeout = timeout;
- this.factor = factor;
- this.target = target;
- }
-
- /**
- * Runs @{linkplan target} while it returns true and timeout isn't exceeded
- */
- @Override
- public Void call() throws Exception {
- long maxDuration = 0L;
- long iterStart = System.currentTimeMillis();
- if (timeout != 0 && iterStart > stoptime) {
- return null;
- }
- while (target.call()) {
- if (timeout != 0) {
- long iterDuration = System.currentTimeMillis() - iterStart;
- maxDuration = Math.max(maxDuration, iterDuration);
- iterStart = System.currentTimeMillis();
- if (iterStart + (maxDuration * factor) > stoptime) {
- System.out.println("Not enough time to continue execution. "
- + "Interrupted.");
- break;
- }
- }
- }
- return null;
- }
-
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/Triple.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib;
-
-import java.util.Objects;
-
-/**
- * Triple - a three element tuple
- *
- * @param <F> first element type
- * @param <S> second element type
- * @param <T> third element type
- */
-public class Triple<F, S, T> {
- private final Pair<F, Pair<S, T>> container;
-
- /**
- * Constructor
- *
- * @param first first element of the triple
- * @param second second element of the triple
- * @param third third element of the triple
- */
- public Triple(F first, S second, T third) {
- container = new Pair<>(first, new Pair<>(second, third));
- }
-
- /**
- * Gets first element of the triple
- */
- public F getFirst() {
- return container.first;
- }
-
- /**
- * Gets second element of the triple
- */
- public S getSecond() {
- return container.second.first;
- }
-
- /**
- * Gets third element of the triple
- */
- public T getThird() {
- return container.second.second;
- }
-
- @Override
- public int hashCode() {
- return container.hashCode();
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj instanceof Triple<?, ?, ?>) {
- Triple<?, ?, ?> objTriple = (Triple<?, ?, ?>) obj;
- return Objects.equals(container.first, objTriple.container.first)
- && Objects.equals(container.second,
- objTriple.container.second);
- }
- return false;
- }
-
- @Override
- public String toString() {
- return "(" + getFirst() + " : " + getSecond() + " : " + getThird() + ")";
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/Utils.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,648 +0,0 @@
-/*
- * Copyright (c) 2013, 2016, 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 jdk.test.lib;
-
-import java.io.File;
-import static jdk.test.lib.Asserts.assertTrue;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.ServerSocket;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.UnknownHostException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
-import java.util.Random;
-import java.util.function.BooleanSupplier;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import jdk.internal.misc.Unsafe;
-
-/**
- * Common library for various test helper functions.
- *
- * @deprecated This class is deprecated. Use the one from
- * {@code <root>/test/lib/share/classes/jdk/test/lib}
- */
-@Deprecated
-public final class Utils {
-
- /**
- * Returns the value of 'test.class.path' system property.
- */
- public static final String TEST_CLASS_PATH = System.getProperty("test.class.path", ".");
-
- /**
- * Returns the sequence used by operating system to separate lines.
- */
- public static final String NEW_LINE = System.getProperty("line.separator");
-
- /**
- * Returns the value of 'test.vm.opts' system property.
- */
- public static final String VM_OPTIONS = System.getProperty("test.vm.opts", "").trim();
-
- /**
- * Returns the value of 'test.java.opts' system property.
- */
- public static final String JAVA_OPTIONS = System.getProperty("test.java.opts", "").trim();
-
- /**
- * Returns the value of 'test.src' system property.
- */
- public static final String TEST_SRC = System.getProperty("test.src", ".").trim();
-
- /*
- * Returns the value of 'test.jdk' system property
- */
- public static final String TEST_JDK = System.getProperty("test.jdk");
-
- /**
- * Returns the value of 'test.classes' system property
- */
- public static final String TEST_CLASSES = System.getProperty("test.classes", ".");
-
- private static Unsafe unsafe = null;
-
- /**
- * Defines property name for seed value.
- */
- public static final String SEED_PROPERTY_NAME = "jdk.test.lib.random.seed";
-
- /* (non-javadoc)
- * Random generator with (or without) predefined seed. Depends on
- * "jdk.test.lib.random.seed" property value.
- */
- private static volatile Random RANDOM_GENERATOR;
-
- /**
- * Contains the seed value used for {@link java.util.Random} creation.
- */
- public static final long SEED = Long.getLong(SEED_PROPERTY_NAME, new Random().nextLong());
- /**
- * Returns the value of 'test.timeout.factor' system property
- * converted to {@code double}.
- */
- public static final double TIMEOUT_FACTOR;
- static {
- String toFactor = System.getProperty("test.timeout.factor", "1.0");
- TIMEOUT_FACTOR = Double.parseDouble(toFactor);
- }
-
- /**
- * Returns the value of JTREG default test timeout in milliseconds
- * converted to {@code long}.
- */
- public static final long DEFAULT_TEST_TIMEOUT = TimeUnit.SECONDS.toMillis(120);
-
- private Utils() {
- // Private constructor to prevent class instantiation
- }
-
- /**
- * Returns the list of VM options.
- *
- * @return List of VM options
- */
- public static List<String> getVmOptions() {
- return Arrays.asList(safeSplitString(VM_OPTIONS));
- }
-
- /**
- * Returns the list of VM options with -J prefix.
- *
- * @return The list of VM options with -J prefix
- */
- public static List<String> getForwardVmOptions() {
- String[] opts = safeSplitString(VM_OPTIONS);
- for (int i = 0; i < opts.length; i++) {
- opts[i] = "-J" + opts[i];
- }
- return Arrays.asList(opts);
- }
-
- /**
- * Returns the default JTReg arguments for a jvm running a test.
- * This is the combination of JTReg arguments test.vm.opts and test.java.opts.
- * @return An array of options, or an empty array if no options.
- */
- public static String[] getTestJavaOpts() {
- List<String> opts = new ArrayList<String>();
- Collections.addAll(opts, safeSplitString(VM_OPTIONS));
- Collections.addAll(opts, safeSplitString(JAVA_OPTIONS));
- return opts.toArray(new String[0]);
- }
-
- /**
- * Returns the default JTReg arguments for a jvm running a test without
- * options that matches regular expressions in {@code filters}.
- * This is the combination of JTReg arguments test.vm.opts and test.java.opts.
- * @param filters Regular expressions used to filter out options.
- * @return An array of options, or an empty array if no options.
- */
- public static String[] getFilteredTestJavaOpts(String... filters) {
- String options[] = getTestJavaOpts();
-
- if (filters.length == 0) {
- return options;
- }
-
- List<String> filteredOptions = new ArrayList<String>(options.length);
- Pattern patterns[] = new Pattern[filters.length];
- for (int i = 0; i < filters.length; i++) {
- patterns[i] = Pattern.compile(filters[i]);
- }
-
- for (String option : options) {
- boolean matched = false;
- for (int i = 0; i < patterns.length && !matched; i++) {
- Matcher matcher = patterns[i].matcher(option);
- matched = matcher.find();
- }
- if (!matched) {
- filteredOptions.add(option);
- }
- }
-
- return filteredOptions.toArray(new String[filteredOptions.size()]);
- }
-
- /**
- * Combines given arguments with default JTReg arguments for a jvm running a test.
- * This is the combination of JTReg arguments test.vm.opts and test.java.opts
- * @return The combination of JTReg test java options and user args.
- */
- public static String[] addTestJavaOpts(String... userArgs) {
- List<String> opts = new ArrayList<String>();
- Collections.addAll(opts, getTestJavaOpts());
- Collections.addAll(opts, userArgs);
- return opts.toArray(new String[0]);
- }
-
- /**
- * Splits a string by white space.
- * Works like String.split(), but returns an empty array
- * if the string is null or empty.
- */
- private static String[] safeSplitString(String s) {
- if (s == null || s.trim().isEmpty()) {
- return new String[] {};
- }
- return s.trim().split("\\s+");
- }
-
- /**
- * @return The full command line for the ProcessBuilder.
- */
- public static String getCommandLine(ProcessBuilder pb) {
- StringBuilder cmd = new StringBuilder();
- for (String s : pb.command()) {
- cmd.append(s).append(" ");
- }
- return cmd.toString();
- }
-
- /**
- * Returns the free port on the local host.
- * The function will spin until a valid port number is found.
- *
- * @return The port number
- * @throws InterruptedException if any thread has interrupted the current thread
- * @throws IOException if an I/O error occurs when opening the socket
- */
- public static int getFreePort() throws InterruptedException, IOException {
- int port = -1;
-
- while (port <= 0) {
- Thread.sleep(100);
-
- ServerSocket serverSocket = null;
- try {
- serverSocket = new ServerSocket(0);
- port = serverSocket.getLocalPort();
- } finally {
- serverSocket.close();
- }
- }
-
- return port;
- }
-
- /**
- * Returns the name of the local host.
- *
- * @return The host name
- * @throws UnknownHostException if IP address of a host could not be determined
- */
- public static String getHostname() throws UnknownHostException {
- InetAddress inetAddress = InetAddress.getLocalHost();
- String hostName = inetAddress.getHostName();
-
- assertTrue((hostName != null && !hostName.isEmpty()),
- "Cannot get hostname");
-
- return hostName;
- }
-
- /**
- * Uses "jcmd -l" to search for a jvm pid. This function will wait
- * forever (until jtreg timeout) for the pid to be found.
- * @param key Regular expression to search for
- * @return The found pid.
- */
- public static int waitForJvmPid(String key) throws Throwable {
- final long iterationSleepMillis = 250;
- System.out.println("waitForJvmPid: Waiting for key '" + key + "'");
- System.out.flush();
- while (true) {
- int pid = tryFindJvmPid(key);
- if (pid >= 0) {
- return pid;
- }
- Thread.sleep(iterationSleepMillis);
- }
- }
-
- /**
- * Searches for a jvm pid in the output from "jcmd -l".
- *
- * Example output from jcmd is:
- * 12498 sun.tools.jcmd.JCmd -l
- * 12254 /tmp/jdk8/tl/jdk/JTwork/classes/com/sun/tools/attach/Application.jar
- *
- * @param key A regular expression to search for.
- * @return The found pid, or -1 if not found.
- * @throws Exception If multiple matching jvms are found.
- */
- public static int tryFindJvmPid(String key) throws Throwable {
- OutputAnalyzer output = null;
- try {
- JDKToolLauncher jcmdLauncher = JDKToolLauncher.create("jcmd");
- jcmdLauncher.addToolArg("-l");
- output = ProcessTools.executeProcess(jcmdLauncher.getCommand());
- output.shouldHaveExitValue(0);
-
- // Search for a line starting with numbers (pid), followed by the key.
- Pattern pattern = Pattern.compile("^([0-9]+)\\s.*(" + key + ")", Pattern.MULTILINE);
- Matcher matcher = pattern.matcher(output.getStdout());
-
- int pid = -1;
- if (matcher.find()) {
- pid = Integer.parseInt(matcher.group(1));
- System.out.println("findJvmPid.pid: " + pid);
- if (matcher.find()) {
- throw new Exception("Found multiple JVM pids for key: " + key);
- }
- }
- return pid;
- } catch (Throwable t) {
- System.out.println(String.format("Utils.findJvmPid(%s) failed: %s", key, t));
- throw t;
- }
- }
-
- /**
- * Return the contents of the named file as a single String,
- * or null if not found.
- * @param filename name of the file to read
- * @return String contents of file, or null if file not found.
- * @throws IOException
- * if an I/O error occurs reading from the file or a malformed or
- * unmappable byte sequence is read
- */
- public static String fileAsString(String filename) throws IOException {
- Path filePath = Paths.get(filename);
- if (!Files.exists(filePath)) return null;
- return new String(Files.readAllBytes(filePath));
- }
-
- /**
- * @return Unsafe instance.
- */
- public static synchronized Unsafe getUnsafe() {
- if (unsafe == null) {
- try {
- Field f = Unsafe.class.getDeclaredField("theUnsafe");
- f.setAccessible(true);
- unsafe = (Unsafe) f.get(null);
- } catch (NoSuchFieldException | IllegalAccessException e) {
- throw new RuntimeException("Unable to get Unsafe instance.", e);
- }
- }
- return unsafe;
- }
- private static final char[] hexArray = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
- /**
- * Returns hex view of byte array
- *
- * @param bytes byte array to process
- * @return Space separated hexadecimal string representation of bytes
- */
-
- public static String toHexString(byte[] bytes) {
- char[] hexView = new char[bytes.length * 3];
- int i = 0;
- for (byte b : bytes) {
- hexView[i++] = hexArray[(b >> 4) & 0x0F];
- hexView[i++] = hexArray[b & 0x0F];
- hexView[i++] = ' ';
- }
- return new String(hexView);
- }
-
- /**
- * Returns {@link java.util.Random} generator initialized with particular seed.
- * The seed could be provided via system property {@link Utils#SEED_PROPERTY_NAME}
- * In case no seed is provided, the method uses a random number.
- * The used seed printed to stdout.
- * @return {@link java.util.Random} generator with particular seed.
- */
- public static Random getRandomInstance() {
- if (RANDOM_GENERATOR == null) {
- synchronized (Utils.class) {
- if (RANDOM_GENERATOR == null) {
- RANDOM_GENERATOR = new Random(SEED);
- System.out.printf("For random generator using seed: %d%n", SEED);
- System.out.printf("To re-run test with same seed value please add \"-D%s=%d\" to command line.%n", SEED_PROPERTY_NAME, SEED);
- }
- }
- }
- return RANDOM_GENERATOR;
- }
-
- /**
- * Returns random element of non empty collection
- *
- * @param <T> a type of collection element
- * @param collection collection of elements
- * @return random element of collection
- * @throws IllegalArgumentException if collection is empty
- */
- public static <T> T getRandomElement(Collection<T> collection)
- throws IllegalArgumentException {
- if (collection.isEmpty()) {
- throw new IllegalArgumentException("Empty collection");
- }
- Random random = getRandomInstance();
- int elementIndex = 1 + random.nextInt(collection.size() - 1);
- Iterator<T> iterator = collection.iterator();
- while (--elementIndex != 0) {
- iterator.next();
- }
- return iterator.next();
- }
-
- /**
- * Returns random element of non empty array
- *
- * @param <T> a type of array element
- * @param array array of elements
- * @return random element of array
- * @throws IllegalArgumentException if array is empty
- */
- public static <T> T getRandomElement(T[] array)
- throws IllegalArgumentException {
- if (array == null || array.length == 0) {
- throw new IllegalArgumentException("Empty or null array");
- }
- Random random = getRandomInstance();
- return array[random.nextInt(array.length)];
- }
-
- /**
- * Wait for condition to be true
- *
- * @param condition, a condition to wait for
- */
- public static final void waitForCondition(BooleanSupplier condition) {
- waitForCondition(condition, -1L, 100L);
- }
-
- /**
- * Wait until timeout for condition to be true
- *
- * @param condition, a condition to wait for
- * @param timeout a time in milliseconds to wait for condition to be true
- * specifying -1 will wait forever
- * @return condition value, to determine if wait was successful
- */
- public static final boolean waitForCondition(BooleanSupplier condition,
- long timeout) {
- return waitForCondition(condition, timeout, 100L);
- }
-
- /**
- * Wait until timeout for condition to be true for specified time
- *
- * @param condition, a condition to wait for
- * @param timeout a time in milliseconds to wait for condition to be true,
- * specifying -1 will wait forever
- * @param sleepTime a time to sleep value in milliseconds
- * @return condition value, to determine if wait was successful
- */
- public static final boolean waitForCondition(BooleanSupplier condition,
- long timeout, long sleepTime) {
- long startTime = System.currentTimeMillis();
- while (!(condition.getAsBoolean() || (timeout != -1L
- && ((System.currentTimeMillis() - startTime) > timeout)))) {
- try {
- Thread.sleep(sleepTime);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new Error(e);
- }
- }
- return condition.getAsBoolean();
- }
-
- /**
- * Adjusts the provided timeout value for the TIMEOUT_FACTOR
- * @param tOut the timeout value to be adjusted
- * @return The timeout value adjusted for the value of "test.timeout.factor"
- * system property
- */
- public static long adjustTimeout(long tOut) {
- return Math.round(tOut * Utils.TIMEOUT_FACTOR);
- }
-
- /**
- * Ensures a requested class is loaded
- * @param aClass class to load
- */
- public static void ensureClassIsLoaded(Class<?> aClass) {
- if (aClass == null) {
- throw new Error("Requested null class");
- }
- try {
- Class.forName(aClass.getName(), /* initialize = */ true,
- ClassLoader.getSystemClassLoader());
- } catch (ClassNotFoundException e) {
- throw new Error("Class not found", e);
- }
- }
- /**
- * @param parent a class loader to be the parent for the returned one
- * @return an UrlClassLoader with urls made of the 'test.class.path' jtreg
- * property and with the given parent
- */
- public static URLClassLoader getTestClassPathURLClassLoader(ClassLoader parent) {
- URL[] urls = Arrays.stream(TEST_CLASS_PATH.split(File.pathSeparator))
- .map(Paths::get)
- .map(Path::toUri)
- .map(x -> {
- try {
- return x.toURL();
- } catch (MalformedURLException ex) {
- throw new Error("Test issue. JTREG property"
- + " 'test.class.path'"
- + " is not defined correctly", ex);
- }
- }).toArray(URL[]::new);
- return new URLClassLoader(urls, parent);
- }
-
- /**
- * Runs runnable and checks that it throws expected exception. If exceptionException is null it means
- * that we expect no exception to be thrown.
- * @param runnable what we run
- * @param expectedException expected exception
- */
- public static void runAndCheckException(Runnable runnable, Class<? extends Throwable> expectedException) {
- runAndCheckException(runnable, t -> {
- if (t == null) {
- if (expectedException != null) {
- throw new AssertionError("Didn't get expected exception " + expectedException.getSimpleName());
- }
- } else {
- String message = "Got unexpected exception " + t.getClass().getSimpleName();
- if (expectedException == null) {
- throw new AssertionError(message, t);
- } else if (!expectedException.isAssignableFrom(t.getClass())) {
- message += " instead of " + expectedException.getSimpleName();
- throw new AssertionError(message, t);
- }
- }
- });
- }
-
- /**
- * Runs runnable and makes some checks to ensure that it throws expected exception.
- * @param runnable what we run
- * @param checkException a consumer which checks that we got expected exception and raises a new exception otherwise
- */
- public static void runAndCheckException(Runnable runnable, Consumer<Throwable> checkException) {
- try {
- runnable.run();
- checkException.accept(null);
- } catch (Throwable t) {
- checkException.accept(t);
- }
- }
-
- /**
- * Converts to VM type signature
- *
- * @param type Java type to convert
- * @return string representation of VM type
- */
- public static String toJVMTypeSignature(Class<?> type) {
- if (type.isPrimitive()) {
- if (type == boolean.class) {
- return "Z";
- } else if (type == byte.class) {
- return "B";
- } else if (type == char.class) {
- return "C";
- } else if (type == double.class) {
- return "D";
- } else if (type == float.class) {
- return "F";
- } else if (type == int.class) {
- return "I";
- } else if (type == long.class) {
- return "J";
- } else if (type == short.class) {
- return "S";
- } else if (type == void.class) {
- return "V";
- } else {
- throw new Error("Unsupported type: " + type);
- }
- }
- String result = type.getName().replaceAll("\\.", "/");
- if (!type.isArray()) {
- return "L" + result + ";";
- }
- return result;
- }
-
- public static Object[] getNullValues(Class<?>... types) {
- Object[] result = new Object[types.length];
- int i = 0;
- for (Class<?> type : types) {
- result[i++] = NULL_VALUES.get(type);
- }
- return result;
- }
- private static Map<Class<?>, Object> NULL_VALUES = new HashMap<>();
- static {
- NULL_VALUES.put(boolean.class, false);
- NULL_VALUES.put(byte.class, (byte) 0);
- NULL_VALUES.put(short.class, (short) 0);
- NULL_VALUES.put(char.class, '\0');
- NULL_VALUES.put(int.class, 0);
- NULL_VALUES.put(long.class, 0L);
- NULL_VALUES.put(float.class, 0.0f);
- NULL_VALUES.put(double.class, 0.0d);
- }
-
- /**
- * Returns mandatory property value
- * @param propName is a name of property to request
- * @return a String with requested property value
- */
- public static String getMandatoryProperty(String propName) {
- Objects.requireNonNull(propName, "Requested null property");
- String prop = System.getProperty(propName);
- Objects.requireNonNull(prop,
- String.format("A mandatory property '%s' isn't set", propName));
- return prop;
- }
-}
-
--- a/hotspot/test/testlibrary/jdk/test/lib/cli/CPUSpecificCommandLineOptionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-package jdk.test.lib.cli;
-
-import jdk.test.lib.cli.predicate.CPUSpecificPredicate;
-
-/**
- * Base class for command line options tests that
- * requires specific CPU arch or specific CPU features.
- */
-public abstract class CPUSpecificCommandLineOptionTest
- extends CommandLineOptionTest {
- /**
- * Creates new CPU specific test instance that does not
- * require any CPU features.
- *
- * @param cpuArchPattern Regular expression that should
- * match os.arch.
- */
- public CPUSpecificCommandLineOptionTest(String cpuArchPattern) {
- this(cpuArchPattern, null, null);
- }
-
- /**
- * Creates new CPU specific test instance that does not
- * require from CPU support of {@code supportedCPUFeatures} features
- * and no support of {@code unsupportedCPUFeatures}.
- *
- * @param cpuArchPattern Regular expression that should
- * match os.arch.
- * @param supportedCPUFeatures Array with names of features that
- * should be supported by CPU. If {@code null},
- * then no features have to be supported.
- * @param unsupportedCPUFeatures Array with names of features that
- * should not be supported by CPU.
- * If {@code null}, then CPU may support any
- * features.
- */
- public CPUSpecificCommandLineOptionTest(String cpuArchPattern,
- String supportedCPUFeatures[], String unsupportedCPUFeatures[]) {
- super(new CPUSpecificPredicate(cpuArchPattern, supportedCPUFeatures,
- unsupportedCPUFeatures));
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/cli/CommandLineOptionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,520 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-package jdk.test.lib.cli;
-
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.function.BooleanSupplier;
-
-import jdk.test.lib.*;
-
-/**
- * Base class for command line option tests.
- */
-public abstract class CommandLineOptionTest {
- public static final String UNLOCK_DIAGNOSTIC_VM_OPTIONS
- = "-XX:+UnlockDiagnosticVMOptions";
- public static final String UNLOCK_EXPERIMENTAL_VM_OPTIONS
- = "-XX:+UnlockExperimentalVMOptions";
- protected static final String UNRECOGNIZED_OPTION_ERROR_FORMAT
- = "Unrecognized VM option '[+-]?%s(=.*)?'";
- protected static final String EXPERIMENTAL_OPTION_ERROR_FORMAT
- = "VM option '%s' is experimental and must be enabled via "
- + "-XX:\\+UnlockExperimentalVMOptions.";
- protected static final String DIAGNOSTIC_OPTION_ERROR_FORMAT
- = " VM option '%s' is diagnostic and must be enabled via "
- + "-XX:\\+UnlockDiagnosticVMOptions.";
- private static final String PRINT_FLAGS_FINAL_FORMAT = "%s\\s*:?=\\s*%s";
-
- /**
- * Verifies that JVM startup behavior matches our expectations.
- *
- * @param option an option that should be passed to JVM
- * @param expectedMessages an array of patterns that should occur
- * in JVM output. If {@code null} then
- * JVM output could be empty.
- * @param unexpectedMessages an array of patterns that should not
- * occur in JVM output. If {@code null} then
- * JVM output could be empty.
- * @param exitErrorMessage message that will be shown if exit code is not
- * as expected.
- * @param wrongWarningMessage message that will be shown if warning
- * messages are not as expected.
- * @param exitCode expected exit code.
- * @throws Throwable if verification fails or some other issues occur.
- */
- public static void verifyJVMStartup(String option,
- String expectedMessages[], String unexpectedMessages[],
- String exitErrorMessage, String wrongWarningMessage,
- ExitCode exitCode) throws Throwable {
- CommandLineOptionTest.verifyJVMStartup(expectedMessages,
- unexpectedMessages, exitErrorMessage,
- wrongWarningMessage, exitCode, false, option);
- }
-
- /**
- * Verifies that JVM startup behavior matches our expectations.
- *
- * @param expectedMessages an array of patterns that should occur
- * in JVM output. If {@code null} then
- * JVM output could be empty.
- * @param unexpectedMessages an array of patterns that should not
- * occur in JVM output. If {@code null} then
- * JVM output could be empty.
- * @param exitErrorMessage message that will be shown if exit code is not
- * as expected.
- * @param wrongWarningMessage message that will be shown if warning
- * messages are not as expected.
- * @param exitCode expected exit code.
- * @param addTestVMOptions if {@code true} then test VM options will be
- * passed to VM.
- * @param options options that should be passed to VM in addition to mode
- * flag.
- * @throws Throwable if verification fails or some other issues occur.
- */
- public static void verifyJVMStartup(String expectedMessages[],
- String unexpectedMessages[], String exitErrorMessage,
- String wrongWarningMessage, ExitCode exitCode,
- boolean addTestVMOptions, String... options)
- throws Throwable {
- List<String> finalOptions = new ArrayList<>();
- if (addTestVMOptions) {
- Collections.addAll(finalOptions, ProcessTools.getVmInputArgs());
- Collections.addAll(finalOptions, Utils.getTestJavaOpts());
- }
- Collections.addAll(finalOptions, options);
- finalOptions.add("-version");
-
- ProcessBuilder processBuilder
- = ProcessTools.createJavaProcessBuilder(finalOptions.toArray(
- new String[finalOptions.size()]));
- OutputAnalyzer outputAnalyzer
- = new OutputAnalyzer(processBuilder.start());
-
- try {
- outputAnalyzer.shouldHaveExitValue(exitCode.value);
- } catch (RuntimeException e) {
- String errorMessage = String.format(
- "JVM process should have exit value '%d'.%n%s",
- exitCode.value, exitErrorMessage);
- throw new AssertionError(errorMessage, e);
- }
-
- verifyOutput(expectedMessages, unexpectedMessages,
- wrongWarningMessage, outputAnalyzer);
- }
-
- /**
- * Verifies that JVM startup behavior matches our expectations.
- *
- * @param expectedMessages an array of patterns that should occur in JVM
- * output. If {@code null} then
- * JVM output could be empty.
- * @param unexpectedMessages an array of patterns that should not occur
- * in JVM output. If {@code null} then
- * JVM output could be empty.
- * @param wrongWarningMessage message that will be shown if messages are
- * not as expected.
- * @param outputAnalyzer OutputAnalyzer instance
- * @throws AssertionError if verification fails.
- */
- public static void verifyOutput(String[] expectedMessages,
- String[] unexpectedMessages, String wrongWarningMessage,
- OutputAnalyzer outputAnalyzer) {
- if (expectedMessages != null) {
- for (String expectedMessage : expectedMessages) {
- try {
- outputAnalyzer.shouldMatch(expectedMessage);
- } catch (RuntimeException e) {
- String errorMessage = String.format(
- "Expected message not found: '%s'.%n%s",
- expectedMessage, wrongWarningMessage);
- throw new AssertionError(errorMessage, e);
- }
- }
- }
-
- if (unexpectedMessages != null) {
- for (String unexpectedMessage : unexpectedMessages) {
- try {
- outputAnalyzer.shouldNotMatch(unexpectedMessage);
- } catch (RuntimeException e) {
- String errorMessage = String.format(
- "Unexpected message found: '%s'.%n%s",
- unexpectedMessage, wrongWarningMessage);
- throw new AssertionError(errorMessage, e);
- }
- }
- }
- }
-
- /**
- * Verifies that JVM startup behavior matches our expectations when type
- * of newly started VM is the same as the type of current.
- *
- * @param expectedMessages an array of patterns that should occur
- * in JVM output. If {@code null} then
- * JVM output could be empty.
- * @param unexpectedMessages an array of patterns that should not
- * occur in JVM output. If {@code null} then
- * JVM output could be empty.
- * @param exitErrorMessage Message that will be shown if exit value is not
- * as expected.
- * @param wrongWarningMessage message that will be shown if warning
- * messages are not as expected.
- * @param exitCode expected exit code.
- * @param options options that should be passed to VM in addition to mode
- * flag.
- * @throws Throwable if verification fails or some other issues occur.
- */
- public static void verifySameJVMStartup(String expectedMessages[],
- String unexpectedMessages[], String exitErrorMessage,
- String wrongWarningMessage, ExitCode exitCode, String... options)
- throws Throwable {
- List<String> finalOptions = new ArrayList<>();
- finalOptions.add(CommandLineOptionTest.getVMTypeOption());
- Collections.addAll(finalOptions, options);
-
- CommandLineOptionTest.verifyJVMStartup(expectedMessages,
- unexpectedMessages, exitErrorMessage,
- wrongWarningMessage, exitCode, false,
- finalOptions.toArray(new String[finalOptions.size()]));
- }
-
- /**
- * Verifies that value of specified JVM option is the same as
- * expected value.
- * This method filter out option with {@code optionName}
- * name from test java options.
- *
- * @param optionName a name of tested option.
- * @param expectedValue expected value of tested option.
- * @param optionErrorString message will be shown if option value is not as
- * expected.
- * @param additionalVMOpts additional options that should be
- * passed to JVM.
- * @throws Throwable if verification fails or some other issues occur.
- */
- public static void verifyOptionValue(String optionName,
- String expectedValue, String optionErrorString,
- String... additionalVMOpts) throws Throwable {
- verifyOptionValue(optionName, expectedValue, optionErrorString,
- true, additionalVMOpts);
- }
-
- /**
- * Verifies that value of specified JVM option is the same as
- * expected value.
- * This method filter out option with {@code optionName}
- * name from test java options.
- *
- * @param optionName a name of tested option.
- * @param expectedValue expected value of tested option.
- * @param addTestVmOptions if {@code true}, then test VM options
- * will be used.
- * @param optionErrorString message will be shown if option value is not as
- * expected.
- * @param additionalVMOpts additional options that should be
- * passed to JVM.
- * @throws Throwable if verification fails or some other issues
- * occur.
- */
- public static void verifyOptionValue(String optionName,
- String expectedValue, String optionErrorString,
- boolean addTestVmOptions, String... additionalVMOpts)
- throws Throwable {
- List<String> vmOpts = new ArrayList<>();
-
- if (addTestVmOptions) {
- Collections.addAll(vmOpts,
- Utils.getFilteredTestJavaOpts(optionName));
- }
- Collections.addAll(vmOpts, additionalVMOpts);
- Collections.addAll(vmOpts, "-XX:+PrintFlagsFinal", "-version");
-
- ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(
- vmOpts.toArray(new String[vmOpts.size()]));
-
- OutputAnalyzer outputAnalyzer
- = new OutputAnalyzer(processBuilder.start());
-
- try {
- outputAnalyzer.shouldHaveExitValue(0);
- } catch (RuntimeException e) {
- String errorMessage = String.format(
- "JVM should start with option '%s' without errors.",
- optionName);
- throw new AssertionError(errorMessage, e);
- }
- verifyOptionValue(optionName, expectedValue, optionErrorString,
- outputAnalyzer);
- }
-
- /**
- * Verifies that value of specified JVM option is the same as
- * expected value.
- *
- * @param optionName a name of tested option.
- * @param expectedValue expected value of tested option.
- * @param optionErrorString message will be shown if option value is not
- * as expected.
- * @param outputAnalyzer OutputAnalyzer instance
- * @throws AssertionError if verification fails
- */
- public static void verifyOptionValue(String optionName,
- String expectedValue, String optionErrorString,
- OutputAnalyzer outputAnalyzer) {
- try {
- outputAnalyzer.shouldMatch(String.format(
- CommandLineOptionTest.PRINT_FLAGS_FINAL_FORMAT,
- optionName, expectedValue));
- } catch (RuntimeException e) {
- String errorMessage = String.format(
- "Option '%s' is expected to have '%s' value%n%s",
- optionName, expectedValue,
- optionErrorString);
- throw new AssertionError(errorMessage, e);
- }
- }
-
- /**
- * Start VM with given options and values.
- * Generates command line option flags from
- * {@code optionNames} and {@code optionValues}.
- *
- * @param optionNames names of options to pass in
- * @param optionValues values of option
- * @param additionalVMOpts additional options that should be
- * passed to JVM.
- * @return output from vm process
- */
- public static OutputAnalyzer startVMWithOptions(String[] optionNames,
- String[] optionValues,
- String... additionalVMOpts) throws Throwable {
- List<String> vmOpts = new ArrayList<>();
- if (optionNames == null || optionValues == null || optionNames.length != optionValues.length) {
- throw new IllegalArgumentException("optionNames and/or optionValues");
- }
-
- for (int i = 0; i < optionNames.length; i++) {
- vmOpts.add(prepareFlag(optionNames[i], optionValues[i]));
- }
- Collections.addAll(vmOpts, additionalVMOpts);
- Collections.addAll(vmOpts, "-version");
-
- ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(
- vmOpts.toArray(new String[vmOpts.size()]));
-
- return new OutputAnalyzer(processBuilder.start());
- }
-
- /**
- * Verifies from the output that values of specified JVM options were the same as
- * expected values.
- *
- * @param outputAnalyzer search output for expect options and values.
- * @param optionNames names of tested options.
- * @param expectedValues expected values of tested options.
- * @throws Throwable if verification fails or some other issues occur.
- */
- public static void verifyOptionValuesFromOutput(OutputAnalyzer outputAnalyzer,
- String[] optionNames,
- String[] expectedValues) throws Throwable {
- outputAnalyzer.shouldHaveExitValue(0);
- for (int i = 0; i < optionNames.length; i++) {
- outputAnalyzer.shouldMatch(String.format(
- CommandLineOptionTest.PRINT_FLAGS_FINAL_FORMAT,
- optionNames[i], expectedValues[i]));
- }
- }
-
- /**
- * Verifies that value of specified JVM options are the same as
- * expected values.
- * Generates command line option flags from
- * {@code optionNames} and {@code expectedValues}.
- *
- * @param optionNames names of tested options.
- * @param expectedValues expected values of tested options.
- * @throws Throwable if verification fails or some other issues occur.
- */
- public static void verifyOptionValues(String[] optionNames,
- String[] expectedValues) throws Throwable {
- OutputAnalyzer outputAnalyzer = startVMWithOptions(optionNames, expectedValues, "-XX:+PrintFlagsFinal");
- verifyOptionValuesFromOutput(outputAnalyzer, optionNames, expectedValues);
- }
-
- /**
- * Verifies that value of specified JVM when type of newly started VM
- * is the same as the type of current.
- * This method filter out option with {@code optionName}
- * name from test java options.
- * Only mode flag will be passed to VM in addition to
- * {@code additionalVMOpts}
- *
- * @param optionName name of tested option.
- * @param expectedValue expected value of tested option.
- * @param optionErrorString message to show if option has another value
- * @param additionalVMOpts additional options that should be
- * passed to JVM.
- * @throws Throwable if verification fails or some other issues occur.
- */
- public static void verifyOptionValueForSameVM(String optionName,
- String expectedValue, String optionErrorString,
- String... additionalVMOpts) throws Throwable {
- List<String> finalOptions = new ArrayList<>();
- finalOptions.add(CommandLineOptionTest.getVMTypeOption());
- Collections.addAll(finalOptions, additionalVMOpts);
-
- CommandLineOptionTest.verifyOptionValue(optionName, expectedValue,
- optionErrorString, false,
- finalOptions.toArray(new String[finalOptions.size()]));
- }
-
- /**
- * Prepares boolean command line flag with name {@code name} according
- * to it's {@code value}.
- *
- * @param name the name of option to be prepared
- * @param value the value of option
- * @return prepared command line flag
- */
- public static String prepareBooleanFlag(String name, boolean value) {
- return String.format("-XX:%c%s", (value ? '+' : '-'), name);
- }
-
- /**
- * Prepares numeric command line flag with name {@code name} by setting
- * it's value to {@code value}.
- *
- * @param name the name of option to be prepared
- * @param value the value of option
- * @return prepared command line flag
- */
- public static String prepareNumericFlag(String name, Number value) {
- return String.format("-XX:%s=%s", name, value.toString());
- }
-
- /**
- * Prepares generic command line flag with name {@code name} by setting
- * it's value to {@code value}.
- *
- * @param name the name of option to be prepared
- * @param value the value of option ("+" or "-" can be used instead of "true" or "false")
- * @return prepared command line flag
- */
- public static String prepareFlag(String name, String value) {
- if (value.equals("+") || value.equalsIgnoreCase("true")) {
- return "-XX:+" + name;
- } else if (value.equals("-") || value.equalsIgnoreCase("false")) {
- return "-XX:-" + name;
- } else {
- return "-XX:" + name + "=" + value;
- }
- }
-
- /**
- * Returns message that should occur in VM output if option
- * {@code optionName} if unrecognized.
- *
- * @param optionName the name of option for which message should be returned
- * @return message saying that option {@code optionName} is unrecognized
- */
- public static String getUnrecognizedOptionErrorMessage(String optionName) {
- return String.format(
- CommandLineOptionTest.UNRECOGNIZED_OPTION_ERROR_FORMAT,
- optionName);
- }
-
- /**
- * Returns message that should occur in VM output if option
- * {@code optionName} is experimental and
- * -XX:+UnlockExperimentalVMOptions was not passed to VM.
- *
- * @param optionName the name of option for which message should be returned
- * @return message saying that option {@code optionName} is experimental
- */
- public static String getExperimentalOptionErrorMessage(String optionName) {
- return String.format(
- CommandLineOptionTest.EXPERIMENTAL_OPTION_ERROR_FORMAT,
- optionName);
- }
-
- /**
- * Returns message that should occur in VM output if option
- * {@code optionName} is diagnostic and -XX:+UnlockDiagnosticVMOptions
- * was not passed to VM.
- *
- * @param optionName the name of option for which message should be returned
- * @return message saying that option {@code optionName} is diganostic
- */
- public static String getDiagnosticOptionErrorMessage(String optionName) {
- return String.format(
- CommandLineOptionTest.DIAGNOSTIC_OPTION_ERROR_FORMAT,
- optionName);
- }
-
- /**
- * @return option required to start a new VM with the same type as current.
- * @throws RuntimeException when VM type is unknown.
- */
- private static String getVMTypeOption() {
- if (Platform.isServer()) {
- return "-server";
- } else if (Platform.isClient()) {
- return "-client";
- } else if (Platform.isMinimal()) {
- return "-minimal";
- } else if (Platform.isGraal()) {
- return "-graal";
- }
- throw new RuntimeException("Unknown VM mode.");
- }
-
- private final BooleanSupplier predicate;
-
- /**
- * Constructs new CommandLineOptionTest that will be executed only if
- * predicate {@code predicate} return {@code true}.
- * @param predicate a predicate responsible for test's preconditions check.
- */
- public CommandLineOptionTest(BooleanSupplier predicate) {
- this.predicate = predicate;
- }
-
- /**
- * Runs command line option test.
- */
- public final void test() throws Throwable {
- if (predicate.getAsBoolean()) {
- runTestCases();
- }
- }
-
- /**
- * @throws Throwable if some issue happened during test cases execution.
- */
- protected abstract void runTestCases() throws Throwable;
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/cli/predicate/AndPredicate.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-package jdk.test.lib.cli.predicate;
-
-import java.util.function.BooleanSupplier;
-
-public class AndPredicate implements BooleanSupplier {
- private final BooleanSupplier a;
- private final BooleanSupplier b;
-
- public AndPredicate(BooleanSupplier a, BooleanSupplier b) {
- this.a = a;
- this.b = b;
- }
-
- @Override
- public boolean getAsBoolean() {
- return a.getAsBoolean() && b.getAsBoolean();
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/cli/predicate/CPUSpecificPredicate.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-
-package jdk.test.lib.cli.predicate;
-
-import jdk.test.lib.Platform;
-import sun.hotspot.cpuinfo.CPUInfo;
-
-import java.util.function.BooleanSupplier;
-
-public class CPUSpecificPredicate implements BooleanSupplier {
- private final String cpuArchPattern;
- private final String supportedCPUFeatures[];
- private final String unsupportedCPUFeatures[];
-
- public CPUSpecificPredicate(String cpuArchPattern,
- String supportedCPUFeatures[],
- String unsupportedCPUFeatures[]) {
- this.cpuArchPattern = cpuArchPattern;
- this.supportedCPUFeatures = supportedCPUFeatures;
- this.unsupportedCPUFeatures = unsupportedCPUFeatures;
- }
-
- @Override
- public boolean getAsBoolean() {
- if (!Platform.getOsArch().matches(cpuArchPattern)) {
- System.out.println("CPU arch " + Platform.getOsArch() + " does not match " + cpuArchPattern);
- return false;
- }
-
- if (supportedCPUFeatures != null) {
- for (String feature : supportedCPUFeatures) {
- if (!CPUInfo.hasFeature(feature)) {
- System.out.println("CPU does not support " + feature
- + " feature");
- return false;
- }
- }
- }
-
- if (unsupportedCPUFeatures != null) {
- for (String feature : unsupportedCPUFeatures) {
- if (CPUInfo.hasFeature(feature)) {
- System.out.println("CPU support " + feature + " feature");
- return false;
- }
- }
- }
- return true;
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/cli/predicate/NotPredicate.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- *
- */
-
-package jdk.test.lib.cli.predicate;
-
-import java.util.function.BooleanSupplier;
-
-public class NotPredicate implements BooleanSupplier {
- private final BooleanSupplier s;
-
- public NotPredicate(BooleanSupplier s) {
- this.s = s;
- }
-
- @Override
- public boolean getAsBoolean() {
- return !s.getAsBoolean();
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/cli/predicate/OrPredicate.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- *
- */
-
-package jdk.test.lib.cli.predicate;
-
-import java.util.function.BooleanSupplier;
-
-public class OrPredicate implements BooleanSupplier {
- private final BooleanSupplier a;
- private final BooleanSupplier b;
-
- public OrPredicate(BooleanSupplier a, BooleanSupplier b) {
- this.a = a;
- this.b = b;
- }
-
- @Override
- public boolean getAsBoolean() {
- return a.getAsBoolean() || b.getAsBoolean();
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/dcmd/CommandExecutor.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib.dcmd;
-
-import jdk.test.lib.OutputAnalyzer;
-
-/**
- * Abstract base class for Diagnostic Command executors
- */
-public abstract class CommandExecutor {
-
- /**
- * Execute a diagnostic command
- *
- * @param cmd The diagnostic command to execute
- * @return an {@link jdk.testlibrary.OutputAnalyzer} encapsulating the output of the command
- * @throws CommandExecutorException if there is an exception on the "calling side" while trying to execute the
- * Diagnostic Command. Exceptions thrown on the remote side are available as textual representations in
- * stderr, regardless of the specific executor used.
- */
- public final OutputAnalyzer execute(String cmd) throws CommandExecutorException {
- return execute(cmd, false);
- }
-
- /**
- * Execute a diagnostic command
- *
- * @param cmd The diagnostic command to execute
- * @param silent Do not print the command output
- * @return an {@link jdk.testlibrary.OutputAnalyzer} encapsulating the output of the command
- * @throws CommandExecutorException if there is an exception on the "calling side" while trying to execute the
- * Diagnostic Command. Exceptions thrown on the remote side are available as textual representations in
- * stderr, regardless of the specific executor used.
- */
- public final OutputAnalyzer execute(String cmd, boolean silent) throws CommandExecutorException {
- if (!silent) {
- System.out.printf("Running DCMD '%s' through '%s'%n", cmd, this.getClass().getSimpleName());
- }
-
- OutputAnalyzer oa = executeImpl(cmd);
-
- if (!silent) {
- System.out.println("---------------- stdout ----------------");
- System.out.println(oa.getStdout());
- System.out.println("---------------- stderr ----------------");
- System.out.println(oa.getStderr());
- System.out.println("----------------------------------------");
- System.out.println();
- }
- return oa;
- }
-
- protected abstract OutputAnalyzer executeImpl(String cmd) throws CommandExecutorException;
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/dcmd/CommandExecutorException.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib.dcmd;
-
-/**
- * CommandExecutorException encapsulates exceptions thrown (on the "calling side") from the execution of Diagnostic
- * Commands
- */
-public class CommandExecutorException extends RuntimeException {
- private static final long serialVersionUID = -7039597746579144280L;
-
- public CommandExecutorException(String message, Throwable e) {
- super(message, e);
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/dcmd/FileJcmdExecutor.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib.dcmd;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Executes Diagnostic Commands on the target VM (specified by pid) using the jcmd tool and its ability to read
- * Diagnostic Commands from a file.
- */
-public class FileJcmdExecutor extends PidJcmdExecutor {
-
- /**
- * Instantiates a new FileJcmdExecutor targeting the current VM
- */
- public FileJcmdExecutor() {
- super();
- }
-
- /**
- * Instantiates a new FileJcmdExecutor targeting the VM indicated by the given pid
- *
- * @param target Pid of the target VM
- */
- public FileJcmdExecutor(String target) {
- super(target);
- }
-
- protected List<String> createCommandLine(String cmd) throws CommandExecutorException {
- File cmdFile = createTempFile();
- writeCommandToTemporaryFile(cmd, cmdFile);
-
- return Arrays.asList(jcmdBinary, Long.toString(pid),
- "-f", cmdFile.getAbsolutePath());
- }
-
- private void writeCommandToTemporaryFile(String cmd, File cmdFile) {
- try (PrintWriter pw = new PrintWriter(cmdFile)) {
- pw.println(cmd);
- } catch (IOException e) {
- String message = "Could not write to file: " + cmdFile.getAbsolutePath();
- throw new CommandExecutorException(message, e);
- }
- }
-
- private File createTempFile() {
- try {
- File cmdFile = File.createTempFile("input", "jcmd");
- cmdFile.deleteOnExit();
- return cmdFile;
- } catch (IOException e) {
- throw new CommandExecutorException("Could not create temporary file", e);
- }
- }
-
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/dcmd/JMXExecutor.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,187 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib.dcmd;
-
-import jdk.test.lib.OutputAnalyzer;
-
-import javax.management.*;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import java.lang.management.ManagementFactory;
-
-import java.util.HashMap;
-
-/**
- * Executes Diagnostic Commands on the target VM (specified by a host/port combination or a full JMX Service URL) using
- * the JMX interface. If the target is not the current VM, the JMX Remote interface must be enabled beforehand.
- */
-public class JMXExecutor extends CommandExecutor {
-
- private final MBeanServerConnection mbs;
-
- /**
- * Instantiates a new JMXExecutor targeting the current VM
- */
- public JMXExecutor() {
- super();
- mbs = ManagementFactory.getPlatformMBeanServer();
- }
-
- /**
- * Instantiates a new JMXExecutor targeting the VM indicated by the given host/port combination or a full JMX
- * Service URL
- *
- * @param target a host/port combination on the format "host:port" or a full JMX Service URL of the target VM
- */
- public JMXExecutor(String target) {
- String urlStr;
-
- if (target.matches("^\\w[\\w\\-]*(\\.[\\w\\-]+)*:\\d+$")) {
- /* Matches "hostname:port" */
- urlStr = String.format("service:jmx:rmi:///jndi/rmi://%s/jmxrmi", target);
- } else if (target.startsWith("service:")) {
- urlStr = target;
- } else {
- throw new IllegalArgumentException("Could not recognize target string: " + target);
- }
-
- try {
- JMXServiceURL url = new JMXServiceURL(urlStr);
- JMXConnector c = JMXConnectorFactory.connect(url, new HashMap<>());
- mbs = c.getMBeanServerConnection();
- } catch (IOException e) {
- throw new CommandExecutorException("Could not initiate connection to target: " + target, e);
- }
- }
-
- protected OutputAnalyzer executeImpl(String cmd) throws CommandExecutorException {
- String stdout = "";
- String stderr = "";
-
- String[] cmdParts = cmd.split(" ", 2);
- String operation = commandToMethodName(cmdParts[0]);
- Object[] dcmdArgs = produceArguments(cmdParts);
- String[] signature = {String[].class.getName()};
-
- ObjectName beanName = getMBeanName();
-
- try {
- stdout = (String) mbs.invoke(beanName, operation, dcmdArgs, signature);
- }
-
- /* Failures on the "local" side, the one invoking the command. */
- catch (ReflectionException e) {
- Throwable cause = e.getCause();
- if (cause instanceof NoSuchMethodException) {
- /* We want JMXExecutor to match the behavior of the other CommandExecutors */
- String message = "Unknown diagnostic command: " + operation;
- stderr = exceptionTraceAsString(new IllegalArgumentException(message, e));
- } else {
- rethrowExecutorException(operation, dcmdArgs, e);
- }
- }
-
- /* Failures on the "local" side, the one invoking the command. */
- catch (InstanceNotFoundException | IOException e) {
- rethrowExecutorException(operation, dcmdArgs, e);
- }
-
- /* Failures on the remote side, the one executing the invoked command. */
- catch (MBeanException e) {
- stdout = exceptionTraceAsString(e);
- }
-
- return new OutputAnalyzer(stdout, stderr);
- }
-
- private void rethrowExecutorException(String operation, Object[] dcmdArgs,
- Exception e) throws CommandExecutorException {
- String message = String.format("Could not invoke: %s %s", operation,
- String.join(" ", (String[]) dcmdArgs[0]));
- throw new CommandExecutorException(message, e);
- }
-
- private ObjectName getMBeanName() throws CommandExecutorException {
- String MBeanName = "com.sun.management:type=DiagnosticCommand";
-
- try {
- return new ObjectName(MBeanName);
- } catch (MalformedObjectNameException e) {
- String message = "MBean not found: " + MBeanName;
- throw new CommandExecutorException(message, e);
- }
- }
-
- private Object[] produceArguments(String[] cmdParts) {
- Object[] dcmdArgs = {new String[0]}; /* Default: No arguments */
-
- if (cmdParts.length == 2) {
- dcmdArgs[0] = cmdParts[1].split(" ");
- }
- return dcmdArgs;
- }
-
- /**
- * Convert from diagnostic command to MBean method name
- *
- * Examples:
- * help --> help
- * VM.version --> vmVersion
- * VM.command_line --> vmCommandLine
- */
- private static String commandToMethodName(String cmd) {
- String operation = "";
- boolean up = false; /* First letter is to be lower case */
-
- /*
- * If a '.' or '_' is encountered it is not copied,
- * instead the next character will be converted to upper case
- */
- for (char c : cmd.toCharArray()) {
- if (('.' == c) || ('_' == c)) {
- up = true;
- } else if (up) {
- operation = operation.concat(Character.toString(c).toUpperCase());
- up = false;
- } else {
- operation = operation.concat(Character.toString(c).toLowerCase());
- }
- }
-
- return operation;
- }
-
- private static String exceptionTraceAsString(Throwable cause) {
- StringWriter sw = new StringWriter();
- cause.printStackTrace(new PrintWriter(sw));
- return sw.toString();
- }
-
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/dcmd/JcmdExecutor.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib.dcmd;
-
-import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
-
-import java.util.List;
-
-/**
- * Base class for Diagnostic Command Executors using the jcmd tool
- */
-public abstract class JcmdExecutor extends CommandExecutor {
- protected String jcmdBinary;
-
- protected abstract List<String> createCommandLine(String cmd) throws CommandExecutorException;
-
- protected JcmdExecutor() {
- jcmdBinary = JDKToolFinder.getJDKTool("jcmd");
- }
-
- protected OutputAnalyzer executeImpl(String cmd) throws CommandExecutorException {
- List<String> commandLine = createCommandLine(cmd);
-
- try {
- System.out.printf("Executing command '%s'%n", commandLine);
- OutputAnalyzer output = ProcessTools.executeProcess(new ProcessBuilder(commandLine));
- System.out.printf("Command returned with exit code %d%n", output.getExitValue());
-
- return output;
- } catch (Exception e) {
- String message = String.format("Caught exception while executing '%s'", commandLine);
- throw new CommandExecutorException(message, e);
- }
- }
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/dcmd/MainClassJcmdExecutor.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib.dcmd;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Executes Diagnostic Commands on the target VM (specified by main class) using the jcmd tool
- */
-public class MainClassJcmdExecutor extends JcmdExecutor {
- private final String mainClass;
-
- /**
- * Instantiates a new MainClassJcmdExecutor targeting the current VM
- */
- public MainClassJcmdExecutor() {
- super();
- mainClass = System.getProperty("sun.java.command").split(" ")[0];
- }
-
- /**
- * Instantiates a new MainClassJcmdExecutor targeting the VM indicated by the given main class
- *
- * @param target Main class of the target VM
- */
- public MainClassJcmdExecutor(String target) {
- super();
- mainClass = target;
- }
-
- protected List<String> createCommandLine(String cmd) throws CommandExecutorException {
- return Arrays.asList(jcmdBinary, mainClass, cmd);
- }
-
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/dcmd/PidJcmdExecutor.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib.dcmd;
-
-import jdk.test.lib.ProcessTools;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Executes Diagnostic Commands on the target VM (specified by pid) using the jcmd tool
- */
-public class PidJcmdExecutor extends JcmdExecutor {
- protected final long pid;
-
- /**
- * Instantiates a new PidJcmdExecutor targeting the current VM
- */
- public PidJcmdExecutor() {
- super();
- try {
- pid = ProcessTools.getProcessId();
- } catch (Exception e) {
- throw new CommandExecutorException("Could not determine own pid", e);
- }
- }
-
- /**
- * Instantiates a new PidJcmdExecutor targeting the VM indicated by the given pid
- *
- * @param target Pid of the target VM
- */
- public PidJcmdExecutor(String target) {
- super();
- pid = Long.valueOf(target);
- }
-
- protected List<String> createCommandLine(String cmd) throws CommandExecutorException {
- return Arrays.asList(jcmdBinary, Long.toString(pid), cmd);
- }
-
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/dtrace/DtraceResultsAnalyzer.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-package jdk.test.lib.dtrace;
-
-import jdk.test.lib.OutputAnalyzer;
-
-public interface DtraceResultsAnalyzer {
- public void analyze(OutputAnalyzer oa, String logFilePath);
-}
--- a/hotspot/test/testlibrary/jdk/test/lib/dtrace/DtraceRunner.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2014, 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.
- */
-package jdk.test.lib.dtrace;
-
-import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class DtraceRunner {
-
- private static final String DTRACE_DEFAULT_PATH = "/usr/sbin/dtrace";
- private static final String DTRACE_PATH_PROPERTY
- = "com.oracle.test.dtrace.path";
- private static final String OUTPUT_FILE_DTRACE_OPTION = "o";
- private static final String RUN_COMMAND_DTRACE_OPTION = "c";
- private static final String RUN_SCRIPT_DTRACE_OPTION = "s";
- private static final String ALLOW_ZERO_PROBE_DESCRIPTION_DTRACE_OPTION = "Z";
- private static final String DTRACE_OPTION_PREFIX = "-";
- public static final String PERMIT_DESTRUCTIVE_ACTIONS_DTRACE_OPTION = "w";
- public static final String DTRACE_OUT_LOG = "dtrace.out";
-
- private final String dtraceExecutable;
-
- public DtraceRunner() {
- dtraceExecutable = getDtracePath();
- }
-
- private List<String> getLaunchCmd(String java, String javaOpts,
- String execClass, String testArgs, String dtraceScript,
- String dtraceAddOpts) {
- Asserts.assertTrue(!java.matches("\\s"), "Current dtrace implementation"
- + " can't handle whitespaces in application path");
- List<String> result = new ArrayList<>();
- result.add(dtraceExecutable);
- result.add(DTRACE_OPTION_PREFIX + System.getProperty("sun.arch.data.model"));
- result.add(DTRACE_OPTION_PREFIX
- + ALLOW_ZERO_PROBE_DESCRIPTION_DTRACE_OPTION
- + ((dtraceAddOpts == null) ? "" : dtraceAddOpts)
- + RUN_SCRIPT_DTRACE_OPTION); // run_script should be last one
- result.add(dtraceScript);
- result.add(DTRACE_OPTION_PREFIX + OUTPUT_FILE_DTRACE_OPTION);
- result.add(DTRACE_OUT_LOG);
- result.add(DTRACE_OPTION_PREFIX + RUN_COMMAND_DTRACE_OPTION);
- result.add(java + " " + javaOpts + " " + execClass + " " + testArgs);
- return result;
- }
-
- private void backupLogFile(File file) {
- if (file.exists()) {
- file.renameTo(new File(file.getPath() + ".bak"));
- }
- }
-
- public void runDtrace(String java, String javaOpts, String execClass,
- String testArgs, String dtraceScript, String dtraceAddOpts,
- DtraceResultsAnalyzer analyzer) {
- backupLogFile(new File(DTRACE_OUT_LOG));
- ProcessBuilder pbuilder = new ProcessBuilder(
- getLaunchCmd(java, javaOpts, execClass, testArgs,
- dtraceScript, dtraceAddOpts));
- OutputAnalyzer oa;
- try {
- oa = new OutputAnalyzer(pbuilder.start());
- } catch (IOException e) {
- throw new Error("TESTBUG: Can't start process", e);
- }
- analyzer.analyze(oa, DTRACE_OUT_LOG);
- }
-
- public static boolean dtraceAvailable() {
- String path = getDtracePath();
- if (path == null) {
- return false;
- }
- // now we'll launch dtrace to trace itself just to be sure it works
- // and have all additional previleges set
- ProcessBuilder pbuilder = new ProcessBuilder(path, path);
- try {
- OutputAnalyzer oa = new OutputAnalyzer(pbuilder.start());
- if (oa.getExitValue() != 0) {
- return false;
- }
- } catch (IOException e) {
- throw new Error("Couldn't launch dtrace", e);
- }
- return true;
- }
-
- private static String getDtracePath() {
- String propPath = System.getProperty(DTRACE_PATH_PROPERTY);
- if (propPath != null && new File(propPath).exists()) {
- return propPath;
- } else if (new File(DTRACE_DEFAULT_PATH).exists()) {
- return DTRACE_DEFAULT_PATH;
- }
- return null;
- }
-}
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/Automatic.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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 @@
package jdk.test.lib.jittester;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.factories.IRNodeBuilder;
import jdk.test.lib.jittester.types.TypeKlass;
import jdk.test.lib.jittester.utils.FixedTrees;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/AssignmentOperatorImplFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.BinaryOperator;
import jdk.test.lib.jittester.IRNode;
import jdk.test.lib.jittester.OperatorKind;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryArithmeticOperatorFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.BuiltInType;
import jdk.test.lib.jittester.OperatorKind;
import jdk.test.lib.jittester.ProductionFailedException;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryBitwiseOperatorFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.OperatorKind;
import jdk.test.lib.jittester.ProductionFailedException;
import jdk.test.lib.jittester.Type;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryComparisonOperatorFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.OperatorKind;
import jdk.test.lib.jittester.ProductionFailedException;
import jdk.test.lib.jittester.Type;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryEqualityOperatorFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.OperatorKind;
import jdk.test.lib.jittester.ProductionFailedException;
import jdk.test.lib.jittester.Type;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryLogicOperatorFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.BinaryOperator;
import jdk.test.lib.jittester.IRNode;
import jdk.test.lib.jittester.OperatorKind;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryOperatorFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.BinaryOperator;
import jdk.test.lib.jittester.IRNode;
import jdk.test.lib.jittester.OperatorKind;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryShiftOperatorFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.OperatorKind;
import jdk.test.lib.jittester.ProductionFailedException;
import jdk.test.lib.jittester.Type;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/BinaryStringPlusFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.OperatorKind;
import jdk.test.lib.jittester.ProductionFailedException;
import jdk.test.lib.jittester.Type;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundArithmeticAssignmentOperatorFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.BinaryOperator;
import jdk.test.lib.jittester.IRNode;
import jdk.test.lib.jittester.OperatorKind;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundBitwiseAssignmentOperatorFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.BinaryOperator;
import jdk.test.lib.jittester.IRNode;
import jdk.test.lib.jittester.OperatorKind;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/factories/CompoundShiftAssignmentOperatorFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
package jdk.test.lib.jittester.factories;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.BinaryOperator;
import jdk.test.lib.jittester.IRNode;
import jdk.test.lib.jittester.OperatorKind;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/jtreg/JitTesterDriver.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@
package jdk.test.lib.jittester.jtreg;
import jdk.test.lib.Asserts;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
import java.io.IOException;
import java.nio.file.Files;
--- a/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary/jittester/src/jdk/test/lib/jittester/visitors/ByteCodeVisitor.java Mon Sep 12 22:04:48 2016 +0000
@@ -39,7 +39,7 @@
import jdk.internal.org.objectweb.asm.Label;
import jdk.internal.org.objectweb.asm.MethodVisitor;
import jdk.internal.org.objectweb.asm.Opcodes;
-import jdk.test.lib.Pair;
+import jdk.test.lib.util.Pair;
import jdk.test.lib.jittester.BinaryOperator;
import jdk.test.lib.jittester.Block;
import jdk.test.lib.jittester.BuiltInType;
--- a/hotspot/test/testlibrary_tests/AssertsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/AssertsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
/* @test
* @summary Tests the different assertions in the Assert class
* @modules java.base/jdk.internal.misc
- * @library /testlibrary
+ * @library /test/lib
*/
public class AssertsTest {
private static class Foo implements Comparable<Foo> {
--- a/hotspot/test/testlibrary_tests/OutputAnalyzerReportingTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/OutputAnalyzerReportingTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,7 @@
* @summary Test the OutputAnalyzer reporting functionality,
* such as printing additional diagnostic info
* (exit code, stdout, stderr, command line, etc.)
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
@@ -35,8 +35,8 @@
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
public class OutputAnalyzerReportingTest {
--- a/hotspot/test/testlibrary_tests/OutputAnalyzerTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/OutputAnalyzerTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, 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,12 +24,12 @@
/*
* @test
* @summary Test the OutputAnalyzer utility class
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
public class OutputAnalyzerTest {
--- a/hotspot/test/testlibrary_tests/RandomGeneratorTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/RandomGeneratorTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,7 +24,7 @@
/*
* @test
* @summary Verify correctnes of the random generator from Utility.java
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run driver RandomGeneratorTest SAME_SEED
@@ -38,8 +38,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Random;
-import jdk.test.lib.OutputAnalyzer;
-import jdk.test.lib.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.Utils;
/**
--- a/hotspot/test/testlibrary_tests/RedefineClassTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/RedefineClassTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,19 +23,17 @@
/*
* @test
- * @library /testlibrary
+ * @library /test/lib
* @summary Proof of concept test for RedefineClassHelper
* @modules java.base/jdk.internal.misc
* @modules java.compiler
* java.instrument
* jdk.jartool/sun.tools.jar
- * @build RedefineClassHelper
* @run main RedefineClassHelper
* @run main/othervm -javaagent:redefineagent.jar RedefineClassTest
*/
import static jdk.test.lib.Asserts.*;
-import jdk.test.lib.*;
/*
* Proof of concept test for the test utility class RedefineClassHelper
--- a/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/SimpleClassFileLoadHookTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @library /testlibrary
+ * @library /test/lib
* @requires vm.flavor != "minimal"
* @run main/othervm/native -agentlib:SimpleClassFileLoadHook=Foo,XXX,YYY
* SimpleClassFileLoadHookTest
--- a/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/TestMutuallyExclusivePlatformPredicates.java Mon Sep 12 22:04:48 2016 +0000
@@ -38,7 +38,7 @@
* @summary Verify that for each group of mutually exclusive predicates defined
* in jdk.test.lib.Platform one and only one predicate
* evaluates to true.
- * @library /testlibrary
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
* @run main TestMutuallyExclusivePlatformPredicates
@@ -48,7 +48,7 @@
ARCH("isARM", "isPPC", "isSparc", "isX86", "isX64", "isAArch64"),
BITNESS("is32bit", "is64bit"),
OS("isAix", "isLinux", "isOSX", "isSolaris", "isWindows"),
- VM_TYPE("isClient", "isServer", "isGraal", "isMinimal", "isZero"),
+ VM_TYPE("isClient", "isServer", "isGraal", "isMinimal", "isZero", "isEmbedded"),
MODE("isInt", "isMixed", "isComp"),
IGNORED("isDebugBuild", "shouldSAAttach",
"canPtraceAttachLinux", "canAttachOSX", "isTieredSupported");
--- a/hotspot/test/testlibrary_tests/TestPlatformIsTieredSupported.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/TestPlatformIsTieredSupported.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +28,10 @@
/**
* @test
* @summary Verifies that Platform::isTieredSupported returns correct value.
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestPlatformIsTieredSupported
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
--- a/hotspot/test/testlibrary_tests/ctw/ClassesDirTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/ctw/ClassesDirTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8012447
- * @library /testlibrary /test/lib /testlibrary/ctw/src
+ * @library /test/lib /testlibrary/ctw/src
* @modules java.base/jdk.internal.jimage
* java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
* java.management
- * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
+ * @build sun.hotspot.WhiteBox Foo Bar
* @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ClassesDirTest prepare
--- a/hotspot/test/testlibrary_tests/ctw/ClassesListTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/ctw/ClassesListTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8012447
- * @library /testlibrary /test/lib /testlibrary/ctw/src
+ * @library /test/lib /testlibrary/ctw/src
* @modules java.base/jdk.internal.jimage
* java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
* java.management
- * @build ClassFileInstaller sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
+ * @build sun.hotspot.WhiteBox Foo Bar
* @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main ClassesListTest prepare
--- a/hotspot/test/testlibrary_tests/ctw/CtwTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/ctw/CtwTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,7 +37,7 @@
import java.nio.charset.Charset;
import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
public abstract class CtwTest {
protected final String[] shouldContain;
--- a/hotspot/test/testlibrary_tests/ctw/JarDirTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/ctw/JarDirTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,14 +24,14 @@
/*
* @test
* @bug 8012447
- * @library /testlibrary /test/lib /testlibrary/ctw/src
+ * @library /test/lib /testlibrary/ctw/src
* @modules java.base/jdk.internal.jimage
* java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build ClassFileInstaller jdk.test.lib.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
+ * @build sun.hotspot.WhiteBox Foo Bar
* @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main JarDirTest prepare
@@ -45,7 +45,7 @@
import java.nio.file.Files;
import java.nio.file.Paths;
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
public class JarDirTest extends CtwTest {
private static final String[] SHOULD_CONTAIN
--- a/hotspot/test/testlibrary_tests/ctw/JarsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/ctw/JarsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,14 +24,14 @@
/*
* @test
* @bug 8012447
- * @library /testlibrary /test/lib /testlibrary/ctw/src
+ * @library /test/lib /testlibrary/ctw/src
* @modules java.base/jdk.internal.jimage
* java.base/jdk.internal.misc
* java.base/jdk.internal.reflect
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build ClassFileInstaller jdk.test.lib.* sun.hotspot.tools.ctw.CompileTheWorld sun.hotspot.WhiteBox Foo Bar
+ * @build sun.hotspot.WhiteBox Foo Bar
* @run main ClassFileInstaller sun.hotspot.WhiteBox Foo Bar
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main JarsTest prepare
@@ -41,7 +41,7 @@
* @author igor.ignatyev@oracle.com
*/
-import jdk.test.lib.OutputAnalyzer;
+import jdk.test.lib.process.OutputAnalyzer;
public class JarsTest extends CtwTest {
private static final String[] SHOULD_CONTAIN
--- a/hotspot/test/testlibrary_tests/whitebox/BlobSanityTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/whitebox/BlobSanityTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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,10 +24,10 @@
/*
* @test BlobSanityTest
* @bug 8132980
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management/sun.management
- * @build BlobSanityTest
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI BlobSanityTest
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/BooleanTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,12 +24,12 @@
/*
* @test BooleanTest
* @bug 8028756
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.compiler
* java.management/sun.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build BooleanTest ClassFileInstaller sun.hotspot.WhiteBox jdk.test.lib.*
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI BooleanTest
@@ -38,7 +38,8 @@
*/
import sun.hotspot.WhiteBox;
-import jdk.test.lib.*;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
import sun.management.*;
import com.sun.management.*;
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/DoubleTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +24,10 @@
/*
* @test DoubleTest
* @bug 8028756
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management/sun.management
- * @build DoubleTest
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI DoubleTest
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/IntxTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +24,10 @@
/*
* @test IntxTest
* @bug 8038756
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management/sun.management
- * @build IntxTest
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xint -XX:-ProfileInterpreter IntxTest
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/SizeTTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +24,10 @@
/*
* @test SizeTTest
* @bug 8054823
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management/sun.management
- * @build SizeTTest
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:+UnlockExperimentalVMOptions SizeTTest
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/StringTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/StringTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +24,10 @@
/*
* @test StringTest
* @bug 8028756
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management/sun.management
- * @build StringTest
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI StringTest
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/Uint64Test.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +24,10 @@
/*
* @test Uint64Test
* @bug 8028756
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* @modules java.management/sun.management
- * @build Uint64Test
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI Uint64Test
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/UintxTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,10 +24,10 @@
/*
* @test UintxTest
* @bug 8028756
- * @library /testlibrary /test/lib
+ * @library /test/lib
* @modules java.base/jdk.internal.misc
* java.management/sun.management
- * @build UintxTest
+ * @build sun.hotspot.WhiteBox
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI UintxTest
--- a/hotspot/test/testlibrary_tests/whitebox/vm_flags/VmFlagTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/hotspot/test/testlibrary_tests/whitebox/vm_flags/VmFlagTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
import sun.hotspot.WhiteBox;
import sun.management.*;
import com.sun.management.*;
-import jdk.test.lib.*;
+import jdk.test.lib.Asserts;
import java.lang.management.ManagementFactory;
public final class VmFlagTest<T> {
--- a/jaxp/.hgtags Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/.hgtags Mon Sep 12 22:04:48 2016 +0000
@@ -376,3 +376,4 @@
874082a9b565a7092a40bfa934a6e3e3c3455a60 jdk-9+131
907445d85e680ea410fe2c83c0ec64b5508e4f3e jdk-9+132
9490ba2e5e41685c858a0ca2a6ec87611eb011c6 jdk-9+133
+1c6c21d87aa459d82425e1fddc9ce8647aebde34 jdk-9+134
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogImpl.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,6 +31,7 @@
import java.net.URISyntaxException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
@@ -72,9 +73,6 @@
//System Id for this catalog
String systemId;
- //The parent
- CatalogImpl parent = null;
-
/*
A list of catalog entry files from the input, excluding the current catalog.
Paths in the List are normalized.
@@ -107,7 +105,7 @@
* catalog file.
*/
public CatalogImpl(CatalogImpl parent, CatalogFeatures f, String... file) throws CatalogException {
- super(CatalogEntryType.CATALOG);
+ super(CatalogEntryType.CATALOG, parent);
if (f == null) {
throw new NullPointerException(
formatMessage(CatalogMessages.ERR_NULL_ARGUMENT, new Object[]{"CatalogFeatures"}));
@@ -117,7 +115,7 @@
CatalogMessages.reportNPEOnNull("The path to the catalog file", file[0]);
}
- init(parent, f);
+ init(f);
//Path of catalog files
String[] catalogFile = file;
@@ -159,19 +157,34 @@
}
}
}
-
- if (systemId != null) {
- parse(systemId);
- }
}
}
- private void init(CatalogImpl parent, CatalogFeatures f) {
- this.parent = parent;
+ /**
+ * Loads the catalog
+ */
+ void load() {
+ if (systemId != null) {
+ parse(systemId);
+ }
+
+ //save this catalog before loading the next
+ loadedCatalogs.put(systemId, this);
+
+ //Load delegate and alternative catalogs if defer is false.
+ if (!isDeferred()) {
+ loadDelegateCatalogs();
+ loadNextCatalogs();
+ }
+ }
+
+ private void init(CatalogFeatures f) {
if (parent == null) {
level = 0;
} else {
level = parent.level + 1;
+ this.loadedCatalogs = parent.loadedCatalogs;
+ this.catalogsSearched = parent.catalogsSearched;
}
if (f == null) {
this.features = CatalogFeatures.defaults();
@@ -196,11 +209,6 @@
entries.stream().filter((entry) -> (entry.type == CatalogEntryType.GROUP)).forEach((entry) -> {
((GroupEntry) entry).reset();
});
-
- if (parent != null) {
- this.loadedCatalogs = parent.loadedCatalogs;
- this.catalogsSearched = parent.catalogsSearched;
- }
}
/**
@@ -421,16 +429,16 @@
void loadNextCatalogs() {
//loads catalogs specified in nextCatalogs
if (nextCatalogs != null) {
- for (NextCatalog next : nextCatalogs) {
+ nextCatalogs.stream().forEach((next) -> {
getCatalog(next.getCatalogURI());
- }
+ });
}
//loads catalogs from the input list
if (inputFiles != null) {
- for (String file : inputFiles) {
+ inputFiles.stream().forEach((file) -> {
getCatalog(getSystemId(file));
- }
+ });
}
}
@@ -445,14 +453,14 @@
return null;
}
- Catalog c = null;
+ CatalogImpl c = null;
String path = uri.toASCIIString();
if (verifyCatalogFile(uri)) {
c = getLoadedCatalog(path);
if (c == null) {
c = new CatalogImpl(this, features, path);
- saveLoadedCatalog(path, c);
+ c.load();
}
}
return c;
@@ -464,7 +472,7 @@
* @param catalogId the catalogId associated with the Catalog object
* @param c the Catalog to be saved
*/
- void saveLoadedCatalog(String catalogId, Catalog c) {
+ void saveLoadedCatalog(String catalogId, CatalogImpl c) {
loadedCatalogs.put(catalogId, c);
}
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogManager.java Mon Sep 12 22:04:48 2016 +0000
@@ -62,7 +62,9 @@
* @throws CatalogException If an error occurs while parsing the catalog
*/
public static Catalog catalog(CatalogFeatures features, String... paths) {
- return new CatalogImpl(features, paths);
+ CatalogImpl catalog = new CatalogImpl(features, paths);
+ catalog.load();
+ return catalog;
}
/**
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogReader.java Mon Sep 12 22:04:48 2016 +0000
@@ -259,15 +259,6 @@
CatalogEntryType type = CatalogEntryType.getType(localName);
if (type == CatalogEntryType.GROUP) {
inGroup = false;
- } else if (type == CatalogEntryType.CATALOGENTRY) {
- /*
- Done reading the catalog file.
- Load delegate and alternative catalogs if defer is false.
- */
- if (!catalog.isDeferred()) {
- catalog.loadDelegateCatalogs();
- catalog.loadNextCatalogs();
- }
}
}
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/CatalogResolverImpl.java Mon Sep 12 22:04:48 2016 +0000
@@ -119,6 +119,10 @@
String result = null;
CatalogImpl c = (CatalogImpl)catalog;
String uri = Normalizer.normalizeURI(href);
+ if (uri == null) {
+ return null;
+ }
+
//check whether uri is an urn
if (uri != null && uri.startsWith(Util.URN)) {
String publicId = Normalizer.decodeURN(uri);
--- a/jaxp/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/src/java.xml/share/classes/javax/xml/catalog/GroupEntry.java Mon Sep 12 22:04:48 2016 +0000
@@ -48,6 +48,9 @@
//Value of the prefer attribute
boolean isPreferPublic = true;
+ //The parent of the catalog instance
+ CatalogImpl parent = null;
+
//The catalog instance this group belongs to
CatalogImpl catalog;
@@ -55,10 +58,10 @@
List<BaseEntry> entries = new ArrayList<>();
//loaded delegated catalog by system id
- Map<String, Catalog> delegateCatalogs = new HashMap<>();
+ Map<String, CatalogImpl> delegateCatalogs = new HashMap<>();
//A list of all loaded Catalogs, including this, and next catalogs
- Map<String, Catalog> loadedCatalogs = new HashMap<>();
+ Map<String, CatalogImpl> loadedCatalogs = new HashMap<>();
/*
A list of Catalog Ids that have already been searched in a matching
@@ -136,8 +139,9 @@
*
* @param type The type of the entry
*/
- public GroupEntry(CatalogEntryType type) {
+ public GroupEntry(CatalogEntryType type, CatalogImpl parent) {
super(type);
+ this.parent = parent;
}
/**
@@ -163,7 +167,7 @@
}
/**
* Constructs a group entry.
- * @param catalog The parent catalog
+ * @param catalog The catalog this GroupEntry belongs
* @param base The baseURI attribute
* @param attributes The attributes
*/
@@ -445,13 +449,14 @@
* @param catalogId the catalog Id
*/
Catalog loadCatalog(URI catalogURI) {
- Catalog delegateCatalog = null;
+ CatalogImpl delegateCatalog = null;
if (catalogURI != null) {
String catalogId = catalogURI.toASCIIString();
delegateCatalog = getLoadedCatalog(catalogId);
if (delegateCatalog == null) {
if (verifyCatalogFile(catalogURI)) {
delegateCatalog = new CatalogImpl(catalog, features, catalogId);
+ delegateCatalog.load();
delegateCatalogs.put(catalogId, delegateCatalog);
}
}
@@ -467,8 +472,8 @@
* @return a Catalog object previously loaded, or null if none in the saved
* list
*/
- Catalog getLoadedCatalog(String catalogId) {
- Catalog c = null;
+ CatalogImpl getLoadedCatalog(String catalogId) {
+ CatalogImpl c = null;
//checl delegate Catalogs
c = delegateCatalogs.get(catalogId);
@@ -504,7 +509,7 @@
}
String catalogId = catalogURI.toASCIIString();
- if (catalogsSearched.contains(catalogId)) {
+ if (catalogsSearched.contains(catalogId) || isCircular(catalogId)) {
CatalogMessages.reportRunTimeError(CatalogMessages.ERR_CIRCULAR_REFERENCE,
new Object[]{CatalogMessages.sanitize(catalogId)});
}
@@ -512,4 +517,20 @@
return true;
}
+ /**
+ * Checks whether the catalog is circularly referenced
+ * @param systemId the system identifier of the catalog to be loaded
+ * @return true if is circular, false otherwise
+ */
+ boolean isCircular(String systemId) {
+ if (parent == null) {
+ return false;
+ }
+
+ if (parent.systemId.equals(systemId)) {
+ return true;
+ }
+
+ return parent.isCircular(systemId);
+ }
}
--- a/jaxp/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/src/java.xml/share/classes/jdk/xml/internal/JdkXmlFeatures.java Mon Sep 12 22:04:48 2016 +0000
@@ -42,6 +42,9 @@
ORACLE_JAXP_PROPERTY_PREFIX + "enableExtensionFunctions";
public static final String SP_ENABLE_EXTENSION_FUNCTION =
"javax.xml.enableExtensionFunctions";
+ // This is the correct name by the spec
+ public static final String SP_ENABLE_EXTENSION_FUNCTION_SPEC =
+ "jdk.xml.enableExtensionFunctions";
public static final String CATALOG_FEATURES = "javax.xml.catalog.catalogFeatures";
public final static String PROPERTY_USE_CATALOG = XMLConstants.USE_CATALOG;
@@ -49,11 +52,11 @@
public static enum XmlFeature {
/**
* Feature enableExtensionFunctions
- * FSP: extension function is enforced by FSP. When FSP is on, entension
+ * FSP: extension function is enforced by FSP. When FSP is on, extension
* function is disabled.
*/
ENABLE_EXTENSION_FUNCTION(ORACLE_ENABLE_EXTENSION_FUNCTION,
- SP_ENABLE_EXTENSION_FUNCTION, true, false, true, true),
+ SP_ENABLE_EXTENSION_FUNCTION_SPEC, true, false, true, true),
/**
* The {@link javax.xml.XMLConstants.USE_CATALOG} feature.
* FSP: USE_CATALOG is not enforced by FSP.
@@ -149,6 +152,30 @@
}
/**
+ * Maps old property names with the new ones. This map is used to keep track of
+ * name changes so that old or incorrect names continue to be supported for compatibility.
+ */
+ public static enum NameMap {
+
+ ENABLE_EXTENSION_FUNCTION(SP_ENABLE_EXTENSION_FUNCTION_SPEC, SP_ENABLE_EXTENSION_FUNCTION);
+
+ final String newName;
+ final String oldName;
+
+ NameMap(String newName, String oldName) {
+ this.newName = newName;
+ this.oldName = oldName;
+ }
+
+ String getOldName(String newName) {
+ if (newName.equals(this.newName)) {
+ return oldName;
+ }
+ return null;
+ }
+ }
+
+ /**
* States of the settings of a property, in the order: default value, value
* set by FEATURE_SECURE_PROCESSING, jaxp.properties file, jaxp system
* properties, and jaxp api properties
@@ -316,6 +343,15 @@
private void readSystemProperties() {
for (XmlFeature feature : XmlFeature.values()) {
getSystemProperty(feature, feature.systemProperty());
+ if (!getSystemProperty(feature, feature.systemProperty())) {
+ //if system property is not found, try the older form if any
+ for (NameMap nameMap : NameMap.values()) {
+ String oldName = nameMap.getOldName(feature.systemProperty());
+ if (oldName != null) {
+ getSystemProperty(feature, oldName);
+ }
+ }
+ }
}
}
--- a/jaxp/test/ProblemList.txt Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/test/ProblemList.txt Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,3 @@
###########################################################################
javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh 8147431 generic-all
-
-javax/xml/jaxp/unittest/common/TransformationWarningsTest.java 8150145 generic-all
-
-javax/xml/jaxp/unittest/common/ValidationWarningsTest.java 8150145 generic-all
--- a/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -64,12 +64,12 @@
public Object[][] data() {
return new Object[][]{
// By default, alternative catalogs are not loaded.
- {createCatalog(CatalogFeatures.defaults()), 0},
+ {createCatalog(CatalogFeatures.defaults()), 1},
// Alternative catalogs are not loaded when DEFER is set to true.
- {createCatalog(createDeferFeature(DEFER_TRUE)), 0},
- // The 3 alternative catalogs are not pre-loaded
+ {createCatalog(createDeferFeature(DEFER_TRUE)), 1},
+ // The 3 alternative catalogs are pre-loaded along with the parent
//when DEFER is set to false.
- {createCatalog(createDeferFeature(DEFER_FALSE)), 3}};
+ {createCatalog(createDeferFeature(DEFER_FALSE)), 4}};
}
private CatalogFeatures createDeferFeature(String defer) {
--- a/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/BasicModularXMLParserTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/test/javax/xml/jaxp/module/ServiceProviderTest/BasicModularXMLParserTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -93,7 +93,7 @@
*/
public void testWithOneProvider() throws Exception {
int exitValue
- = executeTestJava("-mp", MOD_DIR1.toString(),
+ = executeTestJava("--module-path", MOD_DIR1.toString(),
"-cp", CLASSES_DIR.toString(),
"Main", "xmlprovider1")
.outputTo(System.out)
@@ -108,7 +108,7 @@
*/
public void testWithTwoProvider() throws Exception {
int exitValue
- = executeTestJava("-mp", MOD_DIR1.toString() + File.pathSeparator + MOD_DIR2.toString(),
+ = executeTestJava("--module-path", MOD_DIR1.toString() + File.pathSeparator + MOD_DIR2.toString(),
"-cp", CLASSES_DIR.toString(),
"Main", "xmlprovider1", "xmlprovider2")
.outputTo(System.out)
--- a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -92,6 +92,34 @@
super.setUp();
}
+ /*
+ * @bug 8162431
+ * Verifies that circular references are caught and
+ * CatalogException is thrown.
+ */
+ @Test(dataProvider = "getFeatures", expectedExceptions = CatalogException.class)
+ public void testCircularRef(CatalogFeatures cf, String xml) {
+ CatalogResolver catalogResolver = CatalogManager.catalogResolver(
+ cf,
+ getClass().getResource(xml).getFile());
+ catalogResolver.resolve("anyuri", "");
+ }
+
+ /*
+ DataProvider: used to verify circular reference
+ Data columns: CatalogFeatures, catalog
+ */
+ @DataProvider(name = "getFeatures")
+ public Object[][] getFeatures() {
+
+ return new Object[][]{
+ {CatalogFeatures.builder().with(CatalogFeatures.Feature.DEFER, "false").build(),
+ "catalogReferCircle-itself.xml"},
+ {CatalogFeatures.defaults(), "catalogReferCircle-itself.xml"},
+ {CatalogFeatures.builder().with(CatalogFeatures.Feature.DEFER, "false").build(),
+ "catalogReferCircle-left.xml"},
+ {CatalogFeatures.defaults(), "catalogReferCircle-left.xml"},};
+ }
/*
* @bug 8163232
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/catalogReferCircle-itself.xml Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <nextCatalog catalog="catalogReferCircle-itself.xml" />
+</catalog>
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/catalogReferCircle-left.xml Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <nextCatalog catalog="catalogReferCircle-right.xml" />
+</catalog>
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/catalogReferCircle-right.xml Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <nextCatalog catalog="catalogReferCircle-left.xml" />
+</catalog>
+
--- a/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -42,12 +42,13 @@
* @test
* @bug 8144593
* @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
+ * @compile -XDignore.symbol.file TestSAXDriver.java
* @run testng/othervm -DrunSecMngr=true common.TransformationWarningsTest
* @run testng/othervm common.TransformationWarningsTest
* @summary Check that warnings about unsupported properties from parsers
* are suppressed during the transformation process.
*/
-@Listeners({jaxp.library.BasePolicy.class})
+@Listeners({jaxp.library.BasePolicy.class, jaxp.library.InternalAPIPolicy.class})
public class TransformationWarningsTest extends WarningsTestBase {
@BeforeClass
@@ -80,7 +81,12 @@
Source xslsrc = new StreamSource(new StringReader(xsl));
// Create factory and transformer
- TransformerFactory tf = TransformerFactory.newInstance();
+ TransformerFactory tf;
+ // newTransformer() method doc states that different transformer
+ // factories can be used concurrently by different Threads.
+ synchronized (TransformerFactory.class) {
+ tf = TransformerFactory.newInstance();
+ }
Transformer t = tf.newTransformer(xslsrc);
// Set URI Resolver to return the newly constructed xml
--- a/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -46,6 +46,7 @@
* @bug 8144593
* @key intermittent
* @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
+ * @compile -XDignore.symbol.file TestSAXDriver.java
* @run testng/othervm -DrunSecMngr=true common.ValidationWarningsTest
* @run testng/othervm common.ValidationWarningsTest
* @summary Check that warnings about unsupported properties from SAX
--- a/jaxp/test/javax/xml/jaxp/unittest/common/WarningsTestBase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/test/javax/xml/jaxp/unittest/common/WarningsTestBase.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,11 +23,15 @@
package common;
+import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
+
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
+import java.lang.Thread.UncaughtExceptionHandler;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -58,25 +62,27 @@
PrintStream defStdErr = System.err;
//Set new byte array stream as standard error stream
ByteArrayOutputStream byteStream = new ByteArrayOutputStream(5000);
- System.setErr(new PrintStream(byteStream));
+ runWithAllPerm(() -> System.setErr(new PrintStream(byteStream)));
//Execute multiple TestWorker tasks
for (int id = 0; id < THREADS_COUNT; id++) {
EXECUTOR.execute(new TestWorker(id));
}
//Initiate shutdown of previously submitted task
- EXECUTOR.shutdown();
+ runWithAllPerm(EXECUTOR::shutdown);
//Wait for termination of submitted tasks
if (!EXECUTOR.awaitTermination(THREADS_COUNT, TimeUnit.SECONDS)) {
//If not all tasks terminates during the time out force them to shutdown
- EXECUTOR.shutdownNow();
+ runWithAllPerm(EXECUTOR::shutdownNow);
}
//Restore default standard error stream
- System.setErr(defStdErr);
+ runWithAllPerm(() -> System.setErr(defStdErr));
//Print tasks stderr output
String errContent = byteStream.toString();
System.out.println("Standard error output content:");
System.out.println(errContent);
- //Check tasks stderr output for quatity of warning messages
+ //Check if uncaught exceptions were observed by one or more threads
+ Assert.assertFalse(uncaughtExceptions);
+ //Check tasks stderr output for quantity of warning messages
Assert.assertTrue(warningPrintedOnce(XMLConstants.ACCESS_EXTERNAL_DTD, errContent));
Assert.assertTrue(warningPrintedOnce(ENT_EXP_PROPERTY, errContent));
Assert.assertTrue(warningPrintedOnce(XMLConstants.FEATURE_SECURE_PROCESSING, errContent));
@@ -123,6 +129,25 @@
}
}
+ // Thread factory that handles uncaughtExceptions and prints them
+ // to stdout instead of stderr.
+ private static class TestThreadFactory implements ThreadFactory {
+
+ public Thread newThread(final Runnable r) {
+ Thread t = Executors.defaultThreadFactory().newThread(r);
+ t.setUncaughtExceptionHandler(new UncaughtExceptionHandler() {
+ @Override
+ public void uncaughtException(Thread t, Throwable thr) {
+ thr.printStackTrace(System.out);
+ uncaughtExceptions = true;
+ }
+ });
+ return t;
+ }
+ }
+
+ //Flag that indicates if one or more threads from thread pool caught unhandled exception
+ private static boolean uncaughtExceptions = false;
//Entity expansion limit property name
private static final String ENT_EXP_PROPERTY = "http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit";
//Number of simultaneous test threads
@@ -130,7 +155,7 @@
//Number of iterations per one thread
private static final int ITERATIONS_PER_THREAD = 4;
//Test thread pool
- private static final ExecutorService EXECUTOR = Executors.newCachedThreadPool();
- //Cyclic barrier for threads startup synchronisation
+ private static final ExecutorService EXECUTOR = Executors.newCachedThreadPool(new TestThreadFactory());
+ //Cyclic barrier for threads startup synchronization
private static final CyclicBarrier BARRIER = new CyclicBarrier(THREADS_COUNT);
}
--- a/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -34,11 +34,16 @@
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
+import org.testng.Assert;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Listeners;
import org.testng.annotations.Test;
import static org.testng.Assert.assertEquals;
+import static jaxp.library.JAXPTestUtilities.runWithAllPerm;
+import static jaxp.library.JAXPTestUtilities.clearSystemProperty;
+import static jaxp.library.JAXPTestUtilities.setSystemProperty;
+import static jaxp.library.JAXPTestUtilities.getSystemProperty;
/*
* @test
@@ -49,10 +54,66 @@
* @summary This class contains tests for XSLT functions.
*/
-//@Listeners({jaxp.library.BasePolicy.class}) //uncomment this line after 8161454 is resolved
+@Listeners({jaxp.library.BasePolicy.class})
public class XSLTFunctionsTest {
/**
+ * @bug 8161454
+ * Verifies that the new / correct name is supported, as is the old / incorrect
+ * one for compatibility
+ */
+ @Test
+ public void testNameChange() {
+
+ boolean feature;
+ TransformerFactory tf = TransformerFactory.newInstance();
+ feature = tf.getFeature(ORACLE_ENABLE_EXTENSION_FUNCTION);
+ System.out.println("Default setting: " + feature);
+ // The default: true if no SecurityManager, false otherwise
+ Assert.assertTrue(feature == getDefault());
+
+ setSystemProperty(SP_ENABLE_EXTENSION_FUNCTION, getDefaultOpposite());
+ tf = TransformerFactory.newInstance();
+ feature = tf.getFeature(ORACLE_ENABLE_EXTENSION_FUNCTION);
+ System.out.println("After setting " + SP_ENABLE_EXTENSION_FUNCTION + ": " + feature);
+ clearSystemProperty(SP_ENABLE_EXTENSION_FUNCTION);
+ // old/incorrect name is still supported
+ Assert.assertTrue(feature != getDefault());
+
+ setSystemProperty(SP_ENABLE_EXTENSION_FUNCTION_SPEC, getDefaultOpposite());
+ tf = TransformerFactory.newInstance();
+ feature = tf.getFeature(ORACLE_ENABLE_EXTENSION_FUNCTION);
+ System.out.println("After setting " + SP_ENABLE_EXTENSION_FUNCTION_SPEC + ": " + feature);
+ clearSystemProperty(SP_ENABLE_EXTENSION_FUNCTION_SPEC);
+ // new/correct name is effective
+ Assert.assertTrue(feature != getDefault());
+ }
+
+ final boolean isSecure;
+ {
+ String runSecMngr = getSystemProperty("runSecMngr");
+ isSecure = runSecMngr != null && runSecMngr.equals("true");
+ }
+
+ // The default: true if no SecurityManager, false otherwise
+ private boolean getDefault() {
+ if (isSecure) {
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ // Gets a String value that is opposite to the default value
+ private String getDefaultOpposite() {
+ if (isSecure) {
+ return "true";
+ } else {
+ return "false";
+ }
+ }
+
+ /**
* @bug 8062518 8153082
* Verifies that a reference to the DTM created by XSLT document function is
* actually read from the DTM by an extension function.
@@ -72,7 +133,9 @@
// Create factory and transformer
TransformerFactory tf = TransformerFactory.newInstance();
- tf.setFeature("http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions", true);
+ tf.setFeature(ORACLE_ENABLE_EXTENSION_FUNCTION, true);
+ tf.setAttribute(EXTENSION_CLASS_LOADER,
+ runWithAllPerm(() -> Thread.currentThread().getContextClassLoader()));
Transformer t = tf.newTransformer( xslsrc );
t.setErrorListener(tf.getErrorListener());
@@ -133,5 +196,16 @@
static final String documentTesteExpectedResult = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+ "<root>[Test:Doc][Test:External Doc]</root>";
+
+ public static final String ORACLE_JAXP_PROPERTY_PREFIX =
+ "http://www.oracle.com/xml/jaxp/properties/";
+ /**
+ * Feature enableExtensionFunctions
+ */
+ public static final String ORACLE_ENABLE_EXTENSION_FUNCTION =
+ ORACLE_JAXP_PROPERTY_PREFIX + "enableExtensionFunctions";
+ static final String SP_ENABLE_EXTENSION_FUNCTION = "javax.xml.enableExtensionFunctions";
+ // This is the correct name by the spec
+ static final String SP_ENABLE_EXTENSION_FUNCTION_SPEC = "jdk.xml.enableExtensionFunctions";
+ private static final String EXTENSION_CLASS_LOADER = "jdk.xml.transform.extensionClassLoader";
}
-
--- a/jaxws/.hgtags Mon Sep 12 15:00:58 2016 -0700
+++ b/jaxws/.hgtags Mon Sep 12 22:04:48 2016 +0000
@@ -379,3 +379,4 @@
783e7e2c587f2c7e1b9998a46d90ec196ab2a195 jdk-9+131
9fff2477a4cadf2a9618a76f1f4fe0f20bb5ff3b jdk-9+132
05e99eefda2b58d1ed176e411302d9d6b35dca16 jdk-9+133
+ab1d78d395d4cb8be426ff181211da1a4085cf01 jdk-9+134
--- a/jdk/.hgtags Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/.hgtags Mon Sep 12 22:04:48 2016 +0000
@@ -377,3 +377,4 @@
d5c70818cd8a82e76632c8c815bdb4f75f53aeaf jdk-9+132
3cdae27c90b5e41afe75eab904fda19fac076330 jdk-9+133
803adcd526d74ae0b64948d1f8260c2dbe514779 jdk-9+134
+021369229cfd0b5feb76834b2ea498f47f43c0f3 jdk-9+135
--- a/jdk/make/gendata/GendataBreakIterator.gmk Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/make/gendata/GendataBreakIterator.gmk Mon Sep 12 22:04:48 2016 +0000
@@ -81,7 +81,7 @@
# output
BASE_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/java.base/sun/text/resources
-LD_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/jdk.localedata/sun/text/resources
+LD_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/jdk.localedata/sun/text/resources/ext
BIFILES := $(BASE_DATA_PKG_DIR)/CharacterBreakIteratorData \
$(BASE_DATA_PKG_DIR)/WordBreakIteratorData \
$(BASE_DATA_PKG_DIR)/LineBreakIteratorData \
--- a/jdk/src/java.base/macosx/native/libnio/ch/KQueueArrayWrapper.c Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/macosx/native/libnio/ch/KQueueArrayWrapper.c Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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
@@ -123,7 +123,6 @@
kevent(kq, changes, 2, errors, 2, &dontBlock);
}
-
JNIEXPORT jint JNICALL
Java_sun_nio_ch_KQueueArrayWrapper_kevent0(JNIEnv *env, jobject this, jint kq,
jlong kevAddr, jint kevCount,
@@ -138,6 +137,15 @@
// Java timeout == -1 : wait forever : timespec timeout of NULL
// Java timeout == 0 : return immediately : timespec timeout of zero
if (timeout >= 0) {
+ // For some indeterminate reason kevent(2) has been found to fail with
+ // an EINVAL error for timeout values greater than or equal to
+ // 100000001000L. To avoid this problem, clamp the timeout arbitrarily
+ // to the maximum value of a 32-bit signed integer which is
+ // approximately 25 days in milliseconds.
+ const jlong timeoutMax = 0x7fffffff; // java.lang.Integer.MAX_VALUE
+ if (timeout > timeoutMax) {
+ timeout = timeoutMax;
+ }
ts.tv_sec = timeout / 1000;
ts.tv_nsec = (timeout % 1000) * 1000000; //nanosec = 1 million millisec
tsp = &ts;
--- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/Package.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, 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
@@ -476,7 +476,8 @@
} else if (localICs.isEmpty()) {
// It was a non-empty diff, but the local ICs were absent.
actualICs = null;
- changed = 0; // [] => null, no tuple change
+ // [] => null, no tuple change, but attribute deletion.
+ changed = -1;
} else {
// Non-trivial diff was transmitted.
actualICs = computeICdiff();
--- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/PackageReader.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2001, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2016, 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
@@ -1193,18 +1193,21 @@
cls.visitRefs(VRM_CLASSIC, cpRefs);
ArrayList<BootstrapMethodEntry> bsms = new ArrayList<>();
- /*
- * BootstrapMethod(BSMs) are added here before InnerClasses(ICs),
- * so as to ensure the order. Noting that the BSMs may be
- * removed if they are not found in the CP, after the ICs expansion.
- */
- cls.addAttribute(Package.attrBootstrapMethodsEmpty.canonicalInstance());
-
// flesh out the local constant pool
ConstantPool.completeReferencesIn(cpRefs, true, bsms);
+ // add the bsm and references as required
+ if (!bsms.isEmpty()) {
+ cls.addAttribute(Package.attrBootstrapMethodsEmpty.canonicalInstance());
+ cpRefs.add(Package.getRefString("BootstrapMethods"));
+ Collections.sort(bsms);
+ cls.setBootstrapMethods(bsms);
+ }
+
// Now that we know all our local class references,
// compute the InnerClasses attribute.
+ // An InnerClasses attribute usually gets added here,
+ // although it might already have been present.
int changed = cls.expandLocalICs();
if (changed != 0) {
@@ -1221,16 +1224,6 @@
ConstantPool.completeReferencesIn(cpRefs, true, bsms);
}
- // remove the attr previously set, otherwise add the bsm and
- // references as required
- if (bsms.isEmpty()) {
- cls.attributes.remove(Package.attrBootstrapMethodsEmpty.canonicalInstance());
- } else {
- cpRefs.add(Package.getRefString("BootstrapMethods"));
- Collections.sort(bsms);
- cls.setBootstrapMethods(bsms);
- }
-
// construct a local constant pool
int numDoubles = 0;
for (Entry e : cpRefs) {
--- a/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/com/sun/java/util/jar/pack/intrinsic.properties Mon Sep 12 22:04:48 2016 +0000
@@ -18,7 +18,7 @@
pack.class.attribute.Module = NH[RUHFH]NH[RUHNH[RUH]]NH[RCH]NH[RCHRCH]
pack.class.attribute.ConcealedPackages = NH[RUH]
pack.class.attribute.Version = RUH
-pack.class.attribute.MainClass = RUH
+pack.class.attribute.MainClass = RCH
pack.class.attribute.TargetPlatform = RUHRUHRUH
pack.class.attribute.Hashes = RUHNH[RUHRUH]
--- a/jdk/src/java.base/share/classes/java/lang/ClassLoader.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/ClassLoader.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,6 +27,7 @@
import java.io.InputStream;
import java.io.IOException;
+import java.io.UncheckedIOException;
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
@@ -46,12 +47,16 @@
import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import java.util.Spliterator;
+import java.util.Spliterators;
import java.util.Stack;
import java.util.NoSuchElementException;
import java.util.Vector;
import java.util.WeakHashMap;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
import jdk.internal.perf.PerfCounter;
import jdk.internal.module.ServicesCatalog;
@@ -1167,17 +1172,7 @@
protected final Class<?> findSystemClass(String name)
throws ClassNotFoundException
{
- ClassLoader system = getSystemClassLoader();
- if (system == null) {
- if (!checkName(name))
- throw new ClassNotFoundException(name);
- Class<?> cls = findBootstrapClass(name);
- if (cls == null) {
- throw new ClassNotFoundException(name);
- }
- return cls;
- }
- return system.loadClass(name);
+ return getSystemClassLoader().loadClass(name);
}
/**
@@ -1354,6 +1349,57 @@
}
/**
+ * Returns a stream whose elements are the URLs of all the resources with
+ * the given name. A resource is some data (images, audio, text, etc) that
+ * can be accessed by class code in a way that is independent of the
+ * location of the code.
+ *
+ * Resources in a named module are private to that module. This method does
+ * not find resources in named modules.
+ *
+ * <p> The name of a resource is a {@code /}-separated path name that
+ * identifies the resource.
+ *
+ * <p> The search order is described in the documentation for {@link
+ * #getResource(String)}.
+ *
+ * <p> The resources will be located when the returned stream is evaluated.
+ * If the evaluation results in an {@code IOException} then the I/O
+ * exception is wrapped in an {@link UncheckedIOException} that is then
+ * thrown.
+ *
+ * @apiNote When overriding this method it is recommended that an
+ * implementation ensures that any delegation is consistent with the {@link
+ * #getResource(java.lang.String) getResource(String)} method. This should
+ * ensure that the first element returned by the stream is the same
+ * resource that the {@code getResource(String)} method would return.
+ *
+ * @param name
+ * The resource name
+ *
+ * @return A stream of resource {@link java.net.URL URL} objects. If no
+ * resources could be found, the stream will be empty. Resources
+ * that the class loader doesn't have access to will not be in the
+ * stream.
+ *
+ * @see #findResources(String)
+ *
+ * @since 9
+ */
+ public Stream<URL> resources(String name) {
+ int characteristics = Spliterator.NONNULL | Spliterator.IMMUTABLE;
+ Supplier<Spliterator<URL>> si = () -> {
+ try {
+ return Spliterators.spliteratorUnknownSize(
+ getResources(name).asIterator(), characteristics);
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ };
+ return StreamSupport.stream(si, characteristics, false);
+ }
+
+ /**
* Finds the resource with the given name. Class loader implementations
* should override this method to specify where to find resources.
*
@@ -1437,11 +1483,7 @@
* @since 1.1
*/
public static URL getSystemResource(String name) {
- ClassLoader system = getSystemClassLoader();
- if (system == null) {
- return BootLoader.findResource(name);
- }
- return system.getResource(name);
+ return getSystemClassLoader().getResource(name);
}
/**
@@ -1464,17 +1506,13 @@
*
* @throws IOException
* If I/O errors occur
-
+ *
* @since 1.2
*/
public static Enumeration<URL> getSystemResources(String name)
throws IOException
{
- ClassLoader system = getSystemClassLoader();
- if (system == null) {
- return BootLoader.findResources(name);
- }
- return system.getResources(name);
+ return getSystemClassLoader().getResources(name);
}
/**
@@ -1631,8 +1669,7 @@
* this method during startup should take care not to cache the return
* value until the system is fully initialized.
*
- * @return The system <tt>ClassLoader</tt> for delegation, or
- * <tt>null</tt> if none
+ * @return The system <tt>ClassLoader</tt> for delegation
*
* @throws SecurityException
* If a security manager is present, and the caller's class loader
@@ -1941,9 +1978,14 @@
* @return The {@code Package} of the given name defined by this class loader,
* or {@code null} if not found
*
+ * @throws NullPointerException
+ * if {@code name} is {@code null}.
+ *
* @since 9
*/
public final Package getDefinedPackage(String name) {
+ Objects.requireNonNull(name, "name cannot be null");
+
NamedPackage p = packages.get(name);
if (p == null)
return null;
@@ -1981,6 +2023,9 @@
* @return The {@code Package} corresponding to the given name defined by
* this class loader or its ancestors, or {@code null} if not found.
*
+ * @throws NullPointerException
+ * if {@code name} is {@code null}.
+ *
* @deprecated
* If multiple class loaders delegate to each other and define classes
* with the same package name, and one such loader relies on the lookup
--- a/jdk/src/java.base/share/classes/java/lang/Compiler.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/Compiler.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2016, 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,21 +29,18 @@
* The {@code Compiler} class is provided to support Java-to-native-code
* compilers and related services. By design, the {@code Compiler} class does
* nothing; it serves as a placeholder for a JIT compiler implementation.
+ * If no compiler is available, these methods do nothing.
*
- * <p> When the Java Virtual Machine first starts, it determines if the system
- * property {@code java.compiler} exists. (System properties are accessible
- * through {@link System#getProperty(String)} and {@link
- * System#getProperty(String, String)}. If so, it is assumed to be the name of
- * a library (with a platform-dependent exact location and type); {@link
- * System#loadLibrary} is called to load that library. If this loading
- * succeeds, the function named {@code java_lang_Compiler_start()} in that
- * library is called.
- *
- * <p> If no compiler is available, these methods do nothing.
+ * @deprecated JIT compilers and their technologies vary too widely to
+ * be controlled effectively by a standardized interface. As such, many
+ * JIT compiler implementations ignore this interface, and are instead
+ * controllable by implementation-specific mechanisms such as command-line
+ * options. This class is subject to removal in a future version of Java SE.
*
* @author Frank Yellin
* @since 1.0
*/
+@Deprecated(since="9", forRemoval=true)
public final class Compiler {
private Compiler() {} // don't make instances
--- a/jdk/src/java.base/share/classes/java/lang/Package.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/Package.java Mon Sep 12 22:04:48 2016 +0000
@@ -317,6 +317,9 @@
* @return The {@code Package} of the given name defined by the caller's
* class loader or its ancestors, or {@code null} if not found.
*
+ * @throws NullPointerException
+ * if {@code name} is {@code null}.
+ *
* @deprecated
* If multiple class loaders delegate to each other and define classes
* with the same package name, and one such loader relies on the lookup
--- a/jdk/src/java.base/share/classes/java/lang/Runtime.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/Runtime.java Mon Sep 12 22:04:48 2016 +0000
@@ -733,6 +733,7 @@
* @deprecated
* This method was intended to control instruction tracing.
* It has been superseded by JVM-specific tracing mechanisms.
+ * This method is subject to removal in a future version of Java SE.
*
* @param on ignored
*/
@@ -745,6 +746,7 @@
* @deprecated
* This method was intended to control method call tracing.
* It has been superseded by JVM-specific tracing mechanisms.
+ * This method is subject to removal in a future version of Java SE.
*
* @param on ignored
*/
--- a/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/RuntimePermission.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2016, 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
@@ -323,11 +323,9 @@
* <td>usePolicy</td>
* <td>Granting this permission disables the Java Plug-In's default
* security prompting behavior.</td>
- * <td>For more information, refer to Java Plug-In's guides, <a href=
- * "../../../technotes/guides/plugin/developer_guide/security.html">
- * Applet Security Basics</a> and <a href=
- * "../../../technotes/guides/plugin/developer_guide/rsa_how.html#use">
- * usePolicy Permission</a>.</td>
+ * <td>For more information, refer to the <a href=
+ * "../../../technotes/guides/deploy/index.html">deployment guide</a>.
+ * </td>
* </tr>
* <tr>
* <td>manageProcess</td>
--- a/jdk/src/java.base/share/classes/java/lang/StringConcatHelper.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/StringConcatHelper.java Mon Sep 12 22:04:48 2016 +0000
@@ -334,11 +334,15 @@
/**
* Instantiates the String with given buffer and coder
* @param buf buffer to use
+ * @param index remaining index
* @param coder coder to use
* @return String resulting string
*/
- static String newString(byte[] buf, byte coder) {
+ static String newString(byte[] buf, int index, byte coder) {
// Use the private, non-copying constructor (unsafe!)
+ if (index != 0) {
+ throw new InternalError("Storage is not completely initialized, " + index + " bytes left");
+ }
return new String(buf, coder);
}
--- a/jdk/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/LambdaFormEditor.java Mon Sep 12 22:04:48 2016 +0000
@@ -83,7 +83,9 @@
FOLD_ARGS = 11,
FOLD_ARGS_TO_VOID = 12,
PERMUTE_ARGS = 13,
- LOCAL_TYPES = 14;
+ LOCAL_TYPES = 14,
+ FOLD_SELECT_ARGS = 15,
+ FOLD_SELECT_ARGS_TO_VOID = 16;
private static final boolean STRESS_TEST = false; // turn on to disable most packing
private static final int
@@ -695,6 +697,72 @@
return buf.endEdit();
}
+ private LambdaForm makeArgumentCombinationForm(int pos,
+ MethodType combinerType,
+ int[] argPositions,
+ boolean keepArguments,
+ boolean dropResult) {
+ LambdaFormBuffer buf = buffer();
+ buf.startEdit();
+ int combinerArity = combinerType.parameterCount();
+ assert(combinerArity == argPositions.length);
+
+ int resultArity = (dropResult ? 0 : 1);
+
+ assert(pos <= lambdaForm.arity);
+ assert(pos > 0); // cannot filter the MH arg itself
+ assert(combinerType == combinerType.basicType());
+ assert(combinerType.returnType() != void.class || dropResult);
+
+ BoundMethodHandle.SpeciesData oldData = oldSpeciesData();
+ BoundMethodHandle.SpeciesData newData = newSpeciesData(L_TYPE);
+
+ // The newly created LF will run with a different BMH.
+ // Switch over any pre-existing BMH field references to the new BMH class.
+ Name oldBaseAddress = lambdaForm.parameter(0); // BMH holding the values
+ buf.replaceFunctions(oldData.getterFunctions(), newData.getterFunctions(), oldBaseAddress);
+ Name newBaseAddress = oldBaseAddress.withConstraint(newData);
+ buf.renameParameter(0, newBaseAddress);
+
+ Name getCombiner = new Name(newData.getterFunction(oldData.fieldCount()), newBaseAddress);
+ Object[] combinerArgs = new Object[1 + combinerArity];
+ combinerArgs[0] = getCombiner;
+ Name[] newParams;
+ if (keepArguments) {
+ newParams = new Name[0];
+ for (int i = 0; i < combinerArity; i++) {
+ combinerArgs[i + 1] = lambdaForm.parameter(1 + argPositions[i]);
+ assert (basicType(combinerType.parameterType(i)) == lambdaForm.parameterType(1 + argPositions[i]));
+ }
+ } else {
+ newParams = new Name[combinerArity];
+ for (int i = 0; i < newParams.length; i++) {
+ newParams[i] = lambdaForm.parameter(1 + argPositions[i]);
+ assert (basicType(combinerType.parameterType(i)) == lambdaForm.parameterType(1 + argPositions[i]));
+ }
+ System.arraycopy(newParams, 0,
+ combinerArgs, 1, combinerArity);
+ }
+ Name callCombiner = new Name(combinerType, combinerArgs);
+
+ // insert the two new expressions
+ int exprPos = lambdaForm.arity();
+ buf.insertExpression(exprPos+0, getCombiner);
+ buf.insertExpression(exprPos+1, callCombiner);
+
+ // insert new arguments, if needed
+ int argPos = pos + resultArity; // skip result parameter
+ for (Name newParam : newParams) {
+ buf.insertParameter(argPos++, newParam);
+ }
+ assert(buf.lastIndexOf(callCombiner) == exprPos+1+newParams.length);
+ if (!dropResult) {
+ buf.replaceParameterByCopy(pos, exprPos+1+newParams.length);
+ }
+
+ return buf.endEdit();
+ }
+
LambdaForm filterReturnForm(BasicType newType, boolean constantZero) {
byte kind = (constantZero ? Transform.FILTER_RETURN_TO_ZERO : Transform.FILTER_RETURN);
Transform key = Transform.of(kind, newType.ordinal());
@@ -759,6 +827,21 @@
return putInCache(key, form);
}
+ LambdaForm foldArgumentsForm(int foldPos, boolean dropResult, MethodType combinerType, int ... argPositions) {
+ byte kind = (dropResult ? Transform.FOLD_SELECT_ARGS_TO_VOID
+ : Transform.FOLD_SELECT_ARGS);
+ int[] keyArgs = Arrays.copyOf(argPositions, argPositions.length + 1);
+ keyArgs[argPositions.length] = foldPos;
+ Transform key = Transform.of(kind, keyArgs);
+ LambdaForm form = getInCache(key);
+ if (form != null) {
+ assert(form.arity == lambdaForm.arity - (kind == Transform.FOLD_SELECT_ARGS ? 1 : 0));
+ return form;
+ }
+ form = makeArgumentCombinationForm(foldPos, combinerType, argPositions, true, dropResult);
+ return putInCache(key, form);
+ }
+
LambdaForm permuteArgumentsForm(int skip, int[] reorder) {
assert(skip == 1); // skip only the leading MH argument, names[0]
int length = lambdaForm.names.length;
--- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Mon Sep 12 22:04:48 2016 +0000
@@ -3943,6 +3943,33 @@
return rtype;
}
+ private static Class<?> foldArgumentChecks(int foldPos, MethodType targetType, MethodType combinerType, int ... argPos) {
+ int foldArgs = combinerType.parameterCount();
+ if (argPos.length != foldArgs) {
+ throw newIllegalArgumentException("combiner and argument map must be equal size", combinerType, argPos.length);
+ }
+ Class<?> rtype = combinerType.returnType();
+ int foldVals = rtype == void.class ? 0 : 1;
+ boolean ok = true;
+ for (int i = 0; i < foldArgs; i++) {
+ int arg = argPos[i];
+ if (arg < 0 || arg > targetType.parameterCount()) {
+ throw newIllegalArgumentException("arg outside of target parameterRange", targetType, arg);
+ }
+ if (combinerType.parameterType(i) != targetType.parameterType(arg)) {
+ throw newIllegalArgumentException("target argument type at position " + arg
+ + " must match combiner argument type at index " + i + ": " + targetType
+ + " -> " + combinerType + ", map: " + Arrays.toString(argPos));
+ }
+ }
+ if (ok && foldVals != 0 && combinerType.returnType() != targetType.parameterType(foldPos)) {
+ ok = false;
+ }
+ if (!ok)
+ throw misMatchedTypes("target and combiner types", targetType, combinerType);
+ return rtype;
+ }
+
/**
* Makes a method handle which adapts a target method handle,
* by guarding it with a test, a boolean-valued method handle.
@@ -4949,6 +4976,27 @@
return result;
}
+ /**
+ * As {@see foldArguments(MethodHandle, int, MethodHandle)}, but with the
+ * added capability of selecting the arguments from the targets parameters
+ * to call the combiner with. This allows us to avoid some simple cases of
+ * permutations and padding the combiner with dropArguments to select the
+ * right argument, which may ultimately produce fewer intermediaries.
+ */
+ static MethodHandle foldArguments(MethodHandle target, int pos, MethodHandle combiner, int ... argPositions) {
+ MethodType targetType = target.type();
+ MethodType combinerType = combiner.type();
+ Class<?> rtype = foldArgumentChecks(pos, targetType, combinerType, argPositions);
+ BoundMethodHandle result = target.rebind();
+ boolean dropResult = rtype == void.class;
+ LambdaForm lform = result.editor().foldArgumentsForm(1 + pos, dropResult, combinerType.basicType(), argPositions);
+ MethodType newType = targetType;
+ if (!dropResult) {
+ newType = newType.dropParameterTypes(pos, pos + 1);
+ }
+ result = result.copyWithExtendL(newType, lform, combiner);
+ return result;
+ }
private static void checkLoop0(MethodHandle[][] clauses) {
if (clauses == null || clauses.length == 0) {
--- a/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java Mon Sep 12 22:04:48 2016 +0000
@@ -563,9 +563,8 @@
}
if ((lookup.lookupModes() & MethodHandles.Lookup.PRIVATE) == 0) {
- throw new StringConcatException(String.format(
- "Invalid caller: %s",
- lookup.lookupClass().getName()));
+ throw new StringConcatException("Invalid caller: " +
+ lookup.lookupClass().getName());
}
int cCount = 0;
@@ -1494,51 +1493,41 @@
// Drop all remaining parameter types, leave only helper arguments:
MethodHandle mh;
- mh = MethodHandles.dropArguments(NEW_STRING, 2, ptypes);
- mh = MethodHandles.dropArguments(mh, 0, int.class);
+ mh = MethodHandles.dropArguments(NEW_STRING, 3, ptypes);
- // Safety: check that remaining index is zero -- that would mean the storage is completely
- // overwritten, and no leakage of uninitialized data occurred.
- mh = MethodHandles.filterArgument(mh, 0, CHECK_INDEX);
-
- // Mix in prependers. This happens when (int, byte[], byte) = (index, storage, coder) is already
+ // Mix in prependers. This happens when (byte[], int, byte) = (storage, index, coder) is already
// known from the combinators below. We are assembling the string backwards, so "index" is the
// *ending* index.
for (RecipeElement el : recipe.getElements()) {
- MethodHandle prepender;
+ // Do the prepend, and put "new" index at index 1
+ mh = MethodHandles.dropArguments(mh, 2, int.class);
switch (el.getTag()) {
- case TAG_CONST:
+ case TAG_CONST: {
Object cnst = el.getValue();
- prepender = MethodHandles.insertArguments(prepender(cnst.getClass()), 3, cnst);
+ MethodHandle prepender = MethodHandles.insertArguments(prepender(cnst.getClass()), 3, cnst);
+ mh = MethodHandles.foldArguments(mh, 1, prepender,
+ 2, 0, 3 // index, storage, coder
+ );
break;
- case TAG_ARG:
+ }
+ case TAG_ARG: {
int pos = el.getArgPos();
- prepender = selectArgument(prepender(ptypes[pos]), 3, ptypes, pos);
+ MethodHandle prepender = prepender(ptypes[pos]);
+ mh = MethodHandles.foldArguments(mh, 1, prepender,
+ 2, 0, 3, // index, storage, coder
+ 4 + pos // selected argument
+ );
break;
+ }
default:
throw new StringConcatException("Unhandled tag: " + el.getTag());
}
-
- // Remove "old" index from arguments
- mh = MethodHandles.dropArguments(mh, 1, int.class);
-
- // Do the prepend, and put "new" index at index 0
- mh = MethodHandles.foldArguments(mh, prepender);
}
- // Prepare the argument list for prepending. The tree below would instantiate
- // the storage byte[] into argument 0, so we need to swap "storage" and "index".
- // The index at this point equals to "size", and resides at argument 1.
- {
- MethodType nmt = mh.type()
- .changeParameterType(0, byte[].class)
- .changeParameterType(1, int.class);
- mh = MethodHandles.permuteArguments(mh, nmt, swap10(nmt.parameterCount()));
- }
-
- // Fold in byte[] instantiation at argument 0.
- MethodHandle combiner = MethodHandles.dropArguments(NEW_ARRAY, 2, ptypes);
- mh = MethodHandles.foldArguments(mh, combiner);
+ // Fold in byte[] instantiation at argument 0
+ mh = MethodHandles.foldArguments(mh, 0, NEW_ARRAY,
+ 1, 2 // index, coder
+ );
// Start combining length and coder mixers.
//
@@ -1567,12 +1556,8 @@
int ac = el.getArgPos();
Class<?> argClass = ptypes[ac];
- MethodHandle lm = selectArgument(lengthMixer(argClass), 1, ptypes, ac);
- lm = MethodHandles.dropArguments(lm, 0, byte.class); // (*)
- lm = MethodHandles.dropArguments(lm, 2, byte.class);
-
- MethodHandle cm = selectArgument(coderMixer(argClass), 1, ptypes, ac);
- cm = MethodHandles.dropArguments(cm, 0, int.class); // (**)
+ MethodHandle lm = lengthMixer(argClass);
+ MethodHandle cm = coderMixer(argClass);
// Read this bottom up:
@@ -1580,12 +1565,18 @@
mh = MethodHandles.dropArguments(mh, 2, int.class, byte.class);
// 3. Compute "new-index", producing ("new-index", "new-coder", "old-index", "old-coder", <args>)
- // Length mixer ignores both "new-coder" and "old-coder" due to dropArguments above (*)
- mh = MethodHandles.foldArguments(mh, lm);
+ // Length mixer needs old index, plus the appropriate argument
+ mh = MethodHandles.foldArguments(mh, 0, lm,
+ 2, // old-index
+ 4 + ac // selected argument
+ );
// 2. Compute "new-coder", producing ("new-coder", "old-index", "old-coder", <args>)
- // Coder mixer ignores the "old-index" arg due to dropArguments above (**)
- mh = MethodHandles.foldArguments(mh, cm);
+ // Coder mixer needs old coder, plus the appropriate argument.
+ mh = MethodHandles.foldArguments(mh, 0, cm,
+ 2, // old-coder
+ 3 + ac // selected argument
+ );
// 1. The mh shape here is ("old-index", "old-coder", <args>)
break;
@@ -1606,41 +1597,11 @@
return mh;
}
- private static int[] swap10(int count) {
- int[] perm = new int[count];
- perm[0] = 1;
- perm[1] = 0;
- for (int i = 2; i < count; i++) {
- perm[i] = i;
- }
- return perm;
- }
-
- // Adapts: (...prefix..., parameter[pos])R -> (...prefix..., ...parameters...)R
- private static MethodHandle selectArgument(MethodHandle mh, int prefix, Class<?>[] ptypes, int pos) {
- if (pos == 0) {
- return MethodHandles.dropArguments(mh, prefix + 1, Arrays.copyOfRange(ptypes, 1, ptypes.length));
- } else if (pos == ptypes.length - 1) {
- return MethodHandles.dropArguments(mh, prefix, Arrays.copyOf(ptypes, ptypes.length - 1));
- } else { // 0 < pos < ptypes.size() - 1
- MethodHandle t = MethodHandles.dropArguments(mh, prefix, Arrays.copyOf(ptypes, pos));
- return MethodHandles.dropArguments(t, prefix + 1 + pos, Arrays.copyOfRange(ptypes, pos + 1, ptypes.length));
- }
- }
-
@ForceInline
private static byte[] newArray(int length, byte coder) {
return (byte[]) UNSAFE.allocateUninitializedArray(byte.class, length << coder);
}
- @ForceInline
- private static int checkIndex(int index) {
- if (index != 0) {
- throw new IllegalStateException("Storage is not completely initialized, " + index + " bytes left");
- }
- return index;
- }
-
private static MethodHandle prepender(Class<?> cl) {
return PREPENDERS.computeIfAbsent(cl, PREPEND);
}
@@ -1678,7 +1639,6 @@
};
private static final MethodHandle NEW_STRING;
- private static final MethodHandle CHECK_INDEX;
private static final MethodHandle NEW_ARRAY;
private static final ConcurrentMap<Class<?>, MethodHandle> PREPENDERS;
private static final ConcurrentMap<Class<?>, MethodHandle> LENGTH_MIXERS;
@@ -1699,9 +1659,8 @@
LENGTH_MIXERS = new ConcurrentHashMap<>();
CODER_MIXERS = new ConcurrentHashMap<>();
- NEW_STRING = lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "newString", String.class, byte[].class, byte.class);
+ NEW_STRING = lookupStatic(Lookup.IMPL_LOOKUP, STRING_HELPER, "newString", String.class, byte[].class, int.class, byte.class);
NEW_ARRAY = lookupStatic(Lookup.IMPL_LOOKUP, MethodHandleInlineCopyStrategy.class, "newArray", byte[].class, int.class, byte.class);
- CHECK_INDEX = lookupStatic(Lookup.IMPL_LOOKUP, MethodHandleInlineCopyStrategy.class, "checkIndex", int.class, int.class);
}
}
--- a/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/invoke/VarHandle.java Mon Sep 12 22:04:48 2016 +0000
@@ -152,7 +152,6 @@
* {@link #getAndAdd getAndAdd},
* {@link #getAndAddAcquire getAndAddAcquire},
* {@link #getAndAddRelease getAndAddRelease},
- * {@link #addAndGet addAndGet}.
* <li>bitwise atomic update access modes that, for example, atomically get and
* bitwise OR the value of a variable under specified memory ordering
* effects.
--- a/jdk/src/java.base/share/classes/java/lang/ref/package-info.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/ref/package-info.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -43,8 +43,7 @@
* implementing memory-sensitive caches, weak references are for
* implementing canonicalizing mappings that do not prevent their keys
* (or values) from being reclaimed, and phantom references are for
- * scheduling pre-mortem cleanup actions in a more flexible way than
- * is possible with the Java finalization mechanism.
+ * scheduling post-mortem cleanup actions.
* Post-mortem cleanup actions can be registered and managed by a
* {@link java.lang.ref.Cleaner}.
*
--- a/jdk/src/java.base/share/classes/java/security/DigestInputStream.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/security/DigestInputStream.java Mon Sep 12 22:04:48 2016 +0000
@@ -52,7 +52,7 @@
* {@link MessageDigest}),
* so that in order to compute intermediate digests, a caller should
* retain a handle onto the digest object, and clone it for each
- * digest to be computed, leaving the orginal digest untouched.
+ * digest to be computed, leaving the original digest untouched.
*
* @see MessageDigest
*
--- a/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/security/KeyPairGenerator.java Mon Sep 12 22:04:48 2016 +0000
@@ -76,7 +76,7 @@
* {@code g} parameters. If the modulus size is not one of the above
* values, the <i>Sun</i> provider creates a new set of parameters. Other
* providers might have precomputed parameter sets for more than just the
- * three modulus sizes mentioned above. Still others might not have a list of
+ * modulus sizes mentioned above. Still others might not have a list of
* precomputed parameters at all and instead always create new parameter sets.
*
* <li><b>Algorithm-Specific Initialization</b>
@@ -393,7 +393,7 @@
* of randomness.
* (If none of the installed providers supply an implementation of
* {@code SecureRandom}, a system-provided source of randomness is
- * used.).
+ * used.)
*
* <p>This concrete method has been added to this previously-defined
* abstract class.
--- a/jdk/src/java.base/share/classes/java/security/SignatureSpi.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/security/SignatureSpi.java Mon Sep 12 22:04:48 2016 +0000
@@ -38,7 +38,7 @@
* for the {@code Signature} class, which is used to provide the
* functionality of a digital signature algorithm. Digital signatures are used
* for authentication and integrity assurance of digital data.
- *.
+ *
* <p> All the abstract methods in this class must be implemented by each
* cryptographic service provider who wishes to supply the implementation
* of a particular signature algorithm.
--- a/jdk/src/java.base/share/classes/java/util/ArrayDeque.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/ArrayDeque.java Mon Sep 12 22:04:48 2016 +0000
@@ -81,8 +81,8 @@
* Java Collections Framework</a>.
*
* @author Josh Bloch and Doug Lea
+ * @param <E> the type of elements held in this deque
* @since 1.6
- * @param <E> the type of elements held in this deque
*/
public class ArrayDeque<E> extends AbstractCollection<E>
implements Deque<E>, Cloneable, Serializable
--- a/jdk/src/java.base/share/classes/java/util/Base64.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/Base64.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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
@@ -788,7 +788,7 @@
public void write(byte[] b, int off, int len) throws IOException {
if (closed)
throw new IOException("Stream is closed");
- if (off < 0 || len < 0 || off + len > b.length)
+ if (off < 0 || len < 0 || len > b.length - off)
throw new ArrayIndexOutOfBoundsException();
if (len == 0)
return;
--- a/jdk/src/java.base/share/classes/java/util/ImmutableCollections.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/ImmutableCollections.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,6 +31,10 @@
import java.io.ObjectOutputStream;
import java.io.ObjectStreamException;
import java.io.Serializable;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.function.UnaryOperator;
/**
* Container class for immutable collections. Not part of the public API.
@@ -61,9 +65,25 @@
*/
static final double EXPAND_FACTOR = 2.0;
+ static UnsupportedOperationException uoe() { return new UnsupportedOperationException(); }
+
// ---------- List Implementations ----------
- static final class List0<E> extends AbstractList<E> implements RandomAccess, Serializable {
+ abstract static class AbstractImmutableList<E> extends AbstractList<E>
+ implements RandomAccess, Serializable {
+ @Override public boolean add(E e) { throw uoe(); }
+ @Override public boolean addAll(Collection<? extends E> c) { throw uoe(); }
+ @Override public boolean addAll(int index, Collection<? extends E> c) { throw uoe(); }
+ @Override public void clear() { throw uoe(); }
+ @Override public boolean remove(Object o) { throw uoe(); }
+ @Override public boolean removeAll(Collection<?> c) { throw uoe(); }
+ @Override public boolean removeIf(Predicate<? super E> filter) { throw uoe(); }
+ @Override public void replaceAll(UnaryOperator<E> operator) { throw uoe(); }
+ @Override public boolean retainAll(Collection<?> c) { throw uoe(); }
+ @Override public void sort(Comparator<? super E> c) { throw uoe(); }
+ }
+
+ static final class List0<E> extends AbstractImmutableList<E> {
List0() { }
@Override
@@ -86,7 +106,7 @@
}
}
- static final class List1<E> extends AbstractList<E> implements RandomAccess, Serializable {
+ static final class List1<E> extends AbstractImmutableList<E> {
private final E e0;
List1(E e0) {
@@ -114,7 +134,7 @@
}
}
- static final class List2<E> extends AbstractList<E> implements RandomAccess, Serializable {
+ static final class List2<E> extends AbstractImmutableList<E> {
private final E e0;
private final E e1;
@@ -147,7 +167,7 @@
}
}
- static final class ListN<E> extends AbstractList<E> implements RandomAccess, Serializable {
+ static final class ListN<E> extends AbstractImmutableList<E> {
private final E[] elements;
@SafeVarargs
@@ -183,7 +203,17 @@
// ---------- Set Implementations ----------
- static final class Set0<E> extends AbstractSet<E> implements Serializable {
+ abstract static class AbstractImmutableSet<E> extends AbstractSet<E> implements Serializable {
+ @Override public boolean add(E e) { throw uoe(); }
+ @Override public boolean addAll(Collection<? extends E> c) { throw uoe(); }
+ @Override public void clear() { throw uoe(); }
+ @Override public boolean remove(Object o) { throw uoe(); }
+ @Override public boolean removeAll(Collection<?> c) { throw uoe(); }
+ @Override public boolean removeIf(Predicate<? super E> filter) { throw uoe(); }
+ @Override public boolean retainAll(Collection<?> c) { throw uoe(); }
+ }
+
+ static final class Set0<E> extends AbstractImmutableSet<E> {
Set0() { }
@Override
@@ -210,7 +240,7 @@
}
}
- static final class Set1<E> extends AbstractSet<E> implements Serializable {
+ static final class Set1<E> extends AbstractImmutableSet<E> {
private final E e0;
Set1(E e0) {
@@ -241,7 +271,7 @@
}
}
- static final class Set2<E> extends AbstractSet<E> implements Serializable {
+ static final class Set2<E> extends AbstractImmutableSet<E> {
private final E e0;
private final E e1;
@@ -312,7 +342,7 @@
* least one null is always present.
* @param <E> the element type
*/
- static final class SetN<E> extends AbstractSet<E> implements Serializable {
+ static final class SetN<E> extends AbstractImmutableSet<E> {
private final E[] elements;
private final int size;
@@ -403,7 +433,23 @@
// ---------- Map Implementations ----------
- static final class Map0<K,V> extends AbstractMap<K,V> implements Serializable {
+ abstract static class AbstractImmutableMap<K,V> extends AbstractMap<K,V> implements Serializable {
+ @Override public void clear() { throw uoe(); }
+ @Override public V compute(K key, BiFunction<? super K,? super V,? extends V> rf) { throw uoe(); }
+ @Override public V computeIfAbsent(K key, Function<? super K,? extends V> mf) { throw uoe(); }
+ @Override public V computeIfPresent(K key, BiFunction<? super K,? super V,? extends V> rf) { throw uoe(); }
+ @Override public V merge(K key, V value, BiFunction<? super V,? super V,? extends V> rf) { throw uoe(); }
+ @Override public V put(K key, V value) { throw uoe(); }
+ @Override public void putAll(Map<? extends K,? extends V> m) { throw uoe(); }
+ @Override public V putIfAbsent(K key, V value) { throw uoe(); }
+ @Override public V remove(Object key) { throw uoe(); }
+ @Override public boolean remove(Object key, Object value) { throw uoe(); }
+ @Override public V replace(K key, V value) { throw uoe(); }
+ @Override public boolean replace(K key, V oldValue, V newValue) { throw uoe(); }
+ @Override public void replaceAll(BiFunction<? super K,? super V,? extends V> f) { throw uoe(); }
+ }
+
+ static final class Map0<K,V> extends AbstractImmutableMap<K,V> {
Map0() { }
@Override
@@ -430,7 +476,7 @@
}
}
- static final class Map1<K,V> extends AbstractMap<K,V> implements Serializable {
+ static final class Map1<K,V> extends AbstractImmutableMap<K,V> {
private final K k0;
private final V v0;
@@ -472,7 +518,7 @@
* @param <K> the key type
* @param <V> the value type
*/
- static final class MapN<K,V> extends AbstractMap<K,V> implements Serializable {
+ static final class MapN<K,V> extends AbstractImmutableMap<K,V> {
private final Object[] table; // pairs of key, value
private final int size; // number of pairs
--- a/jdk/src/java.base/share/classes/java/util/List.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/List.java Mon Sep 12 22:04:48 2016 +0000
@@ -94,7 +94,8 @@
*
* <ul>
* <li>They are <em>structurally immutable</em>. Elements cannot be added, removed,
- * or replaced. Attempts to do so result in {@code UnsupportedOperationException}.
+ * or replaced. Calling any mutator method will always cause
+ * {@code UnsupportedOperationException} to be thrown.
* However, if the contained elements are themselves mutable,
* this may cause the List's contents to appear to change.
* <li>They disallow {@code null} elements. Attempts to create them with
--- a/jdk/src/java.base/share/classes/java/util/Map.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/Map.java Mon Sep 12 22:04:48 2016 +0000
@@ -119,7 +119,8 @@
*
* <ul>
* <li>They are <em>structurally immutable</em>. Keys and values cannot be added,
- * removed, or updated. Attempts to do so result in {@code UnsupportedOperationException}.
+ * removed, or updated. Calling any mutator method will always cause
+ * {@code UnsupportedOperationException} to be thrown.
* However, if the contained keys or values are themselves mutable, this may cause the
* Map to behave inconsistently or its contents to appear to change.
* <li>They disallow {@code null} keys and values. Attempts to create them with
--- a/jdk/src/java.base/share/classes/java/util/PriorityQueue.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/PriorityQueue.java Mon Sep 12 22:04:48 2016 +0000
@@ -749,11 +749,11 @@
/**
* Saves this queue to a stream (that is, serializes it).
*
+ * @param s the stream
+ * @throws java.io.IOException if an I/O error occurs
* @serialData The length of the array backing the instance is
* emitted (int), followed by all of its elements
* (each an {@code Object}) in the proper order.
- * @param s the stream
- * @throws java.io.IOException if an I/O error occurs
*/
private void writeObject(java.io.ObjectOutputStream s)
throws java.io.IOException {
--- a/jdk/src/java.base/share/classes/java/util/Set.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/Set.java Mon Sep 12 22:04:48 2016 +0000
@@ -70,7 +70,8 @@
*
* <ul>
* <li>They are <em>structurally immutable</em>. Elements cannot be added or
- * removed. Attempts to do so result in {@code UnsupportedOperationException}.
+ * removed. Calling any mutator method will always cause
+ * {@code UnsupportedOperationException} to be thrown.
* However, if the contained elements are themselves mutable, this may cause the
* Set to behave inconsistently or its contents to appear to change.
* <li>They disallow {@code null} elements. Attempts to create them with
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/CompletableFuture.java Mon Sep 12 22:04:48 2016 +0000
@@ -136,9 +136,9 @@
* }}</pre>
*
* @author Doug Lea
- * @since 1.8
* @param <T> The result type returned by this future's {@code join}
* and {@code get} methods
+ * @since 1.8
*/
public class CompletableFuture<T> implements Future<T>, CompletionStage<T> {
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/CountedCompleter.java Mon Sep 12 22:04:48 2016 +0000
@@ -120,102 +120,114 @@
* to complete for some elements than others, either because of
* intrinsic variation (for example I/O) or auxiliary effects such as
* garbage collection. Because CountedCompleters provide their own
- * continuations, other threads need not block waiting to perform
- * them.
+ * continuations, other tasks need not block waiting to perform them.
*
- * <p>For example, here is an initial version of a class that uses
- * divide-by-two recursive decomposition to divide work into single
- * pieces (leaf tasks). Even when work is split into individual calls,
- * tree-based techniques are usually preferable to directly forking
- * leaf tasks, because they reduce inter-thread communication and
- * improve load balancing. In the recursive case, the second of each
- * pair of subtasks to finish triggers completion of its parent
+ * <p>For example, here is an initial version of a utility method that
+ * uses divide-by-two recursive decomposition to divide work into
+ * single pieces (leaf tasks). Even when work is split into individual
+ * calls, tree-based techniques are usually preferable to directly
+ * forking leaf tasks, because they reduce inter-thread communication
+ * and improve load balancing. In the recursive case, the second of
+ * each pair of subtasks to finish triggers completion of their parent
* (because no result combination is performed, the default no-op
* implementation of method {@code onCompletion} is not overridden).
- * A static utility method sets up the base task and invokes it
- * (here, implicitly using the {@link ForkJoinPool#commonPool()}).
+ * The utility method sets up the root task and invokes it (here,
+ * implicitly using the {@link ForkJoinPool#commonPool()}). It is
+ * straightforward and reliable (but not optimal) to always set the
+ * pending count to the number of child tasks and call {@code
+ * tryComplete()} immediately before returning.
*
* <pre> {@code
- * class MyOperation<E> { void apply(E e) { ... } }
- *
- * class ForEach<E> extends CountedCompleter<Void> {
+ * public static <E> void forEach(E[] array, Consumer<E> action) {
+ * class Task extends CountedCompleter<Void> {
+ * final int lo, hi;
+ * Task(Task parent, int lo, int hi) {
+ * super(parent); this.lo = lo; this.hi = hi;
+ * }
*
- * public static <E> void forEach(E[] array, MyOperation<E> op) {
- * new ForEach<E>(null, array, op, 0, array.length).invoke();
- * }
- *
- * final E[] array; final MyOperation<E> op; final int lo, hi;
- * ForEach(CountedCompleter<?> p, E[] array, MyOperation<E> op, int lo, int hi) {
- * super(p);
- * this.array = array; this.op = op; this.lo = lo; this.hi = hi;
+ * public void compute() {
+ * if (hi - lo >= 2) {
+ * int mid = (lo + hi) >>> 1;
+ * // must set pending count before fork
+ * setPendingCount(2);
+ * new Task(this, mid, hi).fork(); // right child
+ * new Task(this, lo, mid).fork(); // left child
+ * }
+ * else if (hi > lo)
+ * action.accept(array[lo]);
+ * tryComplete();
+ * }
* }
- *
- * public void compute() { // version 1
- * if (hi - lo >= 2) {
- * int mid = (lo + hi) >>> 1;
- * setPendingCount(2); // must set pending count before fork
- * new ForEach(this, array, op, mid, hi).fork(); // right child
- * new ForEach(this, array, op, lo, mid).fork(); // left child
- * }
- * else if (hi > lo)
- * op.apply(array[lo]);
- * tryComplete();
- * }
+ * new Task(null, 0, array.length).invoke();
* }}</pre>
*
* This design can be improved by noticing that in the recursive case,
* the task has nothing to do after forking its right task, so can
* directly invoke its left task before returning. (This is an analog
- * of tail recursion removal.) Also, because the task returns upon
- * executing its left task (rather than falling through to invoke
- * {@code tryComplete}) the pending count is set to one:
+ * of tail recursion removal.) Also, when the last action in a task
+ * is to fork or invoke a subtask (a "tail call"), the call to {@code
+ * tryComplete()} can be optimized away, at the cost of making the
+ * pending count look "off by one".
*
* <pre> {@code
- * class ForEach<E> ... {
- * ...
- * public void compute() { // version 2
- * if (hi - lo >= 2) {
- * int mid = (lo + hi) >>> 1;
- * setPendingCount(1); // only one pending
- * new ForEach(this, array, op, mid, hi).fork(); // right child
- * new ForEach(this, array, op, lo, mid).compute(); // direct invoke
- * }
- * else {
- * if (hi > lo)
- * op.apply(array[lo]);
- * tryComplete();
- * }
- * }
- * }}</pre>
+ * public void compute() {
+ * if (hi - lo >= 2) {
+ * int mid = (lo + hi) >>> 1;
+ * setPendingCount(1); // looks off by one, but correct!
+ * new Task(this, mid, hi).fork(); // right child
+ * new Task(this, lo, mid).compute(); // direct invoke
+ * } else {
+ * if (hi > lo)
+ * action.accept(array[lo]);
+ * tryComplete();
+ * }
+ * }}</pre>
*
* As a further optimization, notice that the left task need not even exist.
- * Instead of creating a new one, we can iterate using the original task,
+ * Instead of creating a new one, we can continue using the original task,
* and add a pending count for each fork. Additionally, because no task
* in this tree implements an {@link #onCompletion(CountedCompleter)} method,
- * {@code tryComplete()} can be replaced with {@link #propagateCompletion}.
+ * {@code tryComplete} can be replaced with {@link #propagateCompletion}.
+ *
+ * <pre> {@code
+ * public void compute() {
+ * int n = hi - lo;
+ * for (; n >= 2; n /= 2) {
+ * addToPendingCount(1);
+ * new Task(this, lo + n/2, lo + n).fork();
+ * }
+ * if (n > 0)
+ * action.accept(array[lo]);
+ * propagateCompletion();
+ * }}</pre>
+ *
+ * When pending counts can be precomputed, they can be established in
+ * the constructor:
*
* <pre> {@code
- * class ForEach<E> ... {
- * ...
- * public void compute() { // version 3
- * int l = lo, h = hi;
- * while (h - l >= 2) {
- * int mid = (l + h) >>> 1;
- * addToPendingCount(1);
- * new ForEach(this, array, op, mid, h).fork(); // right child
- * h = mid;
+ * public static <E> void forEach(E[] array, Consumer<E> action) {
+ * class Task extends CountedCompleter<Void> {
+ * final int lo, hi;
+ * Task(Task parent, int lo, int hi) {
+ * super(parent, 31 - Integer.numberOfLeadingZeros(hi - lo));
+ * this.lo = lo; this.hi = hi;
* }
- * if (h > l)
- * op.apply(array[l]);
- * propagateCompletion();
+ *
+ * public void compute() {
+ * for (int n = hi - lo; n >= 2; n /= 2)
+ * new Task(this, lo + n/2, lo + n).fork();
+ * action.accept(array[lo]);
+ * propagateCompletion();
+ * }
* }
+ * if (array.length > 0)
+ * new Task(null, 0, array.length).invoke();
* }}</pre>
*
- * Additional optimizations of such classes might entail precomputing
- * pending counts so that they can be established in constructors,
- * specializing classes for leaf steps, subdividing by say, four,
- * instead of two per iteration, and using an adaptive threshold
- * instead of always subdividing down to single elements.
+ * Additional optimizations of such classes might entail specializing
+ * classes for leaf steps, subdividing by say, four, instead of two
+ * per iteration, and using an adaptive threshold instead of always
+ * subdividing down to single elements.
*
* <p><b>Searching.</b> A tree of CountedCompleters can search for a
* value or property in different parts of a data structure, and
--- a/jdk/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/CyclicBarrier.java Mon Sep 12 22:04:48 2016 +0000
@@ -132,10 +132,10 @@
* <i>happen-before</i> actions following a successful return from the
* corresponding {@code await()} in other threads.
*
- * @since 1.5
* @see CountDownLatch
*
* @author Doug Lea
+ * @since 1.5
*/
public class CyclicBarrier {
/**
--- a/jdk/src/java.base/share/classes/java/util/concurrent/Flow.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/Flow.java Mon Sep 12 22:04:48 2016 +0000
@@ -68,7 +68,7 @@
* private boolean subscribed; // true after first subscribe
* public synchronized void subscribe(Subscriber<? super Boolean> subscriber) {
* if (subscribed)
- * subscriber.onError(new IllegalStateException()); // only one allowed
+ * subscriber.onError(new IllegalStateException()); // only one allowed
* else {
* subscribed = true;
* subscriber.onSubscribe(new OneShotSubscription(subscriber, executor));
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ForkJoinPool.java Mon Sep 12 22:04:48 2016 +0000
@@ -130,7 +130,7 @@
* </table>
*
* <p>The common pool is by default constructed with default
- * parameters, but these may be controlled by setting three
+ * parameters, but these may be controlled by setting the following
* {@linkplain System#getProperty system properties}:
* <ul>
* <li>{@code java.util.concurrent.ForkJoinPool.common.parallelism}
@@ -3241,7 +3241,7 @@
* An ACC to restrict permissions for the factory itself.
* The constructed workers have no permissions set.
*/
- private static final AccessControlContext innocuousAcc;
+ private static final AccessControlContext INNOCUOUS_ACC;
static {
Permissions innocuousPerms = new Permissions();
innocuousPerms.add(modifyThreadPermission);
@@ -3249,7 +3249,7 @@
"enableContextClassLoaderOverride"));
innocuousPerms.add(new RuntimePermission(
"modifyThreadGroup"));
- innocuousAcc = new AccessControlContext(new ProtectionDomain[] {
+ INNOCUOUS_ACC = new AccessControlContext(new ProtectionDomain[] {
new ProtectionDomain(null, innocuousPerms)
});
}
@@ -3260,7 +3260,7 @@
public ForkJoinWorkerThread run() {
return new ForkJoinWorkerThread.
InnocuousForkJoinWorkerThread(pool);
- }}, innocuousAcc);
+ }}, INNOCUOUS_ACC);
}
}
--- a/jdk/src/java.base/share/classes/java/util/concurrent/Semaphore.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/Semaphore.java Mon Sep 12 22:04:48 2016 +0000
@@ -72,8 +72,8 @@
* protected synchronized Object getNextAvailableItem() {
* for (int i = 0; i < MAX_AVAILABLE; ++i) {
* if (!used[i]) {
- * used[i] = true;
- * return items[i];
+ * used[i] = true;
+ * return items[i];
* }
* }
* return null; // not reached
@@ -82,11 +82,11 @@
* protected synchronized boolean markAsUnused(Object item) {
* for (int i = 0; i < MAX_AVAILABLE; ++i) {
* if (item == items[i]) {
- * if (used[i]) {
- * used[i] = false;
- * return true;
- * } else
- * return false;
+ * if (used[i]) {
+ * used[i] = false;
+ * return true;
+ * } else
+ * return false;
* }
* }
* return false;
--- a/jdk/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/SubmissionPublisher.java Mon Sep 12 22:04:48 2016 +0000
@@ -554,8 +554,9 @@
while (r != null) {
BufferedSubscription<T> nextRetry = r.nextRetry;
r.nextRetry = null;
- int stat = (nanos > 0L) ? r.timedOffer(item, nanos) :
- r.offer(item);
+ int stat = (nanos > 0L)
+ ? r.timedOffer(item, nanos)
+ : r.offer(item);
if (stat == 0 && onDrop != null &&
onDrop.test(r.subscriber, item))
stat = r.offer(item);
--- a/jdk/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/ThreadPoolExecutor.java Mon Sep 12 22:04:48 2016 +0000
@@ -617,6 +617,9 @@
/** Per-thread task counter */
volatile long completedTasks;
+ // TODO: switch to AbstractQueuedLongSynchronizer and move
+ // completedTasks into the lock word.
+
/**
* Creates with given first task and thread from ThreadFactory.
* @param firstTask the first task (null if none)
--- a/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/atomic/AtomicInteger.java Mon Sep 12 22:04:48 2016 +0000
@@ -193,7 +193,7 @@
/**
* Atomically increments the current value,
- * with memory effects as specified by {@link VarHandle#addAndGet}.
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
*
* <p>Equivalent to {@code addAndGet(1)}.
*
@@ -205,7 +205,7 @@
/**
* Atomically decrements the current value,
- * with memory effects as specified by {@link VarHandle#addAndGet}.
+ * with memory effects as specified by {@link VarHandle#getAndAdd}.
*
* <p>Equivalent to {@code addAndGet(-1)}.
*
--- a/jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/concurrent/locks/StampedLock.java Mon Sep 12 22:04:48 2016 +0000
@@ -154,13 +154,13 @@
* long stamp = sl.tryOptimisticRead();
* double currentX = x, currentY = y;
* if (!sl.validate(stamp)) {
- * stamp = sl.readLock();
- * try {
- * currentX = x;
- * currentY = y;
- * } finally {
- * sl.unlockRead(stamp);
- * }
+ * stamp = sl.readLock();
+ * try {
+ * currentX = x;
+ * currentY = y;
+ * } finally {
+ * sl.unlockRead(stamp);
+ * }
* }
* return Math.sqrt(currentX * currentX + currentY * currentY);
* }
--- a/jdk/src/java.base/share/classes/java/util/jar/JarFile.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/jar/JarFile.java Mon Sep 12 22:04:48 2016 +0000
@@ -836,18 +836,25 @@
private static final byte[] CLASSPATH_CHARS =
{'C','L','A','S','S','-','P','A','T','H', ':', ' '};
- // The bad character shift for "class-path:"
+ // The bad character shift for "class-path: "
private static final byte[] CLASSPATH_LASTOCC;
+ // The good suffix shift for "class-path: "
+ private static final byte[] CLASSPATH_OPTOSFT;
+
private static final byte[] MULTIRELEASE_CHARS =
{'M','U','L','T','I','-','R','E','L','E', 'A', 'S', 'E', ':',
' ', 'T', 'R', 'U', 'E'};
- // The bad character shift for "multi-release: "
+ // The bad character shift for "multi-release: true"
private static final byte[] MULTIRELEASE_LASTOCC;
+ // The good suffix shift for "multi-release: true"
+ private static final byte[] MULTIRELEASE_OPTOSFT;
+
static {
CLASSPATH_LASTOCC = new byte[64];
+ CLASSPATH_OPTOSFT = new byte[12];
CLASSPATH_LASTOCC[(int)'C' - 32] = 1;
CLASSPATH_LASTOCC[(int)'L' - 32] = 2;
CLASSPATH_LASTOCC[(int)'S' - 32] = 5;
@@ -858,8 +865,13 @@
CLASSPATH_LASTOCC[(int)'H' - 32] = 10;
CLASSPATH_LASTOCC[(int)':' - 32] = 11;
CLASSPATH_LASTOCC[(int)' ' - 32] = 12;
+ for (int i = 0; i < 11; i++) {
+ CLASSPATH_OPTOSFT[i] = 12;
+ }
+ CLASSPATH_OPTOSFT[11] = 1;
MULTIRELEASE_LASTOCC = new byte[64];
+ MULTIRELEASE_OPTOSFT = new byte[19];
MULTIRELEASE_LASTOCC[(int)'M' - 32] = 1;
MULTIRELEASE_LASTOCC[(int)'I' - 32] = 5;
MULTIRELEASE_LASTOCC[(int)'-' - 32] = 6;
@@ -872,6 +884,11 @@
MULTIRELEASE_LASTOCC[(int)'R' - 32] = 17;
MULTIRELEASE_LASTOCC[(int)'U' - 32] = 18;
MULTIRELEASE_LASTOCC[(int)'E' - 32] = 19;
+ for (int i = 0; i < 17; i++) {
+ MULTIRELEASE_OPTOSFT[i] = 19;
+ }
+ MULTIRELEASE_OPTOSFT[17] = 6;
+ MULTIRELEASE_OPTOSFT[18] = 1;
}
private JarEntry getManEntry() {
@@ -913,7 +930,7 @@
* Since there are no repeated substring in our search strings,
* the good suffix shifts can be replaced with a comparison.
*/
- private int match(byte[] src, byte[] b, byte[] lastOcc) {
+ private int match(byte[] src, byte[] b, byte[] lastOcc, byte[] optoSft) {
int len = src.length;
int last = b.length - len;
int i = 0;
@@ -926,9 +943,8 @@
if (c != src[j]) {
// no match
- int goodShift = (j < len - 1) ? len : 1;
int badShift = lastOcc[c - 32];
- i += Math.max(j + 1 - badShift, goodShift);
+ i += Math.max(j + 1 - badShift, optoSft[j]);
continue next;
}
} else {
@@ -958,10 +974,11 @@
if (manEntry != null) {
byte[] b = getBytes(manEntry);
hasClassPathAttribute = match(CLASSPATH_CHARS, b,
- CLASSPATH_LASTOCC) != -1;
+ CLASSPATH_LASTOCC, CLASSPATH_OPTOSFT) != -1;
// is this a multi-release jar file
if (MULTI_RELEASE_ENABLED) {
- int i = match(MULTIRELEASE_CHARS, b, MULTIRELEASE_LASTOCC);
+ int i = match(MULTIRELEASE_CHARS, b, MULTIRELEASE_LASTOCC,
+ MULTIRELEASE_OPTOSFT);
if (i != -1) {
i += MULTIRELEASE_CHARS.length;
if (i < b.length) {
--- a/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/stream/DoubleStream.java Mon Sep 12 22:04:48 2016 +0000
@@ -567,19 +567,23 @@
* <p>This is a <a href="package-summary.html#StreamOps">terminal
* operation</a>.
*
- * @param <R> type of the result
- * @param supplier a function that creates a new result container. For a
- * parallel execution, this function may be called
+ * @param <R> the type of the mutable result container
+ * @param supplier a function that creates a new mutable result container.
+ * For a parallel execution, this function may be called
* multiple times and must return a fresh value each time.
* @param accumulator an <a href="package-summary.html#Associativity">associative</a>,
* <a href="package-summary.html#NonInterference">non-interfering</a>,
* <a href="package-summary.html#Statelessness">stateless</a>
- * function for incorporating an additional element into a result
+ * function that must fold an element into a result
+ * container.
* @param combiner an <a href="package-summary.html#Associativity">associative</a>,
* <a href="package-summary.html#NonInterference">non-interfering</a>,
* <a href="package-summary.html#Statelessness">stateless</a>
- * function for combining two values, which must be
- * compatible with the accumulator function
+ * function that accepts two partial result containers
+ * and merges them, which must be compatible with the
+ * accumulator function. The combiner function must fold
+ * the elements from the second result container into the
+ * first result container.
* @return the result of the reduction
* @see Stream#collect(Supplier, BiConsumer, BiConsumer)
*/
@@ -947,6 +951,12 @@
* position {@code n}, will be the result of applying the function {@code f}
* to the element at position {@code n - 1}.
*
+ * <p>The action of applying {@code f} for one element
+ * <a href="../concurrent/package-summary.html#MemoryVisibility"><i>happens-before</i></a>
+ * the action of applying {@code f} for subsequent elements. For any given
+ * element the action may be performed in whatever thread the library
+ * chooses.
+ *
* @param seed the initial element
* @param f a function to be applied to the previous element to produce
* a new element
@@ -978,37 +988,44 @@
/**
* Returns a sequential ordered {@code DoubleStream} produced by iterative
- * application of a function to an initial element, conditioned on
- * satisfying the supplied predicate. The stream terminates as soon as
- * the predicate returns false.
+ * application of the given {@code next} function to an initial element,
+ * conditioned on satisfying the given {@code hasNext} predicate. The
+ * stream terminates as soon as the {@code hasNext} predicate returns false.
*
- * <p>
- * {@code DoubleStream.iterate} should produce the same sequence of
- * elements as produced by the corresponding for-loop:
+ * <p>{@code DoubleStream.iterate} should produce the same sequence of elements as
+ * produced by the corresponding for-loop:
* <pre>{@code
- * for (double index=seed; predicate.test(index); index = f.applyAsDouble(index)) {
+ * for (double index=seed; hasNext.test(index); index = next.applyAsDouble(index)) {
* ...
* }
* }</pre>
*
- * <p>
- * The resulting sequence may be empty if the predicate does not hold on
- * the seed value. Otherwise the first element will be the supplied seed
- * value, the next element (if present) will be the result of applying the
- * function f to the seed value, and so on iteratively until the predicate
- * indicates that the stream should terminate.
+ * <p>The resulting sequence may be empty if the {@code hasNext} predicate
+ * does not hold on the seed value. Otherwise the first element will be the
+ * supplied {@code seed} value, the next element (if present) will be the
+ * result of applying the {@code next} function to the {@code seed} value,
+ * and so on iteratively until the {@code hasNext} predicate indicates that
+ * the stream should terminate.
+ *
+ * <p>The action of applying the {@code hasNext} predicate to an element
+ * <a href="../concurrent/package-summary.html#MemoryVisibility"><i>happens-before</i></a>
+ * the action of applying the {@code next} function to that element. The
+ * action of applying the {@code next} function for one element
+ * <i>happens-before</i> the action of applying the {@code hasNext}
+ * predicate for subsequent elements. For any given element an action may
+ * be performed in whatever thread the library chooses.
*
* @param seed the initial element
- * @param predicate a predicate to apply to elements to determine when the
- * stream must terminate.
- * @param f a function to be applied to the previous element to produce
- * a new element
+ * @param hasNext a predicate to apply to elements to determine when the
+ * stream must terminate.
+ * @param next a function to be applied to the previous element to produce
+ * a new element
* @return a new sequential {@code DoubleStream}
* @since 9
*/
- public static DoubleStream iterate(double seed, DoublePredicate predicate, DoubleUnaryOperator f) {
- Objects.requireNonNull(f);
- Objects.requireNonNull(predicate);
+ public static DoubleStream iterate(double seed, DoublePredicate hasNext, DoubleUnaryOperator next) {
+ Objects.requireNonNull(next);
+ Objects.requireNonNull(hasNext);
Spliterator.OfDouble spliterator = new Spliterators.AbstractDoubleSpliterator(Long.MAX_VALUE,
Spliterator.ORDERED | Spliterator.IMMUTABLE | Spliterator.NONNULL) {
double prev;
@@ -1021,12 +1038,12 @@
return false;
double t;
if (started)
- t = f.applyAsDouble(prev);
+ t = next.applyAsDouble(prev);
else {
t = seed;
started = true;
}
- if (!predicate.test(t)) {
+ if (!hasNext.test(t)) {
finished = true;
return false;
}
@@ -1040,10 +1057,10 @@
if (finished)
return;
finished = true;
- double t = started ? f.applyAsDouble(prev) : seed;
- while (predicate.test(t)) {
+ double t = started ? next.applyAsDouble(prev) : seed;
+ while (hasNext.test(t)) {
action.accept(t);
- t = f.applyAsDouble(t);
+ t = next.applyAsDouble(t);
}
}
};
--- a/jdk/src/java.base/share/classes/java/util/stream/IntStream.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/stream/IntStream.java Mon Sep 12 22:04:48 2016 +0000
@@ -562,19 +562,23 @@
* <p>This is a <a href="package-summary.html#StreamOps">terminal
* operation</a>.
*
- * @param <R> type of the result
- * @param supplier a function that creates a new result container. For a
- * parallel execution, this function may be called
+ * @param <R> the type of the mutable result container
+ * @param supplier a function that creates a new mutable result container.
+ * For a parallel execution, this function may be called
* multiple times and must return a fresh value each time.
* @param accumulator an <a href="package-summary.html#Associativity">associative</a>,
* <a href="package-summary.html#NonInterference">non-interfering</a>,
* <a href="package-summary.html#Statelessness">stateless</a>
- * function for incorporating an additional element into a result
+ * function that must fold an element into a result
+ * container.
* @param combiner an <a href="package-summary.html#Associativity">associative</a>,
* <a href="package-summary.html#NonInterference">non-interfering</a>,
* <a href="package-summary.html#Statelessness">stateless</a>
- * function for combining two values, which must be
- * compatible with the accumulator function
+ * function that accepts two partial result containers
+ * and merges them, which must be compatible with the
+ * accumulator function. The combiner function must fold
+ * the elements from the second result container into the
+ * first result container.
* @return the result of the reduction
* @see Stream#collect(Supplier, BiConsumer, BiConsumer)
*/
@@ -887,6 +891,12 @@
* {@code n}, will be the result of applying the function {@code f} to the
* element at position {@code n - 1}.
*
+ * <p>The action of applying {@code f} for one element
+ * <a href="../concurrent/package-summary.html#MemoryVisibility"><i>happens-before</i></a>
+ * the action of applying {@code f} for subsequent elements. For any given
+ * element the action may be performed in whatever thread the library
+ * chooses.
+ *
* @param seed the initial element
* @param f a function to be applied to the previous element to produce
* a new element
@@ -918,37 +928,44 @@
/**
* Returns a sequential ordered {@code IntStream} produced by iterative
- * application of a function to an initial element, conditioned on
- * satisfying the supplied predicate. The stream terminates as soon as
- * the predicate returns false.
+ * application of the given {@code next} function to an initial element,
+ * conditioned on satisfying the given {@code hasNext} predicate. The
+ * stream terminates as soon as the {@code hasNext} predicate returns false.
*
- * <p>
- * {@code IntStream.iterate} should produce the same sequence of elements
- * as produced by the corresponding for-loop:
+ * <p>{@code IntStream.iterate} should produce the same sequence of elements as
+ * produced by the corresponding for-loop:
* <pre>{@code
- * for (int index=seed; predicate.test(index); index = f.applyAsInt(index)) {
+ * for (int index=seed; hasNext.test(index); index = next.applyAsInt(index)) {
* ...
* }
* }</pre>
*
- * <p>
- * The resulting sequence may be empty if the predicate does not hold on
- * the seed value. Otherwise the first element will be the supplied seed
- * value, the next element (if present) will be the result of applying the
- * function f to the seed value, and so on iteratively until the predicate
- * indicates that the stream should terminate.
+ * <p>The resulting sequence may be empty if the {@code hasNext} predicate
+ * does not hold on the seed value. Otherwise the first element will be the
+ * supplied {@code seed} value, the next element (if present) will be the
+ * result of applying the {@code next} function to the {@code seed} value,
+ * and so on iteratively until the {@code hasNext} predicate indicates that
+ * the stream should terminate.
+ *
+ * <p>The action of applying the {@code hasNext} predicate to an element
+ * <a href="../concurrent/package-summary.html#MemoryVisibility"><i>happens-before</i></a>
+ * the action of applying the {@code next} function to that element. The
+ * action of applying the {@code next} function for one element
+ * <i>happens-before</i> the action of applying the {@code hasNext}
+ * predicate for subsequent elements. For any given element an action may
+ * be performed in whatever thread the library chooses.
*
* @param seed the initial element
- * @param predicate a predicate to apply to elements to determine when the
- * stream must terminate.
- * @param f a function to be applied to the previous element to produce
- * a new element
+ * @param hasNext a predicate to apply to elements to determine when the
+ * stream must terminate.
+ * @param next a function to be applied to the previous element to produce
+ * a new element
* @return a new sequential {@code IntStream}
* @since 9
*/
- public static IntStream iterate(int seed, IntPredicate predicate, IntUnaryOperator f) {
- Objects.requireNonNull(f);
- Objects.requireNonNull(predicate);
+ public static IntStream iterate(int seed, IntPredicate hasNext, IntUnaryOperator next) {
+ Objects.requireNonNull(next);
+ Objects.requireNonNull(hasNext);
Spliterator.OfInt spliterator = new Spliterators.AbstractIntSpliterator(Long.MAX_VALUE,
Spliterator.ORDERED | Spliterator.IMMUTABLE | Spliterator.NONNULL) {
int prev;
@@ -961,12 +978,12 @@
return false;
int t;
if (started)
- t = f.applyAsInt(prev);
+ t = next.applyAsInt(prev);
else {
t = seed;
started = true;
}
- if (!predicate.test(t)) {
+ if (!hasNext.test(t)) {
finished = true;
return false;
}
@@ -980,10 +997,10 @@
if (finished)
return;
finished = true;
- int t = started ? f.applyAsInt(prev) : seed;
- while (predicate.test(t)) {
+ int t = started ? next.applyAsInt(prev) : seed;
+ while (hasNext.test(t)) {
action.accept(t);
- t = f.applyAsInt(t);
+ t = next.applyAsInt(t);
}
}
};
--- a/jdk/src/java.base/share/classes/java/util/stream/LongStream.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/stream/LongStream.java Mon Sep 12 22:04:48 2016 +0000
@@ -564,19 +564,23 @@
* <p>This is a <a href="package-summary.html#StreamOps">terminal
* operation</a>.
*
- * @param <R> type of the result
- * @param supplier a function that creates a new result container. For a
- * parallel execution, this function may be called
+ * @param <R> the type of the mutable result container
+ * @param supplier a function that creates a new mutable result container.
+ * For a parallel execution, this function may be called
* multiple times and must return a fresh value each time.
* @param accumulator an <a href="package-summary.html#Associativity">associative</a>,
* <a href="package-summary.html#NonInterference">non-interfering</a>,
* <a href="package-summary.html#Statelessness">stateless</a>
- * function for incorporating an additional element into a result
+ * function that must fold an element into a result
+ * container.
* @param combiner an <a href="package-summary.html#Associativity">associative</a>,
* <a href="package-summary.html#NonInterference">non-interfering</a>,
* <a href="package-summary.html#Statelessness">stateless</a>
- * function for combining two values, which must be
- * compatible with the accumulator function
+ * function that accepts two partial result containers
+ * and merges them, which must be compatible with the
+ * accumulator function. The combiner function must fold
+ * the elements from the second result container into the
+ * first result container.
* @return the result of the reduction
* @see Stream#collect(Supplier, BiConsumer, BiConsumer)
*/
@@ -877,6 +881,12 @@
* {@code n}, will be the result of applying the function {@code f} to the
* element at position {@code n - 1}.
*
+ * <p>The action of applying {@code f} for one element
+ * <a href="../concurrent/package-summary.html#MemoryVisibility"><i>happens-before</i></a>
+ * the action of applying {@code f} for subsequent elements. For any given
+ * element the action may be performed in whatever thread the library
+ * chooses.
+ *
* @param seed the initial element
* @param f a function to be applied to the previous element to produce
* a new element
@@ -908,37 +918,44 @@
/**
* Returns a sequential ordered {@code LongStream} produced by iterative
- * application of a function to an initial element, conditioned on
- * satisfying the supplied predicate. The stream terminates as soon as
- * the predicate returns false.
+ * application of the given {@code next} function to an initial element,
+ * conditioned on satisfying the given {@code hasNext} predicate. The
+ * stream terminates as soon as the {@code hasNext} predicate returns false.
*
- * <p>
- * {@code LongStream.iterate} should produce the same sequence of elements
- * as produced by the corresponding for-loop:
+ * <p>{@code LongStream.iterate} should produce the same sequence of elements as
+ * produced by the corresponding for-loop:
* <pre>{@code
- * for (long index=seed; predicate.test(index); index = f.applyAsLong(index)) {
+ * for (long index=seed; hasNext.test(index); index = next.applyAsLong(index)) {
* ...
* }
* }</pre>
*
- * <p>
- * The resulting sequence may be empty if the predicate does not hold on
- * the seed value. Otherwise the first element will be the supplied seed
- * value, the next element (if present) will be the result of applying the
- * function f to the seed value, and so on iteratively until the predicate
- * indicates that the stream should terminate.
+ * <p>The resulting sequence may be empty if the {@code hasNext} predicate
+ * does not hold on the seed value. Otherwise the first element will be the
+ * supplied {@code seed} value, the next element (if present) will be the
+ * result of applying the {@code next} function to the {@code seed} value,
+ * and so on iteratively until the {@code hasNext} predicate indicates that
+ * the stream should terminate.
+ *
+ * <p>The action of applying the {@code hasNext} predicate to an element
+ * <a href="../concurrent/package-summary.html#MemoryVisibility"><i>happens-before</i></a>
+ * the action of applying the {@code next} function to that element. The
+ * action of applying the {@code next} function for one element
+ * <i>happens-before</i> the action of applying the {@code hasNext}
+ * predicate for subsequent elements. For any given element an action may
+ * be performed in whatever thread the library chooses.
*
* @param seed the initial element
- * @param predicate a predicate to apply to elements to determine when the
- * stream must terminate.
- * @param f a function to be applied to the previous element to produce
- * a new element
+ * @param hasNext a predicate to apply to elements to determine when the
+ * stream must terminate.
+ * @param next a function to be applied to the previous element to produce
+ * a new element
* @return a new sequential {@code LongStream}
* @since 9
*/
- public static LongStream iterate(long seed, LongPredicate predicate, LongUnaryOperator f) {
- Objects.requireNonNull(f);
- Objects.requireNonNull(predicate);
+ public static LongStream iterate(long seed, LongPredicate hasNext, LongUnaryOperator next) {
+ Objects.requireNonNull(next);
+ Objects.requireNonNull(hasNext);
Spliterator.OfLong spliterator = new Spliterators.AbstractLongSpliterator(Long.MAX_VALUE,
Spliterator.ORDERED | Spliterator.IMMUTABLE | Spliterator.NONNULL) {
long prev;
@@ -951,12 +968,12 @@
return false;
long t;
if (started)
- t = f.applyAsLong(prev);
+ t = next.applyAsLong(prev);
else {
t = seed;
started = true;
}
- if (!predicate.test(t)) {
+ if (!hasNext.test(t)) {
finished = true;
return false;
}
@@ -970,10 +987,10 @@
if (finished)
return;
finished = true;
- long t = started ? f.applyAsLong(prev) : seed;
- while (predicate.test(t)) {
+ long t = started ? next.applyAsLong(prev) : seed;
+ while (hasNext.test(t)) {
action.accept(t);
- t = f.applyAsLong(t);
+ t = next.applyAsLong(t);
}
}
};
--- a/jdk/src/java.base/share/classes/java/util/stream/Stream.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/java/util/stream/Stream.java Mon Sep 12 22:04:48 2016 +0000
@@ -882,19 +882,23 @@
* .toString();
* }</pre>
*
- * @param <R> type of the result
- * @param supplier a function that creates a new result container. For a
- * parallel execution, this function may be called
+ * @param <R> the type of the mutable result container
+ * @param supplier a function that creates a new mutable result container.
+ * For a parallel execution, this function may be called
* multiple times and must return a fresh value each time.
* @param accumulator an <a href="package-summary.html#Associativity">associative</a>,
* <a href="package-summary.html#NonInterference">non-interfering</a>,
* <a href="package-summary.html#Statelessness">stateless</a>
- * function for incorporating an additional element into a result
+ * function that must fold an element into a result
+ * container.
* @param combiner an <a href="package-summary.html#Associativity">associative</a>,
* <a href="package-summary.html#NonInterference">non-interfering</a>,
* <a href="package-summary.html#Statelessness">stateless</a>
- * function for combining two values, which must be
- * compatible with the accumulator function
+ * function that accepts two partial result containers
+ * and merges them, which must be compatible with the
+ * accumulator function. The combiner function must fold
+ * the elements from the second result container into the
+ * first result container.
* @return the result of the reduction
*/
<R> R collect(Supplier<R> supplier,
@@ -1194,6 +1198,12 @@
* {@code n}, will be the result of applying the function {@code f} to the
* element at position {@code n - 1}.
*
+ * <p>The action of applying {@code f} for one element
+ * <a href="../concurrent/package-summary.html#MemoryVisibility"><i>happens-before</i></a>
+ * the action of applying {@code f} for subsequent elements. For any given
+ * element the action may be performed in whatever thread the library
+ * chooses.
+ *
* @param <T> the type of stream elements
* @param seed the initial element
* @param f a function to be applied to the previous element to produce
@@ -1226,38 +1236,45 @@
/**
* Returns a sequential ordered {@code Stream} produced by iterative
- * application of a function to an initial element, conditioned on
- * satisfying the supplied predicate. The stream terminates as soon as
- * the predicate returns false.
+ * application of the given {@code next} function to an initial element,
+ * conditioned on satisfying the given {@code hasNext} predicate. The
+ * stream terminates as soon as the {@code hasNext} predicate returns false.
*
- * <p>
- * {@code Stream.iterate} should produce the same sequence of elements as
+ * <p>{@code Stream.iterate} should produce the same sequence of elements as
* produced by the corresponding for-loop:
* <pre>{@code
- * for (T index=seed; predicate.test(index); index = f.apply(index)) {
+ * for (T index=seed; hasNext.test(index); index = next.apply(index)) {
* ...
* }
* }</pre>
*
- * <p>
- * The resulting sequence may be empty if the predicate does not hold on
- * the seed value. Otherwise the first element will be the supplied seed
- * value, the next element (if present) will be the result of applying the
- * function f to the seed value, and so on iteratively until the predicate
- * indicates that the stream should terminate.
+ * <p>The resulting sequence may be empty if the {@code hasNext} predicate
+ * does not hold on the seed value. Otherwise the first element will be the
+ * supplied {@code seed} value, the next element (if present) will be the
+ * result of applying the {@code next} function to the {@code seed} value,
+ * and so on iteratively until the {@code hasNext} predicate indicates that
+ * the stream should terminate.
+ *
+ * <p>The action of applying the {@code hasNext} predicate to an element
+ * <a href="../concurrent/package-summary.html#MemoryVisibility"><i>happens-before</i></a>
+ * the action of applying the {@code next} function to that element. The
+ * action of applying the {@code next} function for one element
+ * <i>happens-before</i> the action of applying the {@code hasNext}
+ * predicate for subsequent elements. For any given element an action may
+ * be performed in whatever thread the library chooses.
*
* @param <T> the type of stream elements
* @param seed the initial element
- * @param predicate a predicate to apply to elements to determine when the
- * stream must terminate.
- * @param f a function to be applied to the previous element to produce
- * a new element
+ * @param hasNext a predicate to apply to elements to determine when the
+ * stream must terminate.
+ * @param next a function to be applied to the previous element to produce
+ * a new element
* @return a new sequential {@code Stream}
* @since 9
*/
- public static<T> Stream<T> iterate(T seed, Predicate<? super T> predicate, UnaryOperator<T> f) {
- Objects.requireNonNull(f);
- Objects.requireNonNull(predicate);
+ public static<T> Stream<T> iterate(T seed, Predicate<? super T> hasNext, UnaryOperator<T> next) {
+ Objects.requireNonNull(next);
+ Objects.requireNonNull(hasNext);
Spliterator<T> spliterator = new Spliterators.AbstractSpliterator<>(Long.MAX_VALUE,
Spliterator.ORDERED | Spliterator.IMMUTABLE) {
T prev;
@@ -1270,12 +1287,12 @@
return false;
T t;
if (started)
- t = f.apply(prev);
+ t = next.apply(prev);
else {
t = seed;
started = true;
}
- if (!predicate.test(t)) {
+ if (!hasNext.test(t)) {
prev = null;
finished = true;
return false;
@@ -1290,11 +1307,11 @@
if (finished)
return;
finished = true;
- T t = started ? f.apply(prev) : seed;
+ T t = started ? next.apply(prev) : seed;
prev = null;
- while (predicate.test(t)) {
+ while (hasNext.test(t)) {
action.accept(t);
- t = f.apply(t);
+ t = next.apply(t);
}
}
};
--- a/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/jdk/internal/org/objectweb/asm/commons/SerialVersionUIDAdder.java Mon Sep 12 22:04:48 2016 +0000
@@ -80,7 +80,7 @@
* ClassWriter cw = new ClassWriter(...);
* ClassVisitor sv = new SerialVersionUIDAdder(cw);
* ClassVisitor ca = new MyClassAdapter(sv);
- * new ClassReader(orginalClass).accept(ca, false);
+ * new ClassReader(originalClass).accept(ca, false);
* </pre>
*
* The SVUID algorithm can be found <a href=
--- a/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/sun/security/ssl/ClientHandshaker.java Mon Sep 12 22:04:48 2016 +0000
@@ -1185,7 +1185,7 @@
/*
* FOURTH, if we sent a Certificate, we need to send a signed
* CertificateVerify (unless the key in the client's certificate
- * was a Diffie-Hellman key).).
+ * was a Diffie-Hellman key).
*
* This uses a hash of the previous handshake messages ... either
* a nonfinal one (if the particular implementation supports it)
--- a/jdk/src/java.base/share/classes/sun/text/resources/BreakIteratorRulesProvider.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 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. 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.text.resources;
-
-import java.util.spi.ResourceBundleProvider;
-
-/**
- * An interface for the internal locale data provider for which {@code ResourceBundle}
- * searches.
- */
-public interface BreakIteratorRulesProvider extends ResourceBundleProvider {
-}
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/BreakDictionary.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/BreakDictionary.java Mon Sep 12 22:04:48 2016 +0000
@@ -149,7 +149,10 @@
BufferedInputStream in;
try {
PrivilegedExceptionAction<BufferedInputStream> pa = () -> {
- InputStream is = module.getResourceAsStream("sun/text/resources/" + dictionaryName);
+ String pathName = "jdk.localedata".equals(module.getName()) ?
+ "sun/text/resources/ext/" :
+ "sun/text/resources/";
+ InputStream is = module.getResourceAsStream(pathName + dictionaryName);
if (is == null) {
// Try to load the file with "java.base" module instance. Assumption
// here is that the fall back data files to be read should reside in
--- a/jdk/src/java.base/share/classes/sun/util/locale/provider/RuleBasedBreakIterator.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/share/classes/sun/util/locale/provider/RuleBasedBreakIterator.java Mon Sep 12 22:04:48 2016 +0000
@@ -444,7 +444,10 @@
BufferedInputStream is;
try {
PrivilegedExceptionAction<BufferedInputStream> pa = () -> {
- InputStream in = module.getResourceAsStream("sun/text/resources/" + datafile);
+ String pathName = "jdk.localedata".equals(module.getName()) ?
+ "sun/text/resources/ext/" :
+ "sun/text/resources/";
+ InputStream in = module.getResourceAsStream(pathName + datafile);
if (in == null) {
// Try to load the file with "java.base" module instance. Assumption
// here is that the fall back data files to be read should reside in
--- a/jdk/src/java.base/unix/native/libjava/ProcessImpl_md.c Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/unix/native/libjava/ProcessImpl_md.c Mon Sep 12 22:04:48 2016 +0000
@@ -349,6 +349,8 @@
__attribute_noinline__
#endif
+/* vfork(2) is deprecated on Solaris */
+#ifndef __solaris__
static pid_t
vforkChild(ChildStuff *c) {
volatile pid_t resultPid;
@@ -367,6 +369,7 @@
assert(resultPid != 0); /* childProcess never returns */
return resultPid;
}
+#endif
static pid_t
forkChild(ChildStuff *c) {
@@ -479,8 +482,11 @@
static pid_t
startChild(JNIEnv *env, jobject process, ChildStuff *c, const char *helperpath) {
switch (c->mode) {
+/* vfork(2) is deprecated on Solaris */
+#ifndef __solaris__
case MODE_VFORK:
return vforkChild(c);
+#endif
case MODE_FORK:
return forkChild(c);
#if defined(__solaris__) || defined(_ALLBSD_SOURCE) || defined(_AIX)
--- a/jdk/src/java.base/unix/native/libnet/NetworkInterface.c Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/unix/native/libnet/NetworkInterface.c Mon Sep 12 22:04:48 2016 +0000
@@ -80,6 +80,12 @@
#define DEV_PREFIX "/dev/"
#endif
+#ifdef LIFNAMSIZ
+ #define IFNAMESIZE LIFNAMSIZ
+#else
+ #define IFNAMESIZE IFNAMSIZ
+#endif
+
#define CHECKED_MALLOC3(_pointer, _type, _size) \
do { \
_pointer = (_type)malloc(_size); \
@@ -158,7 +164,7 @@
static int getIndex(int sock, const char *ifname);
static int getFlags(int sock, const char *ifname, int *flags);
-static int getMacAddress(JNIEnv *env, int sock, const char *ifname,
+static int getMacAddress(JNIEnv *env, const char *ifname,
const struct in_addr *addr, unsigned char *buf);
static int getMTU(JNIEnv *env, int sock, const char *ifname);
@@ -237,20 +243,25 @@
const char* name_utf;
jobject obj = NULL;
+ if (name != NULL) {
+ name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
+ } else {
+ JNU_ThrowNullPointerException(env, "network interface name is NULL");
+ return NULL;
+ }
+
+ if (name_utf == NULL) {
+ if (!(*env)->ExceptionCheck(env))
+ JNU_ThrowOutOfMemoryError(env, NULL);
+ return NULL;
+ }
+
ifs = enumInterfaces(env);
if (ifs == NULL) {
return NULL;
}
- name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
- if (name_utf == NULL) {
- if (!(*env)->ExceptionCheck(env))
- JNU_ThrowOutOfMemoryError(env, NULL);
- freeif(ifs);
- return NULL;
- }
-
- // Search the list of interface based on name
+ // search the list of interfaces based on name
curr = ifs;
while (curr != NULL) {
if (strcmp(name_utf, curr->name) == 0) {
@@ -285,12 +296,13 @@
if (index <= 0) {
return NULL;
}
+
ifs = enumInterfaces(env);
if (ifs == NULL) {
return NULL;
}
- // Search the list of interface based on index
+ // search the list of interfaces based on index
curr = ifs;
while (curr != NULL) {
if (index == curr->index) {
@@ -304,7 +316,9 @@
obj = createNetworkInterface(env, curr);
}
+ // release the interface list
freeif(ifs);
+
return obj;
}
@@ -317,13 +331,11 @@
(JNIEnv *env, jclass cls, jobject iaObj)
{
netif *ifs, *curr;
-
#if defined(AF_INET6)
int family = (getInetAddress_family(env, iaObj) == IPv4) ? AF_INET : AF_INET6;
#else
int family = AF_INET;
#endif
-
jobject obj = NULL;
jboolean match = JNI_FALSE;
@@ -342,7 +354,7 @@
if (family == addrP->family) {
if (family == AF_INET) {
int address1 = htonl(
- ((struct sockaddr_in*)addrP->addr)->sin_addr.s_addr);
+ ((struct sockaddr_in *)addrP->addr)->sin_addr.s_addr);
int address2 = getInetAddress_addr(env, iaObj);
if (address1 == address2) {
@@ -350,7 +362,6 @@
break;
}
}
-
#if defined(AF_INET6)
if (family == AF_INET6) {
jbyte *bytes = (jbyte *)&(
@@ -390,7 +401,9 @@
obj = createNetworkInterface(env, curr);
}
+ // release the interface list
freeif(ifs);
+
return obj;
}
@@ -411,7 +424,7 @@
return NULL;
}
- // count the interface
+ // count the interfaces
ifCount = 0;
curr = ifs;
while (curr != NULL) {
@@ -426,8 +439,8 @@
return NULL;
}
- // Iterate through the interfaces, create a NetworkInterface instance
- // for each array element and populate the object.
+ // iterate through the interfaces, create a NetworkInterface instance
+ // for each array element and populate the object
curr = ifs;
arr_index = 0;
while (curr != NULL) {
@@ -445,7 +458,9 @@
curr = curr->next;
}
+ // release the interface list
freeif(ifs);
+
return netIFArr;
}
@@ -511,46 +526,45 @@
jbyteArray ret = NULL;
unsigned char mac[16];
int len;
- int sock;
jboolean isCopy;
- const char* name_utf;
+ const char *name_utf;
- name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
+ if (name != NULL) {
+ name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
+ } else {
+ JNU_ThrowNullPointerException(env, "network interface name is NULL");
+ return NULL;
+ }
+
if (name_utf == NULL) {
- if (!(*env)->ExceptionCheck(env))
- JNU_ThrowOutOfMemoryError(env, NULL);
- return NULL;
- }
- if ((sock = openSocketWithFallback(env, name_utf)) < 0) {
- (*env)->ReleaseStringUTFChars(env, name, name_utf);
- return NULL;
+ if (!(*env)->ExceptionCheck(env))
+ JNU_ThrowOutOfMemoryError(env, NULL);
+ return NULL;
}
if (!IS_NULL(addrArray)) {
- (*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr);
- addr = ((caddr[0]<<24) & 0xff000000);
- addr |= ((caddr[1] <<16) & 0xff0000);
- addr |= ((caddr[2] <<8) & 0xff00);
- addr |= (caddr[3] & 0xff);
- iaddr.s_addr = htonl(addr);
- len = getMacAddress(env, sock, name_utf, &iaddr, mac);
+ (*env)->GetByteArrayRegion(env, addrArray, 0, 4, caddr);
+ addr = ((caddr[0]<<24) & 0xff000000);
+ addr |= ((caddr[1] <<16) & 0xff0000);
+ addr |= ((caddr[2] <<8) & 0xff00);
+ addr |= (caddr[3] & 0xff);
+ iaddr.s_addr = htonl(addr);
+ len = getMacAddress(env, name_utf, &iaddr, mac);
} else {
- len = getMacAddress(env, sock, name_utf, NULL, mac);
+ len = getMacAddress(env, name_utf, NULL, mac);
}
+
if (len > 0) {
- ret = (*env)->NewByteArray(env, len);
- if (IS_NULL(ret)) {
- /* we may have memory to free at the end of this */
- goto fexit;
- }
- (*env)->SetByteArrayRegion(env, ret, 0, len, (jbyte *)(mac));
+ ret = (*env)->NewByteArray(env, len);
+ if (!IS_NULL(ret)) {
+ (*env)->SetByteArrayRegion(env, ret, 0, len, (jbyte *)(mac));
+ }
}
- fexit:
- // release the UTF string and interface list
- (*env)->ReleaseStringUTFChars(env, name, name_utf);
- close(sock);
- return ret;
+ // release the UTF string and interface list
+ (*env)->ReleaseStringUTFChars(env, name, name_utf);
+
+ return ret;
}
/*
@@ -562,8 +576,7 @@
(JNIEnv *env, jclass cls, jstring name, jint index)
{
jboolean isCopy;
- int ret = -1;
- int sock;
+ int sock, ret = -1;
const char* name_utf = NULL;
if (name != NULL) {
@@ -572,15 +585,16 @@
JNU_ThrowNullPointerException(env, "network interface name is NULL");
return ret;
}
+
if (name_utf == NULL) {
- if (!(*env)->ExceptionCheck(env))
- JNU_ThrowOutOfMemoryError(env, NULL);
- return ret;
+ if (!(*env)->ExceptionCheck(env))
+ JNU_ThrowOutOfMemoryError(env, NULL);
+ return ret;
}
if ((sock = openSocketWithFallback(env, name_utf)) < 0) {
- (*env)->ReleaseStringUTFChars(env, name, name_utf);
- return JNI_FALSE;
+ (*env)->ReleaseStringUTFChars(env, name, name_utf);
+ return JNI_FALSE;
}
ret = getMTU(env, sock, name_utf);
@@ -595,9 +609,8 @@
static int getFlags0(JNIEnv *env, jstring name) {
jboolean isCopy;
- int ret, sock;
- const char* name_utf;
- int flags = 0;
+ int ret, sock, flags = 0;
+ const char *name_utf;
if (name != NULL) {
name_utf = (*env)->GetStringUTFChars(env, name, &isCopy);
@@ -607,9 +620,9 @@
}
if (name_utf == NULL) {
- if (!(*env)->ExceptionCheck(env))
- JNU_ThrowOutOfMemoryError(env, NULL);
- return -1;
+ if (!(*env)->ExceptionCheck(env))
+ JNU_ThrowOutOfMemoryError(env, NULL);
+ return -1;
}
if ((sock = openSocketWithFallback(env, name_utf)) < 0) {
(*env)->ReleaseStringUTFChars(env, name, name_utf);
@@ -648,7 +661,7 @@
netif *childP;
jobject tmp;
- // Create a NetworkInterface object and populate it
+ // create a NetworkInterface object and populate it
netifObj = (*env)->NewObject(env, ni_class, ni_ctrID);
CHECK_NULL_RETURN(netifObj, NULL);
name = (*env)->NewStringUTF(env, ifs->name);
@@ -659,7 +672,7 @@
(*env)->SetBooleanField(env, netifObj, ni_virutalID,
ifs->virtual ? JNI_TRUE : JNI_FALSE);
- //Count the number of address on this interface
+ // count the number of addresses on this interface
addr_count = 0;
addrP = ifs->addr;
while (addrP != NULL) {
@@ -667,7 +680,7 @@
addrP = addrP->next;
}
- // Create the array of InetAddresses
+ // create the array of InetAddresses
addrArr = (*env)->NewObjectArray(env, addr_count, ia_class, NULL);
if (addrArr == NULL) {
return NULL;
@@ -687,32 +700,31 @@
if (addrP->family == AF_INET) {
iaObj = (*env)->NewObject(env, ia4_class, ia4_ctrID);
if (iaObj) {
- setInetAddress_addr(env, iaObj, htonl(
- ((struct sockaddr_in*)addrP->addr)->sin_addr.s_addr));
+ setInetAddress_addr(env, iaObj, htonl(
+ ((struct sockaddr_in*)addrP->addr)->sin_addr.s_addr));
} else {
return NULL;
}
ibObj = (*env)->NewObject(env, ni_ibcls, ni_ibctrID);
if (ibObj) {
- (*env)->SetObjectField(env, ibObj, ni_ibaddressID, iaObj);
- if (addrP->brdcast) {
+ (*env)->SetObjectField(env, ibObj, ni_ibaddressID, iaObj);
+ if (addrP->brdcast) {
jobject ia2Obj = NULL;
ia2Obj = (*env)->NewObject(env, ia4_class, ia4_ctrID);
if (ia2Obj) {
- setInetAddress_addr(env, ia2Obj, htonl(
- ((struct sockaddr_in*)addrP->brdcast)->sin_addr.s_addr));
- (*env)->SetObjectField(env, ibObj, ni_ib4broadcastID, ia2Obj);
+ setInetAddress_addr(env, ia2Obj, htonl(
+ ((struct sockaddr_in*)addrP->brdcast)->sin_addr.s_addr));
+ (*env)->SetObjectField(env, ibObj, ni_ib4broadcastID, ia2Obj);
} else {
return NULL;
}
- }
- (*env)->SetShortField(env, ibObj, ni_ib4maskID, addrP->mask);
- (*env)->SetObjectArrayElement(env, bindArr, bind_index++, ibObj);
+ }
+ (*env)->SetShortField(env, ibObj, ni_ib4maskID, addrP->mask);
+ (*env)->SetObjectArrayElement(env, bindArr, bind_index++, ibObj);
} else {
return NULL;
}
}
-
#if defined(AF_INET6)
if (addrP->family == AF_INET6) {
int scope=0;
@@ -748,7 +760,7 @@
addrP = addrP->next;
}
- // See if there is any virtual interface attached to this one.
+ // see if there is any virtual interface attached to this one.
child_count = 0;
childP = ifs->childs;
while (childP) {
@@ -761,17 +773,17 @@
return NULL;
}
- // Create the NetworkInterface instances for the sub-interfaces as well.
+ // create the NetworkInterface instances for the sub-interfaces as well
child_index = 0;
childP = ifs->childs;
while(childP) {
- tmp = createNetworkInterface(env, childP);
- if (tmp == NULL) {
- return NULL;
- }
- (*env)->SetObjectField(env, tmp, ni_parentID, netifObj);
- (*env)->SetObjectArrayElement(env, childArr, child_index++, tmp);
- childP = childP->next;
+ tmp = createNetworkInterface(env, childP);
+ if (tmp == NULL) {
+ return NULL;
+ }
+ (*env)->SetObjectField(env, tmp, ni_parentID, netifObj);
+ (*env)->SetObjectArrayElement(env, childArr, child_index++, tmp);
+ childP = childP->next;
}
(*env)->SetObjectField(env, netifObj, ni_addrsID, addrArr);
(*env)->SetObjectField(env, netifObj, ni_bindsID, bindArr);
@@ -785,46 +797,42 @@
* Enumerates all interfaces
*/
static netif *enumInterfaces(JNIEnv *env) {
- netif *ifs;
+ netif *ifs = NULL;
int sock;
- // Enumerate IPv4 addresses
sock = openSocket(env, AF_INET);
if (sock < 0 && (*env)->ExceptionOccurred(env)) {
return NULL;
}
+ // enumerate IPv4 addresses
ifs = enumIPv4Interfaces(env, sock, NULL);
close(sock);
+ // return partial list if an exception occurs in the middle of process ???
if (ifs == NULL && (*env)->ExceptionOccurred(env)) {
return NULL;
}
- // return partial list if an exception occurs in the middle of process ???
-
// If IPv6 is available then enumerate IPv6 addresses.
#if defined(AF_INET6)
-
// User can disable ipv6 explicitly by -Djava.net.preferIPv4Stack=true,
// so we have to call ipv6_available()
if (ipv6_available()) {
-
- sock = openSocket(env, AF_INET6);
- if (sock < 0 && (*env)->ExceptionOccurred(env)) {
- freeif(ifs);
- return NULL;
- }
+ sock = openSocket(env, AF_INET6);
+ if (sock < 0 && (*env)->ExceptionOccurred(env)) {
+ freeif(ifs);
+ return NULL;
+ }
- ifs = enumIPv6Interfaces(env, sock, ifs);
- close(sock);
+ ifs = enumIPv6Interfaces(env, sock, ifs);
+ close(sock);
- if ((*env)->ExceptionOccurred(env)) {
- freeif(ifs);
- return NULL;
- }
-
- }
+ if ((*env)->ExceptionOccurred(env)) {
+ freeif(ifs);
+ return NULL;
+ }
+ }
#endif
return ifs;
@@ -845,7 +853,7 @@
addrP = next;
}
- // Don't forget to free the sub-interfaces.
+ // don't forget to free the sub-interfaces
if (currif->childs != NULL) {
freeif(currif->childs);
}
@@ -863,26 +871,17 @@
{
netif *currif = ifs, *parent;
netaddr *addrP;
-
-#ifdef LIFNAMSIZ
- int ifnam_size = LIFNAMSIZ;
- char name[LIFNAMSIZ], vname[LIFNAMSIZ];
-#else
- int ifnam_size = IFNAMSIZ;
- char name[IFNAMSIZ], vname[IFNAMSIZ];
-#endif
-
+ char name[IFNAMESIZE], vname[IFNAMESIZE];
char *name_colonP;
int isVirtual = 0;
int addr_size;
- int flags = 0;
// If the interface name is a logical interface then we remove the unit
// number so that we have the physical interface (eg: hme0:1 -> hme0).
// NetworkInterface currently doesn't have any concept of physical vs.
// logical interfaces.
- strncpy(name, if_name, ifnam_size);
- name[ifnam_size - 1] = '\0';
+ strncpy(name, if_name, IFNAMESIZE);
+ name[IFNAMESIZE - 1] = '\0';
*vname = 0;
// Create and populate the netaddr node. If allocation fails
@@ -917,20 +916,21 @@
// Deal with virtual interface with colon notation e.g. eth0:1
name_colonP = strchr(name, ':');
if (name_colonP != NULL) {
+ int flags = 0;
// This is a virtual interface. If we are able to access the parent
// we need to create a new entry if it doesn't exist yet *and* update
// the 'parent' interface with the new records.
*name_colonP = 0;
if (getFlags(sock, name, &flags) < 0 || flags < 0) {
- // failed to access parent interface do not create parent.
- // We are a virtual interface with no parent.
- isVirtual = 1;
- *name_colonP = ':';
+ // failed to access parent interface do not create parent.
+ // We are a virtual interface with no parent.
+ isVirtual = 1;
+ *name_colonP = ':';
} else {
- // Got access to parent, so create it if necessary.
- // Save original name to vname and truncate name by ':'
- memcpy(vname, name, sizeof(vname) );
- vname[name_colonP - name] = ':';
+ // Got access to parent, so create it if necessary.
+ // Save original name to vname and truncate name by ':'
+ memcpy(vname, name, sizeof(vname));
+ vname[name_colonP - name] = ':';
}
}
@@ -943,12 +943,12 @@
currif = currif->next;
}
- // If "new" then create an netif structure and insert it into the list.
+ // If "new" then create a netif structure and insert it into the list.
if (currif == NULL) {
- CHECKED_MALLOC3(currif, netif *, sizeof(netif) + ifnam_size);
+ CHECKED_MALLOC3(currif, netif *, sizeof(netif) + IFNAMESIZE);
currif->name = (char *)currif + sizeof(netif);
- strncpy(currif->name, name, ifnam_size);
- currif->name[ifnam_size - 1] = '\0';
+ strncpy(currif->name, name, IFNAMESIZE);
+ currif->name[IFNAMESIZE - 1] = '\0';
currif->index = getIndex(sock, name);
currif->addr = NULL;
currif->childs = NULL;
@@ -977,13 +977,12 @@
}
if (currif == NULL) {
- CHECKED_MALLOC3(currif, netif *, sizeof(netif) + ifnam_size);
+ CHECKED_MALLOC3(currif, netif *, sizeof(netif) + IFNAMESIZE);
currif->name = (char *)currif + sizeof(netif);
- strncpy(currif->name, vname, ifnam_size);
- currif->name[ifnam_size - 1] = '\0';
+ strncpy(currif->name, vname, IFNAMESIZE);
+ currif->name[IFNAMESIZE - 1] = '\0';
currif->index = getIndex(sock, vname);
- currif->addr = NULL;
- // Need to duplicate the addr entry?
+ currif->addr = NULL; // Need to duplicate the addr entry?
currif->virtual = 1;
currif->childs = NULL;
currif->next = parent->childs;
@@ -1150,7 +1149,7 @@
struct sockaddr addr, broadaddr, *broadaddrP = NULL;
short prefix = 0;
- // ignore non IPv4 interfaces
+ // ignore non IPv4 addresses
if (ifreqP->ifr_addr.sa_family != AF_INET) {
continue;
}
@@ -1264,19 +1263,26 @@
* MAC address. Returns -1 if there is no hardware address on that interface.
*/
static int getMacAddress
- (JNIEnv *env, int sock, const char *ifname, const struct in_addr *addr,
+ (JNIEnv *env, const char *ifname, const struct in_addr *addr,
unsigned char *buf)
{
static struct ifreq ifr;
- int i;
+ int i, sock;
+
+ if ((sock = openSocketWithFallback(env, ifname)) < 0) {
+ return -1;
+ }
+
memset((char *)&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, ifname, sizeof(ifr.ifr_name) - 1);
if (ioctl(sock, SIOCGIFHWADDR, &ifr) < 0) {
JNU_ThrowByNameWithMessageAndLastError
(env, JNU_JAVANETPKG "SocketException", "ioctl(SIOCGIFHWADDR) failed");
+ close(sock);
return -1;
}
+ close(sock);
memcpy(buf, &ifr.ifr_hwaddr.sa_data, IFHWADDRLEN);
// all bytes to 0 means no hardware address
@@ -1388,7 +1394,7 @@
struct sockaddr addr, broadaddr, *broadaddrP = NULL;
short prefix = 0;
- // ignore non IPv4 interfaces
+ // ignore non IPv4 addresses
if (ifreqP->ifr_addr.sa_family != AF_INET) {
continue;
}
@@ -1444,7 +1450,7 @@
static netif *enumIPv6Interfaces(JNIEnv *env, int sock, netif *ifs) {
struct ifconf ifc;
struct ifreq *ifreqP;
- char *buf;
+ char *buf, *cp, *cplimit;
// call SIOCGSIZIFCONF to get size for SIOCGIFCONF buffer
if (ioctl(sock, SIOCGSIZIFCONF, &(ifc.ifc_len)) < 0) {
@@ -1464,8 +1470,9 @@
}
// iterate through each interface
- char *cp = (char *)ifc.ifc_req;
- char *cplimit = cp + ifc.ifc_len;
+ ifreqP = ifc.ifc_req;
+ cp = (char *)ifc.ifc_req;
+ cplimit = cp + ifc.ifc_len;
for (; cp < cplimit;
cp += (sizeof(ifreqP->ifr_name) +
@@ -1474,7 +1481,7 @@
ifreqP = (struct ifreq *)cp;
short prefix = 0;
- // ignore non IPv6 interfaces
+ // ignore non IPv6 addresses
if (ifreqP->ifr_addr.sa_family != AF_INET6) {
continue;
}
@@ -1527,7 +1534,7 @@
* MAC address. Returns -1 if there is no hardware address on that interface.
*/
static int getMacAddress
- (JNIEnv *env, int sock, const char *ifname, const struct in_addr *addr,
+ (JNIEnv *env, const char *ifname, const struct in_addr *addr,
unsigned char *buf)
{
int size;
@@ -1586,20 +1593,20 @@
}
static int getFlags(int sock, const char *ifname, int *flags) {
- struct ifreq if2;
- memset((char *)&if2, 0, sizeof(if2));
- strncpy(if2.ifr_name, ifname, sizeof(if2.ifr_name) - 1);
+ struct ifreq if2;
+ memset((char *)&if2, 0, sizeof(if2));
+ strncpy(if2.ifr_name, ifname, sizeof(if2.ifr_name) - 1);
- if (ioctl(sock, SIOCGIFFLAGS, (char *)&if2) < 0) {
- return -1;
- }
+ if (ioctl(sock, SIOCGIFFLAGS, (char *)&if2) < 0) {
+ return -1;
+ }
- if (sizeof(if2.ifr_flags) == sizeof(short)) {
- *flags = (if2.ifr_flags & 0xffff);
- } else {
- *flags = if2.ifr_flags;
- }
- return 0;
+ if (sizeof(if2.ifr_flags) == sizeof(short)) {
+ *flags = (if2.ifr_flags & 0xffff);
+ } else {
+ *flags = if2.ifr_flags;
+ }
+ return 0;
}
#endif /* _AIX */
@@ -1668,7 +1675,7 @@
char *buf = NULL;
unsigned i;
- // call SIOCGLIFNUM to get the size of SIOCGIFCONF buffer
+ // call SIOCGLIFNUM to get the interface count
numifs.lifn_family = AF_INET;
numifs.lifn_flags = 0;
if (ioctl(sock, SIOCGLIFNUM, (char *)&numifs) < 0) {
@@ -1695,7 +1702,7 @@
for (i = 0; i < numifs.lifn_count; i++, ifreqP++) {
struct sockaddr addr, *broadaddrP = NULL;
- // ignore non IPv4 interfaces
+ // ignore non IPv4 addresses
if (ifreqP->lifr_addr.ss_family != AF_INET) {
continue;
}
@@ -1744,7 +1751,7 @@
char *buf = NULL;
unsigned i;
- // call SIOCGLIFNUM to get the size of SIOCGLIFCONF buffer
+ // call SIOCGLIFNUM to get the interface count
numifs.lifn_family = AF_INET6;
numifs.lifn_flags = 0;
if (ioctl(sock, SIOCGLIFNUM, (char *)&numifs) < 0) {
@@ -1770,7 +1777,7 @@
ifreqP = ifc.lifc_req;
for (i = 0; i < numifs.lifn_count; i++, ifreqP++) {
- // ignore non IPv6 interfaces
+ // ignore non IPv6 addresses
if (ifreqP->lifr_addr.ss_family != AF_INET6) {
continue;
}
@@ -1789,7 +1796,7 @@
free(buf);
return ifs;
}
- }
+ }
// free buffer
free(buf);
@@ -1834,9 +1841,9 @@
strcpy(style1dev, DEV_PREFIX);
strcat(style1dev, ifname);
if ((fd = open(style1dev, O_RDWR)) < 0) {
- // Can't open it. We probably are missing the privilege.
- // We'll have to try something else
- return 0;
+ // Can't open it. We probably are missing the privilege.
+ // We'll have to try something else
+ return 0;
}
dlpareq.dl_primitive = DL_PHYS_ADDR_REQ;
@@ -1878,11 +1885,15 @@
* MAC address. Returns -1 if there is no hardware address on that interface.
*/
static int getMacAddress
- (JNIEnv *env, int sock, const char *ifname, const struct in_addr *addr,
+ (JNIEnv *env, const char *ifname, const struct in_addr *addr,
unsigned char *buf)
{
struct lifreq if2;
- int len, i;
+ int len, i, sock;
+
+ if ((sock = openSocketWithFallback(env, ifname)) < 0) {
+ return -1;
+ }
// First, try the new (S11) SIOCGLIFHWADDR ioctl(). If that fails
// try the old way.
@@ -1893,40 +1904,36 @@
struct sockaddr_dl *sp;
sp = (struct sockaddr_dl *)&if2.lifr_addr;
memcpy(buf, &sp->sdl_data[0], sp->sdl_alen);
+ close(sock);
return sp->sdl_alen;
}
// On Solaris we have to use DLPI, but it will only work if we have
// privileged access (i.e. root). If that fails, we try a lookup
// in the ARP table, which requires an IPv4 address.
- if ((len = getMacFromDevice(env, ifname, buf)) == 0) {
- // DLPI failed - trying to do arp lookup
-
+ if (((len = getMacFromDevice(env, ifname, buf)) == 0) && (addr != NULL)) {
struct arpreq arpreq;
struct sockaddr_in *sin;
struct sockaddr_in ipAddr;
- if (addr == NULL) {
- // No IPv4 address for that interface, so can't do an ARP lookup.
- return -1;
- }
-
- len = 6; //???
+ len = 6; //???
- sin = (struct sockaddr_in *)&arpreq.arp_pa;
- memset((char *)&arpreq, 0, sizeof(struct arpreq));
- ipAddr.sin_port = 0;
- ipAddr.sin_family = AF_INET;
- memcpy(&ipAddr.sin_addr, addr, sizeof(struct in_addr));
- memcpy(&arpreq.arp_pa, &ipAddr, sizeof(struct sockaddr_in));
- arpreq.arp_flags= ATF_PUBL;
+ sin = (struct sockaddr_in *)&arpreq.arp_pa;
+ memset((char *)&arpreq, 0, sizeof(struct arpreq));
+ ipAddr.sin_port = 0;
+ ipAddr.sin_family = AF_INET;
+ memcpy(&ipAddr.sin_addr, addr, sizeof(struct in_addr));
+ memcpy(&arpreq.arp_pa, &ipAddr, sizeof(struct sockaddr_in));
+ arpreq.arp_flags= ATF_PUBL;
- if (ioctl(sock, SIOCGARP, &arpreq) < 0) {
- return -1;
- }
+ if (ioctl(sock, SIOCGARP, &arpreq) < 0) {
+ close(sock);
+ return -1;
+ }
- memcpy(buf, &arpreq.arp_ha.sa_data[0], len);
+ memcpy(buf, &arpreq.arp_ha.sa_data[0], len);
}
+ close(sock);
// all bytes to 0 means no hardware address
for (i = 0; i < len; i++) {
@@ -2014,7 +2021,7 @@
for (ifa = origifa; ifa != NULL; ifa = ifa->ifa_next) {
struct sockaddr *broadaddrP = NULL;
- // ignore non IPv4 interfaces
+ // ignore non IPv4 addresses
if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET)
continue;
@@ -2058,7 +2065,7 @@
}
for (ifa = origifa; ifa != NULL; ifa = ifa->ifa_next) {
- // ignore non IPv6 interfaces
+ // ignore non IPv6 addresses
if (ifa->ifa_addr == NULL || ifa->ifa_addr->sa_family != AF_INET6)
continue;
@@ -2113,22 +2120,22 @@
* MAC address. Returns -1 if there is no hardware address on that interface.
*/
static int getMacAddress
- (JNIEnv *env, int sock, const char *ifname, const struct in_addr *addr,
+ (JNIEnv *env, const char *ifname, const struct in_addr *addr,
unsigned char *buf)
{
struct ifaddrs *ifa0, *ifa;
struct sockaddr *saddr;
int i;
- // Grab the interface list
+ // grab the interface list
if (!getifaddrs(&ifa0)) {
- // Cycle through the interfaces
+ // cycle through the interfaces
for (i = 0, ifa = ifa0; ifa != NULL; ifa = ifa->ifa_next, i++) {
saddr = ifa->ifa_addr;
- // Link layer contains the MAC address
+ // link layer contains the MAC address
if (saddr->sa_family == AF_LINK && !strcmp(ifname, ifa->ifa_name)) {
struct sockaddr_dl *sadl = (struct sockaddr_dl *) saddr;
- // Check the address is the correct length
+ // check the address has the correct length
if (sadl->sdl_alen == ETHER_ADDR_LEN) {
memcpy(buf, (sadl->sdl_data + sadl->sdl_nlen), ETHER_ADDR_LEN);
freeifaddrs(ifa0);
--- a/jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c Mon Sep 12 22:04:48 2016 +0000
@@ -52,6 +52,10 @@
#include <strings.h>
#endif
+#ifdef __linux__
+#include <sys/syscall.h>
+#endif
+
#if defined(__linux__) || defined(_AIX)
#include <string.h>
#endif
@@ -157,14 +161,11 @@
}
#endif
-#if defined(__linux__) && defined(__x86_64__)
+#if defined(__linux__) && defined(_LP64) && defined(__NR_newfstatat)
#define FSTATAT64_SYSCALL_AVAILABLE
static int fstatat64_wrapper(int dfd, const char *path,
struct stat64 *statbuf, int flag)
{
- #ifndef __NR_newfstatat
- #define __NR_newfstatat 262
- #endif
return syscall(__NR_newfstatat, dfd, path, statbuf, flag);
}
#endif
--- a/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSInfo.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.desktop/share/classes/com/sun/media/sound/DLSInfo.java Mon Sep 12 22:04:48 2016 +0000
@@ -95,7 +95,7 @@
public String subject = null;
/**
* (ISRC) Name of person or orginization who supplied
- * orginal material for the file.
+ * original material for the file.
*/
public String source = null;
/**
--- a/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnector.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.management/share/classes/javax/management/remote/rmi/RMIConnector.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2002, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -64,6 +64,7 @@
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.WeakHashMap;
import java.util.stream.Collectors;
@@ -1851,8 +1852,11 @@
private static final class ObjectInputStreamWithLoader
extends ObjectInputStream {
ObjectInputStreamWithLoader(InputStream in, ClassLoader cl)
- throws IOException {
+ throws IOException, IllegalArgumentException {
super(in);
+ if (cl == null ) {
+ throw new IllegalArgumentException("class loader is null");
+ }
this.loader = cl;
}
@@ -1861,7 +1865,7 @@
throws IOException, ClassNotFoundException {
String name = classDesc.getName();
ReflectUtil.checkPackageAccess(name);
- return Class.forName(name, false, loader);
+ return Class.forName(name, false, Objects.requireNonNull(loader));
}
private final ClassLoader loader;
--- a/jdk/src/java.management/share/classes/module-info.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.management/share/classes/module-info.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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,6 +50,7 @@
uses javax.management.remote.JMXConnectorProvider;
uses javax.management.remote.JMXConnectorServerProvider;
uses sun.management.spi.PlatformMBeanProvider;
+ uses sun.management.spi.AgentProvider;
provides javax.security.auth.spi.LoginModule
with com.sun.jmx.remote.security.FileLoginModule;
--- a/jdk/src/java.management/share/classes/sun/management/Agent.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/java.management/share/classes/sun/management/Agent.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,17 +31,19 @@
import java.io.IOException;
import java.io.InputStream;
import java.lang.management.ManagementFactory;
-import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.InetAddress;
import java.net.MalformedURLException;
import java.net.UnknownHostException;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.text.MessageFormat;
import java.util.HashMap;
import java.util.Map;
import java.util.MissingResourceException;
import java.util.Properties;
import java.util.ResourceBundle;
+import java.util.ServiceLoader;
import java.util.function.Function;
import java.util.function.Predicate;
@@ -53,6 +55,7 @@
import sun.management.jdp.JdpController;
import sun.management.jdp.JdpException;
import jdk.internal.vm.VMSupport;
+import sun.management.spi.AgentProvider;
/**
* This Agent is started by the VM when -Dcom.sun.management.snmp or
@@ -248,8 +251,8 @@
"com.sun.management.enableThreadContentionMonitoring";
private static final String LOCAL_CONNECTOR_ADDRESS_PROP =
"com.sun.management.jmxremote.localConnectorAddress";
- private static final String SNMP_ADAPTOR_BOOTSTRAP_CLASS_NAME =
- "sun.management.snmp.AdaptorBootstrap";
+ private static final String SNMP_AGENT_NAME =
+ "SnmpAgent";
private static final String JDP_DEFAULT_ADDRESS = "224.0.23.178";
private static final int JDP_DEFAULT_PORT = 7095;
@@ -429,7 +432,7 @@
try {
if (snmpPort != null) {
- loadSnmpAgent(snmpPort, props);
+ loadSnmpAgent(props);
}
/*
@@ -554,28 +557,24 @@
return mgmtProps;
}
- private static void loadSnmpAgent(String snmpPort, Properties props) {
- try {
- // invoke the following through reflection:
- // AdaptorBootstrap.initialize(snmpPort, props);
- final Class<?> adaptorClass =
- Class.forName(SNMP_ADAPTOR_BOOTSTRAP_CLASS_NAME, true, null);
- final Method initializeMethod =
- adaptorClass.getMethod("initialize",
- String.class, Properties.class);
- initializeMethod.invoke(null, snmpPort, props);
- } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException x) {
- // snmp runtime doesn't exist - initialization fails
- throw new UnsupportedOperationException("Unsupported management property: " + SNMP_PORT, x);
- } catch (InvocationTargetException x) {
- final Throwable cause = x.getCause();
- if (cause instanceof RuntimeException) {
- throw (RuntimeException) cause;
- } else if (cause instanceof Error) {
- throw (Error) cause;
- }
- // should not happen...
- throw new UnsupportedOperationException("Unsupported management property: " + SNMP_PORT, cause);
+ private static void loadSnmpAgent(Properties props) {
+ /*
+ * Load the jdk.snmp service
+ */
+ AgentProvider provider = AccessController.doPrivileged(
+ (PrivilegedAction<AgentProvider>) () -> {
+ for(AgentProvider aProvider : ServiceLoader.loadInstalled(AgentProvider.class)) {
+ if(aProvider.getName().equals(SNMP_AGENT_NAME))
+ return aProvider;
+ }
+ return null;
+ }, null
+ );
+
+ if (provider != null) {
+ provider.startAgent(props);
+ } else { // snmp runtime doesn't exist - initialization fails
+ throw new UnsupportedOperationException("Unsupported management property: " + SNMP_PORT);
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/java.management/share/classes/sun/management/spi/AgentProvider.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2016, 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.management.spi;
+
+import java.util.Properties;
+
+/**
+ * Service interface for management agent
+ */
+public abstract class AgentProvider {
+
+ /**
+ * Instantiates a new AgentProvider.
+ *
+ * @throws SecurityException if the subclass (and calling code) does not
+ * have
+ * {@code RuntimePermission("sun.management.spi.AgentProvider.subclass")}
+ */
+ protected AgentProvider() {
+ this(checkSubclassPermission());
+ }
+
+ private AgentProvider(Void unused) {
+ }
+
+ private static Void checkSubclassPermission() {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPermission(new RuntimePermission(AgentProvider.class.getName() + ".subclass"));
+ }
+ return null;
+ }
+
+ /**
+ * Gets the name of the agent provider.
+ *
+ * @return name of agent provider
+ */
+ public abstract String getName();
+
+ /**
+ * Initializes and starts the agent.
+ *
+ * @throws IllegalStateException if this agent has already been started.
+ */
+ public abstract void startAgent();
+
+ /**
+ * Initializes and starts the agent at given port and with given properties
+ *
+ * @param props environment variables for agent
+ *
+ * @throws IllegalStateException if this agent has already been started.
+ */
+ public abstract void startAgent(Properties props);
+
+ /**
+ * Checks if agent is started and not terminated.
+ *
+ * @return true if agent is running, false otherwise.
+ */
+ public abstract boolean isActive();
+
+ /**
+ * Stops this agent.
+ *
+ * @throws IllegalStateException if this agent is not started.
+ */
+ public abstract void stopAgent();
+}
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java Mon Sep 12 22:04:48 2016 +0000
@@ -189,12 +189,12 @@
storeFiles(modules, release);
if (Files.getFileStore(root).supportsFileAttributeView(PosixFileAttributeView.class)) {
- // launchers in the bin directory need execute permission
+ // launchers in the bin directory need execute permission.
+ // On Windows, "bin" also subdirectories containing jvm.dll.
if (Files.isDirectory(bin)) {
- Files.list(bin)
- .filter(f -> !f.toString().endsWith(".diz"))
- .filter(f -> Files.isRegularFile(f))
- .forEach(this::setExecutable);
+ Files.find(bin, 2, (path, attrs) -> {
+ return attrs.isRegularFile() && !path.toString().endsWith(".diz");
+ }).forEach(this::setExecutable);
}
// jspawnhelper is in lib or lib/<arch>
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java Mon Sep 12 22:04:48 2016 +0000
@@ -99,9 +99,15 @@
* e.g.: /java.base/native/amd64/server/libjvm.so
* /java.base/native/server/libjvm.dylib
*/
- private List<ResourcePoolEntry> getVMs(ResourcePoolModule javaBase, String jvmlib) {
+ private List<ResourcePoolEntry> getVMs(ResourcePoolModule javaBase, String[] jvmlibs) {
List<ResourcePoolEntry> ret = javaBase.entries().filter((t) -> {
- return t.path().endsWith("/" + jvmlib);
+ String path = t.path();
+ for (String jvmlib : jvmlibs) {
+ if (t.path().endsWith("/" + jvmlib)) {
+ return true;
+ }
+ }
+ return false;
}).collect(Collectors.toList());
return ret;
}
@@ -109,18 +115,21 @@
@Override
public ResourcePool transform(ResourcePool in, ResourcePoolBuilder out) {
ResourcePoolModule javaBase = in.moduleView().findModule("java.base").get();
- String jvmlib = jvmlib(javaBase.descriptor().osName().get());
+ String[] jvmlibs = jvmlibs(javaBase.descriptor().osName().get());
TreeSet<Jvm> existing = new TreeSet<>(new JvmComparator());
TreeSet<Jvm> removed = new TreeSet<>(new JvmComparator());
if (!keepAll) {
// First retrieve all available VM names and removed VM
- List<ResourcePoolEntry> jvms = getVMs(javaBase, jvmlib);
+ List<ResourcePoolEntry> jvms = getVMs(javaBase, jvmlibs);
for (Jvm jvm : Jvm.values()) {
for (ResourcePoolEntry md : jvms) {
- if (md.path().endsWith("/" + jvm.getName() + "/" + jvmlib)) {
- existing.add(jvm);
- if (isRemoved(md)) {
- removed.add(jvm);
+ String mdPath = md.path();
+ for (String jvmlib : jvmlibs) {
+ if (mdPath.endsWith("/" + jvm.getName() + "/" + jvmlib)) {
+ existing.add(jvm);
+ if (isRemoved(md)) {
+ removed.add(jvm);
+ }
}
}
}
@@ -248,14 +257,14 @@
return orig.copyWithContent(content);
}
- private static String jvmlib(String osName) {
- String lib = "libjvm.so";
+ private static String[] jvmlibs(String osName) {
if (isWindows(osName)) {
- lib = "jvm.dll";
+ return new String[] { "jvm.dll" };
} else if (isMac(osName)) {
- lib = "libjvm.dylib";
+ return new String[] { "libjvm.dylib", "libjvm.a" };
+ } else {
+ return new String[] { "libjvm.so", "libjvm.a" };
}
- return lib;
}
private static boolean isWindows(String osName) {
--- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java Mon Sep 12 22:04:48 2016 +0000
@@ -264,8 +264,8 @@
// Add Thai BreakIterator related data files
if (tag.equals("th")) {
- files.add(".+sun/text/resources/thai_dict");
- files.add(".+sun/text/resources/[^_]+BreakIteratorData_th");
+ files.add(".+sun/text/resources/ext/thai_dict");
+ files.add(".+sun/text/resources/ext/[^_]+BreakIteratorData_th");
}
// Add Taiwan resource bundles for Hong Kong
Binary file jdk/src/jdk.localedata/share/classes/sun/text/resources/ext/thai_dict has changed
Binary file jdk/src/jdk.localedata/share/classes/sun/text/resources/thai_dict has changed
--- a/jdk/test/ProblemList.txt Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/ProblemList.txt Mon Sep 12 22:04:48 2016 +0000
@@ -310,8 +310,6 @@
tools/pack200/CommandLineTests.java 7143279,8059906 generic-all
-tools/pack200/Pack200Test.java 8059906,8151901 generic-all
-
tools/launcher/FXLauncherTest.java 8068049 linux-all,macosx-all
tools/pack200/Pack200Props.java 8155857 generic-all
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/ClassLoader/GetDefinedPackage.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2016, 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 8165346
+ * @summary Basic test for ClassLoader::getDefinedPackage
+ */
+
+public class GetDefinedPackage {
+ public static void main(String... args) {
+ TestClassLoader loader = new TestClassLoader();
+ Package pkg = loader.getDefinedPackage(TestClassLoader.PKG_NAME);
+ if (pkg == null) {
+ throw new RuntimeException("package foo not found");
+ }
+
+ try {
+ loader.getDefinedPackage(null);
+ throw new RuntimeException("NullPointerException not thrown");
+ } catch (NullPointerException e) {
+ }
+ }
+
+ static class TestClassLoader extends ClassLoader {
+ public static final String PKG_NAME = "foo";
+
+ public TestClassLoader() {
+ super();
+ definePackage(PKG_NAME);
+ }
+
+ public Package definePackage(String name) {
+ return definePackage(name, null, null, null, null, null, null, null);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/ClassLoader/ResourcesStreamTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2016, 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.io.UncheckedIOException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/*
+ * @test
+ * @bug 8161230
+ * @summary Test java.lang.ClassLoader.resources() method
+ *
+ * @build ResourcesStreamTest
+ * @run main ResourcesStreamTest
+ */
+public class ResourcesStreamTest {
+
+ public static void main(String[] args) throws Exception {
+ testSuccess();
+ testFailure();
+ }
+
+ public static void testSuccess() throws Exception {
+ // failing part first
+ try {
+ ClassLoader cl = new FailingClassLoader();
+ // should create the stream pipe
+ Stream<URL> stream = cl.resources("the name");
+ // expect function to throw an exception when calling the method
+ stream.forEach(System.out::println);
+ throw new Exception("expected UncheckedIOException not thrown");
+ } catch (UncheckedIOException uio) {
+ String causeMessage = uio.getCause().getMessage();
+ if (!"the name".equals(causeMessage))
+ throw new Exception("unexpected cause message: " + causeMessage);
+ }
+ }
+
+ public static void testFailure() throws Exception {
+ ClassLoader cl = new SuccessClassLoader();
+ long count = cl.resources("the name").count();
+ if (count != 1)
+ throw new Exception("expected resource is null or empty");
+
+ cl.resources("the name")
+ .filter(url -> "file:/somefile".equals(url.toExternalForm()))
+ .findFirst()
+ .orElseThrow(() -> new Exception("correct URL not found"));
+ }
+
+ public static class SuccessClassLoader extends ClassLoader {
+ @Override
+ public Enumeration<URL> getResources(String name) throws IOException {
+ URL url = new URL("file:/somefile");
+ return Collections.enumeration(Collections.singleton(url));
+ }
+ }
+
+ public static class FailingClassLoader extends ClassLoader {
+ @Override
+ public Enumeration<URL> getResources(String name) throws IOException {
+ throw new IOException(name);
+ }
+ }
+}
--- a/jdk/test/java/net/SetFactoryPermission/SetFactoryPermission.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/net/SetFactoryPermission/SetFactoryPermission.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,7 @@
* @bug 8048052
* @summary Test a series of methods which requires "setFactory" runtime permission
* @modules java.rmi
- * @run main SetFactoryPermission success
+ * @run main/othervm SetFactoryPermission success
* @run main/othervm/policy=policy.fail SetFactoryPermission fail
* @run main/othervm/policy=policy.success SetFactoryPermission success
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/nio/channels/Selector/SelectTimeout.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,83 @@
+/*
+* Copyright (c) 2016, 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 8165000
+ * @summary Verify no IOException on OS X for large timeout value in select().
+ * @requires (os.family == "mac")
+ */
+import java.io.IOException;
+import java.nio.channels.Selector;
+
+public class SelectTimeout {
+ private static final long HUGE_TIMEOUT = 100000001000L;
+ private static final long SLEEP_MILLIS = 10000;
+
+ private static Exception theException;
+
+ public static void main(String[] args)
+ throws IOException, InterruptedException {
+ int failures = 0;
+ long[] timeouts =
+ new long[] {0, HUGE_TIMEOUT/2, HUGE_TIMEOUT - 1, HUGE_TIMEOUT};
+ for (long t : timeouts) {
+ if (!test(t)) {
+ failures++;
+ }
+ }
+ if (failures > 0) {
+ throw new RuntimeException("Test failed!");
+ } else {
+ System.out.println("Test succeeded");
+ }
+ }
+
+ private static boolean test(final long timeout)
+ throws InterruptedException, IOException {
+ theException = null;
+
+ Selector selector = Selector.open();
+
+ Thread t = new Thread(() -> {
+ try {
+ selector.select(timeout);
+ } catch (IOException ioe) {
+ theException = ioe;
+ }
+ });
+ t.start();
+
+ Thread.currentThread().sleep(SLEEP_MILLIS);
+ t.interrupt();
+
+ if (theException == null) {
+ System.out.printf("Test succeeded with timeout %d%n", timeout);
+ return true;
+ } else {
+ System.err.printf("Test failed with timeout %d%n", timeout);
+ theException.printStackTrace();
+ return false;
+ }
+ }
+}
--- a/jdk/test/java/nio/file/DirectoryStream/SecureDS.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/nio/file/DirectoryStream/SecureDS.java Mon Sep 12 22:04:48 2016 +0000
@@ -45,6 +45,9 @@
DirectoryStream<Path> stream = newDirectoryStream(dir);
stream.close();
if (!(stream instanceof SecureDirectoryStream)) {
+ if (System.getProperty("os.name").equals("Linux"))
+ throw new AssertionError(
+ "SecureDirectoryStream not supported.");
System.out.println("SecureDirectoryStream not supported.");
return;
}
--- a/jdk/test/java/time/TEST.properties Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/time/TEST.properties Mon Sep 12 22:04:48 2016 +0000
@@ -1,4 +1,6 @@
# Threeten test uses TestNG
TestNG.dirs = .
othervm.dirs = tck/java/time/chrono test/java/time/chrono test/java/time/format
+modules = jdk.localedata
lib.dirs = ../../lib/testlibrary
+lib.build = jdk.testlibrary.RandomFactory
--- a/jdk/test/java/util/Base64/TestBase64.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/Base64/TestBase64.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016, 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,8 +23,11 @@
/**
* @test 4235519 8004212 8005394 8007298 8006295 8006315 8006530 8007379 8008925
- * 8014217 8025003 8026330 8028397 8129544
+ * 8014217 8025003 8026330 8028397 8129544 8165243
* @summary tests java.util.Base64
+ * @library /lib/testlibrary
+ * @build jdk.testlibrary.*
+ * @run main TestBase64
* @key randomness
*/
@@ -35,11 +38,17 @@
import java.io.OutputStream;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import java.util.ArrayList;
import java.util.Base64;
+import java.util.List;
import java.util.Random;
+import jdk.testlibrary.RandomFactory;
+
public class TestBase64 {
+ private static final Random rnd = RandomFactory.getRandom();
+
public static void main(String args[]) throws Throwable {
int numRuns = 10;
int numBytes = 200;
@@ -52,7 +61,6 @@
test(Base64.getUrlEncoder(), Base64.getUrlDecoder(), numRuns, numBytes);
test(Base64.getMimeEncoder(), Base64.getMimeDecoder(), numRuns, numBytes);
- Random rnd = new java.util.Random();
byte[] nl_1 = new byte[] {'\n'};
byte[] nl_2 = new byte[] {'\n', '\r'};
byte[] nl_3 = new byte[] {'\n', '\r', '\n'};
@@ -76,7 +84,7 @@
testNull(Base64.getDecoder());
testNull(Base64.getUrlDecoder());
testNull(Base64.getMimeDecoder());
- checkNull(new Runnable() { public void run() { Base64.getMimeEncoder(10, null); }});
+ checkNull(() -> Base64.getMimeEncoder(10, null));
testIOE(Base64.getEncoder());
testIOE(Base64.getUrlEncoder());
@@ -84,26 +92,23 @@
testIOE(Base64.getMimeEncoder(10, new byte[]{'\n'}));
byte[] src = new byte[1024];
- new Random().nextBytes(src);
+ rnd.nextBytes(src);
final byte[] decoded = Base64.getEncoder().encode(src);
testIOE(Base64.getDecoder(), decoded);
testIOE(Base64.getMimeDecoder(), decoded);
testIOE(Base64.getUrlDecoder(), Base64.getUrlEncoder().encode(src));
// illegal line separator
- checkIAE(new Runnable() { public void run() { Base64.getMimeEncoder(10, new byte[]{'\r', 'N'}); }});
+ checkIAE(() -> Base64.getMimeEncoder(10, new byte[]{'\r', 'N'}));
// malformed padding/ending
testMalformedPadding();
// illegal base64 character
decoded[2] = (byte)0xe0;
- checkIAE(new Runnable() {
- public void run() { Base64.getDecoder().decode(decoded); }});
- checkIAE(new Runnable() {
- public void run() { Base64.getDecoder().decode(decoded, new byte[1024]); }});
- checkIAE(new Runnable() { public void run() {
- Base64.getDecoder().decode(ByteBuffer.wrap(decoded)); }});
+ checkIAE(() -> Base64.getDecoder().decode(decoded));
+ checkIAE(() -> Base64.getDecoder().decode(decoded, new byte[1024]));
+ checkIAE(() -> Base64.getDecoder().decode(ByteBuffer.wrap(decoded)));
// test single-non-base64 character for mime decoding
testSingleNonBase64MimeDec();
@@ -113,12 +118,20 @@
// test mime decoding with ignored character after padding
testDecodeIgnoredAfterPadding();
+
+ // given invalid args, encoder should not produce output
+ testEncoderKeepsSilence(Base64.getEncoder());
+ testEncoderKeepsSilence(Base64.getUrlEncoder());
+ testEncoderKeepsSilence(Base64.getMimeEncoder());
+
+ // given invalid args, decoder should not consume input
+ testDecoderKeepsAbstinence(Base64.getDecoder());
+ testDecoderKeepsAbstinence(Base64.getUrlDecoder());
+ testDecoderKeepsAbstinence(Base64.getMimeDecoder());
}
private static void test(Base64.Encoder enc, Base64.Decoder dec,
int numRuns, int numBytes) throws Throwable {
- Random rnd = new java.util.Random();
-
enc.encode(new byte[0]);
dec.decode(new byte[0]);
@@ -258,48 +271,49 @@
private static final String str_null = null;
private static final ByteBuffer bb_null = null;
- private static void testNull(final Base64.Encoder enc) {
- checkNull(new Runnable() { public void run() { enc.encode(ba_null); }});
- checkNull(new Runnable() { public void run() { enc.encodeToString(ba_null); }});
- checkNull(new Runnable() { public void run() { enc.encode(ba_null, new byte[10]); }});
- checkNull(new Runnable() { public void run() { enc.encode(new byte[10], ba_null); }});
- checkNull(new Runnable() { public void run() { enc.encode(bb_null); }});
- checkNull(new Runnable() { public void run() { enc.wrap((OutputStream)null); }});
+ private static void testNull(Base64.Encoder enc) {
+ checkNull(() -> enc.encode(ba_null));
+ checkNull(() -> enc.encodeToString(ba_null));
+ checkNull(() -> enc.encode(ba_null, new byte[10]));
+ checkNull(() -> enc.encode(new byte[10], ba_null));
+ checkNull(() -> enc.encode(bb_null));
+ checkNull(() -> enc.wrap((OutputStream)null));
}
- private static void testNull(final Base64.Decoder dec) {
- checkNull(new Runnable() { public void run() { dec.decode(ba_null); }});
- checkNull(new Runnable() { public void run() { dec.decode(str_null); }});
- checkNull(new Runnable() { public void run() { dec.decode(ba_null, new byte[10]); }});
- checkNull(new Runnable() { public void run() { dec.decode(new byte[10], ba_null); }});
- checkNull(new Runnable() { public void run() { dec.decode(bb_null); }});
- checkNull(new Runnable() { public void run() { dec.wrap((InputStream)null); }});
+ private static void testNull(Base64.Decoder dec) {
+ checkNull(() -> dec.decode(ba_null));
+ checkNull(() -> dec.decode(str_null));
+ checkNull(() -> dec.decode(ba_null, new byte[10]));
+ checkNull(() -> dec.decode(new byte[10], ba_null));
+ checkNull(() -> dec.decode(bb_null));
+ checkNull(() -> dec.wrap((InputStream)null));
}
+ @FunctionalInterface
private static interface Testable {
public void test() throws Throwable;
}
- private static void testIOE(final Base64.Encoder enc) throws Throwable {
+ private static void testIOE(Base64.Encoder enc) throws Throwable {
ByteArrayOutputStream baos = new ByteArrayOutputStream(8192);
- final OutputStream os = enc.wrap(baos);
+ OutputStream os = enc.wrap(baos);
os.write(new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9});
os.close();
- checkIOE(new Testable() { public void test() throws Throwable { os.write(10); }});
- checkIOE(new Testable() { public void test() throws Throwable { os.write(new byte[] {10}); }});
- checkIOE(new Testable() { public void test() throws Throwable { os.write(new byte[] {10}, 1, 4); }});
+ checkIOE(() -> os.write(10));
+ checkIOE(() -> os.write(new byte[] {10}));
+ checkIOE(() -> os.write(new byte[] {10}, 1, 4));
}
- private static void testIOE(final Base64.Decoder dec, byte[] decoded) throws Throwable {
+ private static void testIOE(Base64.Decoder dec, byte[] decoded) throws Throwable {
ByteArrayInputStream bais = new ByteArrayInputStream(decoded);
- final InputStream is = dec.wrap(bais);
+ InputStream is = dec.wrap(bais);
is.read(new byte[10]);
is.close();
- checkIOE(new Testable() { public void test() throws Throwable { is.read(); }});
- checkIOE(new Testable() { public void test() throws Throwable { is.read(new byte[] {10}); }});
- checkIOE(new Testable() { public void test() throws Throwable { is.read(new byte[] {10}, 1, 4); }});
- checkIOE(new Testable() { public void test() throws Throwable { is.available(); }});
- checkIOE(new Testable() { public void test() throws Throwable { is.skip(20); }});
+ checkIOE(() -> is.read());
+ checkIOE(() -> is.read(new byte[] {10}));
+ checkIOE(() -> is.read(new byte[] {10}, 1, 4));
+ checkIOE(() -> is.available());
+ checkIOE(() -> is.skip(20));
}
private static final void checkNull(Runnable r) {
@@ -391,13 +405,13 @@
int pos = (Integer)data[i + 2];
// decode(byte[])
- checkIAE(new Runnable() { public void run() { dec.decode(srcBytes); }});
+ checkIAE(() -> dec.decode(srcBytes));
// decode(String)
- checkIAE(new Runnable() { public void run() { dec.decode(srcStr); }});
+ checkIAE(() -> dec.decode(srcStr));
// decode(ByteBuffer)
- checkIAE(new Runnable() { public void run() { dec.decode(srcBB); }});
+ checkIAE(() -> dec.decode(srcBB));
// wrap stream
checkIOE(new Testable() {
@@ -412,10 +426,8 @@
// anything left after padding is "invalid"/IAE, if
// not MIME. In case of MIME, non-base64 character(s)
// is ignored.
- checkIAE(new Runnable() { public void run() {
- Base64.getDecoder().decode("AA==\u00D2"); }});
- checkIAE(new Runnable() { public void run() {
- Base64.getUrlDecoder().decode("AA==\u00D2"); }});
+ checkIAE(() -> Base64.getDecoder().decode("AA==\u00D2"));
+ checkIAE(() -> Base64.getUrlDecoder().decode("AA==\u00D2"));
Base64.getMimeDecoder().decode("AA==\u00D2");
}
@@ -516,4 +528,67 @@
}
return ret;
}
+
+ private static void testEncoderKeepsSilence(Base64.Encoder enc)
+ throws Throwable {
+ List<Integer> vals = new ArrayList<>(List.of(Integer.MIN_VALUE,
+ Integer.MIN_VALUE + 1, -1111, -2, -1, 0, 1, 2, 3, 1111,
+ Integer.MAX_VALUE - 1, Integer.MAX_VALUE));
+ vals.addAll(List.of(rnd.nextInt(), rnd.nextInt(), rnd.nextInt(),
+ rnd.nextInt()));
+ byte[] buf = new byte[] {1, 0, 91};
+ for (int off : vals) {
+ for (int len : vals) {
+ if (off >= 0 && len >= 0 && off <= buf.length - len) {
+ // valid args, skip them
+ continue;
+ }
+ // invalid args, test them
+ System.out.println("testing off=" + off + ", len=" + len);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(100);
+ try (OutputStream os = enc.wrap(baos)) {
+ os.write(buf, off, len);
+ throw new RuntimeException("Expected IOOBEx was not thrown");
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ if (baos.size() > 0)
+ throw new RuntimeException("No output was expected, but got "
+ + baos.size() + " bytes");
+ }
+ }
+ }
+
+ private static void testDecoderKeepsAbstinence(Base64.Decoder dec)
+ throws Throwable {
+ List<Integer> vals = new ArrayList<>(List.of(Integer.MIN_VALUE,
+ Integer.MIN_VALUE + 1, -1111, -2, -1, 0, 1, 2, 3, 1111,
+ Integer.MAX_VALUE - 1, Integer.MAX_VALUE));
+ vals.addAll(List.of(rnd.nextInt(), rnd.nextInt(), rnd.nextInt(),
+ rnd.nextInt()));
+ byte[] buf = new byte[3];
+ for (int off : vals) {
+ for (int len : vals) {
+ if (off >= 0 && len >= 0 && off <= buf.length - len) {
+ // valid args, skip them
+ continue;
+ }
+ // invalid args, test them
+ System.out.println("testing off=" + off + ", len=" + len);
+
+ String input = "AAAAAAAAAAAAAAAAAAAAAA";
+ ByteArrayInputStream bais =
+ new ByteArrayInputStream(input.getBytes("Latin1"));
+ try (InputStream is = dec.wrap(bais)) {
+ is.read(buf, off, len);
+ throw new RuntimeException("Expected IOOBEx was not thrown");
+ } catch (IndexOutOfBoundsException expected) {
+ }
+ if (bais.available() != input.length())
+ throw new RuntimeException("No input should be consumed, "
+ + "but consumed " + (input.length() - bais.available())
+ + " bytes");
+ }
+ }
+ }
}
--- a/jdk/test/java/util/Calendar/Bug4302966.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/Calendar/Bug4302966.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,6 +24,7 @@
/*
* @test
* @bug 4302966
+ * @modules jdk.localedata
* @summary In Czech Republic first day of week is Monday not Sunday
*/
--- a/jdk/test/java/util/Collection/MOAT.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/Collection/MOAT.java Mon Sep 12 22:04:48 2016 +0000
@@ -112,7 +112,6 @@
testCollection(Arrays.asList(1,2,3));
testCollection(nCopies(25,1));
testImmutableList(nCopies(25,1));
- testImmutableList(unmodifiableList(Arrays.asList(1,2,3)));
testMap(new HashMap<Integer,Integer>());
testMap(new LinkedHashMap<Integer,Integer>());
@@ -134,6 +133,20 @@
testMap(Collections.synchronizedSortedMap(new TreeMap<Integer,Integer>()));
testMap(Collections.synchronizedNavigableMap(new TreeMap<Integer,Integer>()));
+ // Unmodifiable wrappers
+ testImmutableSet(unmodifiableSet(new HashSet<>(Arrays.asList(1,2,3))));
+ testImmutableList(unmodifiableList(Arrays.asList(1,2,3)));
+ testImmutableMap(unmodifiableMap(Collections.singletonMap(1,2)));
+ testCollMutatorsAlwaysThrow(unmodifiableSet(new HashSet<>(Arrays.asList(1,2,3))));
+ testCollMutatorsAlwaysThrow(unmodifiableSet(Collections.emptySet()));
+ testEmptyCollMutatorsAlwaysThrow(unmodifiableSet(Collections.emptySet()));
+ testListMutatorsAlwaysThrow(unmodifiableList(Arrays.asList(1,2,3)));
+ testListMutatorsAlwaysThrow(unmodifiableList(Collections.emptyList()));
+ testEmptyListMutatorsAlwaysThrow(unmodifiableList(Collections.emptyList()));
+ testMapMutatorsAlwaysThrow(unmodifiableMap(Collections.singletonMap(1,2)));
+ testMapMutatorsAlwaysThrow(unmodifiableMap(Collections.emptyMap()));
+ testEmptyMapMutatorsAlwaysThrow(unmodifiableMap(Collections.emptyMap()));
+
// Empty collections
final List<Integer> emptyArray = Arrays.asList(new Integer[]{});
testCollection(emptyArray);
@@ -196,6 +209,8 @@
// Immutable List
testEmptyList(List.of());
+ testListMutatorsAlwaysThrow(List.of());
+ testEmptyListMutatorsAlwaysThrow(List.of());
for (List<Integer> list : Arrays.asList(
List.<Integer>of(),
List.of(1),
@@ -211,10 +226,13 @@
List.of(integerArray))) {
testCollection(list);
testImmutableList(list);
+ testListMutatorsAlwaysThrow(list);
}
// Immutable Set
testEmptySet(Set.of());
+ testCollMutatorsAlwaysThrow(Set.of());
+ testEmptyCollMutatorsAlwaysThrow(Set.of());
for (Set<Integer> set : Arrays.asList(
Set.<Integer>of(),
Set.of(1),
@@ -230,6 +248,7 @@
Set.of(integerArray))) {
testCollection(set);
testImmutableSet(set);
+ testCollMutatorsAlwaysThrow(set);
}
// Immutable Map
@@ -241,6 +260,8 @@
}
testEmptyMap(Map.of());
+ testMapMutatorsAlwaysThrow(Map.of());
+ testEmptyMapMutatorsAlwaysThrow(Map.of());
for (Map<Integer,Integer> map : Arrays.asList(
Map.<Integer,Integer>of(),
Map.of(1, 101),
@@ -256,6 +277,7 @@
Map.ofEntries(ea))) {
testMap(map);
testImmutableMap(map);
+ testMapMutatorsAlwaysThrow(map);
}
}
@@ -358,6 +380,93 @@
it.remove(); });
}
+ /**
+ * Test that calling a mutator always throws UOE, even if the mutator
+ * wouldn't actually do anything, given its arguments.
+ *
+ * @param c the collection instance to test
+ */
+ private static void testCollMutatorsAlwaysThrow(Collection<Integer> c) {
+ THROWS(UnsupportedOperationException.class,
+ () -> c.addAll(Collections.emptyList()),
+ () -> c.remove(ABSENT_VALUE),
+ () -> c.removeAll(Collections.emptyList()),
+ () -> c.removeIf(x -> false),
+ () -> c.retainAll(c));
+ }
+
+ /**
+ * Test that calling a mutator always throws UOE, even if the mutator
+ * wouldn't actually do anything on an empty collection.
+ *
+ * @param c the collection instance to test, must be empty
+ */
+ private static void testEmptyCollMutatorsAlwaysThrow(Collection<Integer> c) {
+ if (! c.isEmpty()) {
+ fail("collection is not empty");
+ }
+ THROWS(UnsupportedOperationException.class,
+ () -> c.clear());
+ }
+
+ /**
+ * As above, for a list.
+ *
+ * @param c the list instance to test
+ */
+ private static void testListMutatorsAlwaysThrow(List<Integer> c) {
+ testCollMutatorsAlwaysThrow(c);
+ THROWS(UnsupportedOperationException.class,
+ () -> c.addAll(0, Collections.emptyList()));
+ }
+
+ /**
+ * As above, for an empty list.
+ *
+ * @param c the list instance to test, must be empty
+ */
+ private static void testEmptyListMutatorsAlwaysThrow(List<Integer> c) {
+ if (! c.isEmpty()) {
+ fail("list is not empty");
+ }
+ testEmptyCollMutatorsAlwaysThrow(c);
+ THROWS(UnsupportedOperationException.class,
+ () -> c.replaceAll(x -> x),
+ () -> c.sort(null));
+ }
+
+ /**
+ * As above, for a map.
+ *
+ * @param m the map instance to test
+ */
+ private static void testMapMutatorsAlwaysThrow(Map<Integer,Integer> m) {
+ THROWS(UnsupportedOperationException.class,
+ () -> m.compute(ABSENT_VALUE, (k, v) -> null),
+ () -> m.computeIfAbsent(ABSENT_VALUE, k -> null),
+ () -> m.computeIfPresent(ABSENT_VALUE, (k, v) -> null),
+ () -> m.merge(ABSENT_VALUE, 0, (k, v) -> null),
+ () -> m.putAll(Collections.emptyMap()),
+ () -> m.remove(ABSENT_VALUE),
+ () -> m.remove(ABSENT_VALUE, 0),
+ () -> m.replace(ABSENT_VALUE, 0),
+ () -> m.replace(ABSENT_VALUE, 0, 1));
+ }
+
+ /**
+ * As above, for an empty map.
+ *
+ * @param map the map instance to test, must be empty
+ */
+ private static void testEmptyMapMutatorsAlwaysThrow(Map<Integer,Integer> m) {
+ if (! m.isEmpty()) {
+ fail("map is not empty");
+ }
+ THROWS(UnsupportedOperationException.class,
+ () -> m.clear(),
+ () -> m.replaceAll((k, v) -> v));
+ }
+
private static void clear(Collection<Integer> c) {
try { c.clear(); }
catch (Throwable t) { unexpected(t); }
--- a/jdk/test/java/util/Date/Bug8135055.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/Date/Bug8135055.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,6 +24,7 @@
/*
* @test
* @bug 8135055
+ * @modules java.sql
* @summary Test java.sql.TimeStamp instance should come after java.util.Date
* if Nanos component of TimeStamp is not equal to 0 milliseconds.
*/
--- a/jdk/test/java/util/Formatter/FormatLocale.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/Formatter/FormatLocale.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,6 +24,7 @@
/**
* @test
* @bug 8146156 8159548
+ * @modules jdk.localedata
* @summary test whether uppercasing follows Locale.Category.FORMAT locale.
* @run main/othervm FormatLocale
*/
--- a/jdk/test/java/util/PriorityQueue/NoNulls.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/PriorityQueue/NoNulls.java Mon Sep 12 22:04:48 2016 +0000
@@ -38,10 +38,8 @@
*/
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Comparator;
import java.util.Collection;
-import java.util.Collections;
import java.util.PriorityQueue;
import java.util.SortedSet;
import java.util.TreeSet;
--- a/jdk/test/java/util/ResourceBundle/modules/security/TestPermission.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/ResourceBundle/modules/security/TestPermission.java Mon Sep 12 22:04:48 2016 +0000
@@ -69,6 +69,7 @@
@Test
public void runTest() throws Exception {
int exitValue = executeTestJava("--module-path", MODS_DIR.toString(),
+ "--add-modules", "m1",
"-m", "test/jdk.test.Main")
.outputTo(System.out)
.errorTo(System.out)
--- a/jdk/test/java/util/ServiceLoader/modules/ServicesTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/ServiceLoader/modules/ServicesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -42,7 +42,7 @@
* @test
* @library /lib/testlibrary
* @modules java.scripting
- jdk.compiler
+ * jdk.compiler
* @build ServicesTest CompilerUtils jdk.testlibrary.*
* @run testng ServicesTest
* @summary Tests ServiceLoader to locate service providers on the module path
@@ -112,6 +112,7 @@
public void runWithModulePath() throws Exception {
int exitValue
= executeTestJava("--module-path", MODS_DIR.toString(),
+ "--add-modules", "bananascript",
"-m", "test/test.Main",
"BananaScriptEngine")
.outputTo(System.out)
@@ -131,6 +132,7 @@
int exitValue
= executeTestJava("--module-path", MODS_DIR.toString(),
"-cp", CLASSES_DIR.toString(),
+ "--add-modules", "bananascript",
"-m", "test/test.Main",
"BananaScriptEngine", "PearScriptEngine")
.outputTo(System.out)
--- a/jdk/test/java/util/TimeZone/HongKong.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/TimeZone/HongKong.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,6 +24,7 @@
/*
* @test
* @bug 4487276 8008577
+ * @modules jdk.localedata
* @summary Verify that Hong Kong locale uses traditional Chinese names.
* @run main/othervm -Djava.locale.providers=COMPAT,SPI HongKong
*/
--- a/jdk/test/java/util/concurrent/BlockingQueue/LoopHelpers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/BlockingQueue/LoopHelpers.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,8 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Misc utilities in JSR166 performance tests
*/
--- a/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/BlockingQueue/OfferDrainToLoops.java Mon Sep 12 22:04:48 2016 +0000
@@ -43,7 +43,6 @@
import java.util.SplittableRandom;
import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.LinkedTransferQueue;
--- a/jdk/test/java/util/concurrent/ConcurrentHashMap/LoopHelpers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/ConcurrentHashMap/LoopHelpers.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,8 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Misc utilities in JSR166 performance tests
*/
--- a/jdk/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/ConcurrentQueues/LoopHelpers.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,8 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Misc utilities in JSR166 performance tests
*/
--- a/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/ConcurrentQueues/OfferRemoveLoops.java Mon Sep 12 22:04:48 2016 +0000
@@ -43,7 +43,6 @@
import java.util.concurrent.LinkedTransferQueue;
import java.util.concurrent.PriorityBlockingQueue;
import java.util.concurrent.Semaphore;
-import java.util.concurrent.ThreadLocalRandom;
@SuppressWarnings({"unchecked", "rawtypes", "deprecation"})
public class OfferRemoveLoops {
--- a/jdk/test/java/util/concurrent/DelayQueue/Stress.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/DelayQueue/Stress.java Mon Sep 12 22:04:48 2016 +0000
@@ -22,7 +22,6 @@
*/
import static java.util.concurrent.TimeUnit.NANOSECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
import java.util.concurrent.DelayQueue;
import java.util.concurrent.Delayed;
--- a/jdk/test/java/util/concurrent/Exchanger/LoopHelpers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/Exchanger/LoopHelpers.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,8 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Misc utilities in JSR166 performance tests
*/
--- a/jdk/test/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/ExecutorCompletionService/LoopHelpers.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,8 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Misc utilities in JSR166 performance tests
*/
--- a/jdk/test/java/util/concurrent/FutureTask/LoopHelpers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/FutureTask/LoopHelpers.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,8 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Misc utilities in JSR166 performance tests
*/
--- a/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCorePoolSize.java Mon Sep 12 22:04:48 2016 +0000
@@ -33,7 +33,6 @@
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
import jdk.testlibrary.Utils;
/**
--- a/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCoreThreads.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/ScheduledThreadPoolExecutor/ZeroCoreThreads.java Mon Sep 12 22:04:48 2016 +0000
@@ -40,7 +40,6 @@
import static java.util.concurrent.TimeUnit.HOURS;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
import java.lang.reflect.Field;
import java.util.concurrent.BlockingQueue;
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,13 +28,13 @@
* @library /lib/testlibrary/
* @build jdk.testlibrary.RandomFactory
* @run main/othervm ConfigChanges
- * @key randomness intermittent
+ * @key randomness
* @author Martin Buchholz
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static java.util.concurrent.TimeUnit.MINUTES;
-import static java.util.concurrent.TimeUnit.SECONDS;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
import java.security.Permission;
import java.util.Random;
@@ -44,7 +44,6 @@
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.atomic.AtomicInteger;
import jdk.testlibrary.RandomFactory;
public class ConfigChanges {
@@ -95,10 +94,10 @@
check(tpe.getQueue().isEmpty());
check(tpe.isTerminated());
check(! tpe.isTerminating());
- equal(tpe.getActiveCount(), 0);
- equal(tpe.getPoolSize(), 0);
+ equal(0, tpe.getActiveCount());
+ equal(0, tpe.getPoolSize());
equal(tpe.getTaskCount(), tpe.getCompletedTaskCount());
- check(tpe.awaitTermination(0L, SECONDS));
+ check(tpe.awaitTermination(0L, MINUTES));
} catch (Throwable t) { unexpected(t); }
}
@@ -110,6 +109,21 @@
static volatile Runnable runnableDuJour;
+ static void awaitIdleness(ThreadPoolExecutor tpe, long taskCount) {
+ restart: for (;;) {
+ // check twice to make chance of race vanishingly small
+ for (int i = 0; i < 2; i++) {
+ if (tpe.getQueue().size() != 0 ||
+ tpe.getActiveCount() != 0 ||
+ tpe.getCompletedTaskCount() != taskCount) {
+ Thread.yield();
+ continue restart;
+ }
+ }
+ return;
+ }
+ }
+
private static void realMain(String[] args) throws Throwable {
if (rnd.nextBoolean())
System.setSecurityManager(new PermissiveSecurityManger());
@@ -137,8 +151,9 @@
if (prestart) {
tpe.prestartAllCoreThreads();
- equal(tg.activeCount(), n);
- equal(tg.activeCount(), tpe.getCorePoolSize());
+ equal(n, tg.activeCount());
+ equal(n, tpe.getCorePoolSize());
+ equal(n, tpe.getLargestPoolSize());
}
final Runnable runRunnableDuJour =
@@ -153,7 +168,7 @@
tpe.execute(runRunnableDuJour);
// Wait for prestarted threads to dequeue their initial tasks.
while (! tpe.getQueue().isEmpty())
- Thread.sleep(10);
+ Thread.sleep(1);
for (int i = 0; i < 5*n; i++)
tpe.execute(runRunnableDuJour);
} else {
@@ -163,73 +178,76 @@
//report("submitted", tpe);
pumpedUp.await();
- equal(tg.activeCount(), 3*n);
- equal(tg.activeCount(), tpe.getMaximumPoolSize());
- equal(tpe.getCorePoolSize(), n);
+ equal(3*n, tg.activeCount());
+ equal(3*n, tpe.getMaximumPoolSize());
+ equal(3*n, tpe.getLargestPoolSize());
+ equal(n, tpe.getCorePoolSize());
+ equal(3*n, tpe.getActiveCount());
+ equal(6L*n, tpe.getTaskCount());
+ equal(0L, tpe.getCompletedTaskCount());
+
//report("pumped up", tpe);
- equal(tpe.getMaximumPoolSize(), 3*n);
tpe.setMaximumPoolSize(4*n);
- equal(tpe.getMaximumPoolSize(), 4*n);
+ equal(4*n, tpe.getMaximumPoolSize());
//report("pumped up2", tpe);
final CyclicBarrier pumpedUp2 = new CyclicBarrier(n + 1);
runnableDuJour = waiter(pumpedUp2);
for (int i = 0; i < 1*n; i++)
tpe.execute(runRunnableDuJour);
pumpedUp2.await();
- equal(tg.activeCount(), 4*n);
- equal(tg.activeCount(), tpe.getMaximumPoolSize());
- equal(tpe.getCompletedTaskCount(), 0L);
+ equal(4*n, tg.activeCount());
+ equal(4*n, tpe.getMaximumPoolSize());
+ equal(4*n, tpe.getLargestPoolSize());
+ equal(4*n, tpe.getActiveCount());
+ equal(7L*n, tpe.getTaskCount());
+ equal(0L, tpe.getCompletedTaskCount());
//report("pumped up2", tpe);
runnableDuJour = new Runnable() { public void run() {}};
tpe.setMaximumPoolSize(2*n);
- //report("after set", tpe);
+ //report("after setMaximumPoolSize", tpe);
pumpedUp2.await();
pumpedUp.await();
-// while (tg.activeCount() != n &&
-// tg.activeCount() != n)
-// Thread.sleep(10);
-// equal(tg.activeCount(), n);
-// equal(tg.activeCount(), tpe.getCorePoolSize());
-
while (tg.activeCount() != 2*n &&
tg.activeCount() != 2*n)
- Thread.sleep(10);
- equal(tg.activeCount(), 2*n);
- equal(tg.activeCount(), tpe.getMaximumPoolSize());
-
+ Thread.yield();
+ equal(2*n, tg.activeCount());
+ equal(2*n, tpe.getMaximumPoolSize());
+ equal(4*n, tpe.getLargestPoolSize());
-//report("draining", tpe);
- while (tpe.getCompletedTaskCount() < 7*n &&
- tpe.getCompletedTaskCount() < 7*n)
- Thread.sleep(10);
+ //report("draining", tpe);
+ awaitIdleness(tpe, 7L*n);
- //equal(tg.activeCount(), n);
- //equal(tg.activeCount(), tpe.getCorePoolSize());
- equal(tg.activeCount(), 2*n);
- equal(tg.activeCount(), tpe.getMaximumPoolSize());
+ equal(2*n, tg.activeCount());
+ equal(2*n, tpe.getMaximumPoolSize());
+ equal(4*n, tpe.getLargestPoolSize());
- equal(tpe.getTaskCount(), 7L*n);
- equal(tpe.getCompletedTaskCount(), 7L*n);
+ equal(7L*n, tpe.getTaskCount());
+ equal(7L*n, tpe.getCompletedTaskCount());
+ equal(0, tpe.getActiveCount());
- equal(tpe.getKeepAliveTime(MINUTES), 3L);
+ equal(3L, tpe.getKeepAliveTime(MINUTES));
+ long t0 = System.nanoTime();
tpe.setKeepAliveTime(7L, MILLISECONDS);
- equal(tpe.getKeepAliveTime(MILLISECONDS), 7L);
+ equal(7L, tpe.getKeepAliveTime(MILLISECONDS));
while (tg.activeCount() > n &&
tg.activeCount() > n)
- Thread.sleep(10);
- equal(tg.activeCount(), n);
+ Thread.sleep(4);
+ equal(n, tg.activeCount());
+ check(System.nanoTime() - t0 >= tpe.getKeepAliveTime(NANOSECONDS));
//report("idle", tpe);
check(! tpe.allowsCoreThreadTimeOut());
+ t0 = System.nanoTime();
tpe.allowCoreThreadTimeOut(true);
check(tpe.allowsCoreThreadTimeOut());
while (tg.activeCount() > 0 &&
tg.activeCount() > 0)
- Thread.sleep(10);
+ Thread.sleep(4);
equal(tg.activeCount(), 0);
+ check(System.nanoTime() - t0 >= tpe.getKeepAliveTime(NANOSECONDS));
//report("idle", tpe);
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/ThreadRestarts.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/ThreadPoolExecutor/ThreadRestarts.java Mon Sep 12 22:04:48 2016 +0000
@@ -40,7 +40,6 @@
*/
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
--- a/jdk/test/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/ThreadPoolExecutor/TimeOutShrink.java Mon Sep 12 22:04:48 2016 +0000
@@ -34,7 +34,6 @@
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
import jdk.testlibrary.Utils;
public class TimeOutShrink {
--- a/jdk/test/java/util/concurrent/atomic/AtomicReferenceTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/atomic/AtomicReferenceTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -22,7 +22,6 @@
*/
import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.UnaryOperator;
import org.testng.annotations.Test;
import static org.testng.Assert.*;
--- a/jdk/test/java/util/concurrent/forkjoin/SubmissionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/forkjoin/SubmissionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -22,27 +22,35 @@
*/
import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
+import jdk.testlibrary.Utils;
/*
* @test
* @bug 8078490
* @summary Test submission and execution of task without joining
+ * @library /lib/testlibrary/
*/
public class SubmissionTest {
+ static final long LONG_DELAY_MS = Utils.adjustTimeout(10_000);
+
+ static long millisElapsedSince(long startTime) {
+ return (System.nanoTime() - startTime) / (1000L * 1000L);
+ }
+
public static void main(String[] args) throws Throwable {
final ForkJoinPool e = new ForkJoinPool(1);
final AtomicBoolean b = new AtomicBoolean();
final Runnable setFalse = () -> b.set(false);
- for (int i = 0; i < 100000; i++) {
+ for (int i = 0; i < 30_000; i++) {
b.set(true);
e.execute(setFalse);
- long st = System.nanoTime();
+ long startTime = System.nanoTime();
while (b.get()) {
- if (System.nanoTime() - st >= TimeUnit.SECONDS.toNanos(10)) {
+ if (millisElapsedSince(startTime) >= LONG_DELAY_MS) {
throw new RuntimeException("Submitted task failed to execute");
}
+ Thread.yield();
}
}
}
--- a/jdk/test/java/util/concurrent/locks/Lock/LoopHelpers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/locks/Lock/LoopHelpers.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,8 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Misc utilities in JSR166 performance tests
*/
--- a/jdk/test/java/util/concurrent/locks/Lock/Mutex.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/locks/Lock/Mutex.java Mon Sep 12 22:04:48 2016 +0000
@@ -35,7 +35,6 @@
import java.util.concurrent.locks.AbstractQueuedSynchronizer;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
-import java.util.concurrent.atomic.AtomicInteger;
import java.io.IOException;
import java.io.ObjectInputStream;
--- a/jdk/test/java/util/concurrent/locks/LockSupport/ParkLoops.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/locks/LockSupport/ParkLoops.java Mon Sep 12 22:04:48 2016 +0000
@@ -43,7 +43,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReferenceArray;
import java.util.concurrent.locks.LockSupport;
--- a/jdk/test/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/locks/ReentrantLock/LoopHelpers.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,8 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Misc utilities in JSR166 performance tests
*/
--- a/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/LoopHelpers.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/locks/ReentrantReadWriteLock/LoopHelpers.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,8 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Misc utilities in JSR166 performance tests
*/
--- a/jdk/test/java/util/concurrent/locks/StampedLock/ReadersUnlockAfterWriteUnlock.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/locks/StampedLock/ReadersUnlockAfterWriteUnlock.java Mon Sep 12 22:04:48 2016 +0000
@@ -22,7 +22,6 @@
/*
* @test
- * @run main/othervm/timeout=60 ReadersUnlockAfterWriteUnlock
* @bug 8023234
* @summary StampedLock serializes readers on writer unlock
* @author Dmitry Chyuko
@@ -30,26 +29,23 @@
*/
import java.util.concurrent.CyclicBarrier;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.StampedLock;
public class ReadersUnlockAfterWriteUnlock {
- static final int RNUM = 2;
- static final StampedLock sl = new StampedLock();
- static volatile boolean isDone;
-
- static CyclicBarrier iterationStart = new CyclicBarrier(RNUM + 1);
- static CyclicBarrier readersHaveLocks = new CyclicBarrier(RNUM);
- static CyclicBarrier writerHasLock = new CyclicBarrier(RNUM + 1);
+ public static void main(String[] args) throws InterruptedException {
+ final int RNUM = 2;
+ final int REPS = 128;
+ final StampedLock sl = new StampedLock();
+ final AtomicReference<Throwable> bad = new AtomicReference<>();
- static class Reader extends Thread {
- final String name;
- Reader(String name) {
- super();
- this.name = name;
- }
- public void run() {
- while (!isDone && !isInterrupted()) {
- try {
+ final CyclicBarrier iterationStart = new CyclicBarrier(RNUM + 1);
+ final CyclicBarrier readersHaveLocks = new CyclicBarrier(RNUM);
+ final CyclicBarrier writerHasLock = new CyclicBarrier(RNUM + 1);
+
+ Runnable reader = () -> {
+ try {
+ for (int i = 0; i < REPS; i++) {
iterationStart.await();
writerHasLock.await();
long rs = sl.readLock();
@@ -59,30 +55,45 @@
readersHaveLocks.await();
sl.unlockRead(rs);
- } catch (Exception e) {
- throw new IllegalStateException(e);
}
+ } catch (Throwable ex) {
+ ex.printStackTrace();
+ bad.set(ex);
}
- }
- }
+ };
- public static void main(String[] args) throws InterruptedException {
- for (int r = 0 ; r < RNUM; ++r) {
- new Reader("r" + r).start();
+ Thread[] threads = new Thread[RNUM];
+ for (int i = 0 ; i < RNUM; i++) {
+ Thread thread = new Thread(reader, "Reader");
+ threads[i] = thread;
+ thread.start();
}
- int i;
- for (i = 0; i < 1024; ++i) {
+ for (int i = 0; i < REPS; i++) {
try {
iterationStart.await();
long ws = sl.writeLock();
writerHasLock.await();
- Thread.sleep(10);
+ awaitWaitState(threads);
sl.unlockWrite(ws);
} catch (Exception e) {
throw new IllegalStateException(e);
}
}
- isDone = true;
+ for (Thread thread : threads)
+ thread.join();
+ if (bad.get() != null)
+ throw new AssertionError(bad.get());
}
+ static void awaitWaitState(Thread[] threads) {
+ restart: for (;;) {
+ for (Thread thread : threads) {
+ if (thread.getState() != Thread.State.WAITING) {
+ Thread.yield();
+ continue restart;
+ }
+ }
+ break;
+ }
+ }
}
--- a/jdk/test/java/util/concurrent/tck/AtomicIntegerArray9Test.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/AtomicIntegerArray9Test.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,7 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.Arrays;
import java.util.concurrent.atomic.AtomicIntegerArray;
import junit.framework.Test;
--- a/jdk/test/java/util/concurrent/tck/AtomicLongArray9Test.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/AtomicLongArray9Test.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,7 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.Arrays;
import java.util.concurrent.atomic.AtomicLongArray;
import junit.framework.Test;
--- a/jdk/test/java/util/concurrent/tck/AtomicReferenceArray9Test.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/AtomicReferenceArray9Test.java Mon Sep 12 22:04:48 2016 +0000
@@ -31,7 +31,6 @@
* http://creativecommons.org/publicdomain/zero/1.0/
*/
-import java.util.Arrays;
import java.util.concurrent.atomic.AtomicReferenceArray;
import junit.framework.Test;
--- a/jdk/test/java/util/concurrent/tck/CompletableFutureTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/CompletableFutureTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -59,7 +59,6 @@
import java.util.concurrent.ForkJoinTask;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.TimeoutException;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.BiConsumer;
--- a/jdk/test/java/util/concurrent/tck/ConcurrentHashMap8Test.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/ConcurrentHashMap8Test.java Mon Sep 12 22:04:48 2016 +0000
@@ -38,7 +38,6 @@
import java.util.AbstractMap;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.Map;
import java.util.NoSuchElementException;
--- a/jdk/test/java/util/concurrent/tck/CopyOnWriteArrayListTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/CopyOnWriteArrayListTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -36,7 +36,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
--- a/jdk/test/java/util/concurrent/tck/CopyOnWriteArraySetTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/CopyOnWriteArraySetTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -36,7 +36,6 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
-import java.util.Collections;
import java.util.Iterator;
import java.util.NoSuchElementException;
import java.util.Set;
--- a/jdk/test/java/util/concurrent/tck/CountedCompleterTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/CountedCompleterTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -40,9 +40,12 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool;
import java.util.concurrent.ForkJoinTask;
+import java.util.concurrent.ThreadLocalRandom;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -1869,4 +1872,115 @@
testInvokeOnPool(singletonPool(), a);
}
+ /** CountedCompleter class javadoc code sample, version 1. */
+ public static <E> void forEach1(E[] array, Consumer<E> action) {
+ class Task extends CountedCompleter<Void> {
+ final int lo, hi;
+ Task(Task parent, int lo, int hi) {
+ super(parent); this.lo = lo; this.hi = hi;
+ }
+
+ public void compute() {
+ if (hi - lo >= 2) {
+ int mid = (lo + hi) >>> 1;
+ // must set pending count before fork
+ setPendingCount(2);
+ new Task(this, mid, hi).fork(); // right child
+ new Task(this, lo, mid).fork(); // left child
+ }
+ else if (hi > lo)
+ action.accept(array[lo]);
+ tryComplete();
+ }
+ }
+ new Task(null, 0, array.length).invoke();
+ }
+
+ /** CountedCompleter class javadoc code sample, version 2. */
+ public static <E> void forEach2(E[] array, Consumer<E> action) {
+ class Task extends CountedCompleter<Void> {
+ final int lo, hi;
+ Task(Task parent, int lo, int hi) {
+ super(parent); this.lo = lo; this.hi = hi;
+ }
+
+ public void compute() {
+ if (hi - lo >= 2) {
+ int mid = (lo + hi) >>> 1;
+ setPendingCount(1); // looks off by one, but correct!
+ new Task(this, mid, hi).fork(); // right child
+ new Task(this, lo, mid).compute(); // direct invoke
+ } else {
+ if (hi > lo)
+ action.accept(array[lo]);
+ tryComplete();
+ }
+ }
+ }
+ new Task(null, 0, array.length).invoke();
+ }
+
+ /** CountedCompleter class javadoc code sample, version 3. */
+ public static <E> void forEach3(E[] array, Consumer<E> action) {
+ class Task extends CountedCompleter<Void> {
+ final int lo, hi;
+ Task(Task parent, int lo, int hi) {
+ super(parent); this.lo = lo; this.hi = hi;
+ }
+
+ public void compute() {
+ int n = hi - lo;
+ for (; n >= 2; n /= 2) {
+ addToPendingCount(1);
+ new Task(this, lo + n/2, lo + n).fork();
+ }
+ if (n > 0)
+ action.accept(array[lo]);
+ propagateCompletion();
+ }
+ }
+ new Task(null, 0, array.length).invoke();
+ }
+
+ /** CountedCompleter class javadoc code sample, version 4. */
+ public static <E> void forEach4(E[] array, Consumer<E> action) {
+ class Task extends CountedCompleter<Void> {
+ final int lo, hi;
+ Task(Task parent, int lo, int hi) {
+ super(parent, 31 - Integer.numberOfLeadingZeros(hi - lo));
+ this.lo = lo; this.hi = hi;
+ }
+
+ public void compute() {
+ for (int n = hi - lo; n >= 2; n /= 2)
+ new Task(this, lo + n/2, lo + n).fork();
+ action.accept(array[lo]);
+ propagateCompletion();
+ }
+ }
+ if (array.length > 0)
+ new Task(null, 0, array.length).invoke();
+ }
+
+ void testRecursiveDecomposition(
+ BiConsumer<Integer[], Consumer<Integer>> action) {
+ int n = ThreadLocalRandom.current().nextInt(8);
+ Integer[] a = new Integer[n];
+ for (int i = 0; i < n; i++) a[i] = i + 1;
+ AtomicInteger ai = new AtomicInteger(0);
+ action.accept(a, (x) -> ai.addAndGet(x));
+ assertEquals(n * (n + 1) / 2, ai.get());
+ }
+
+ /**
+ * Variants of divide-by-two recursive decomposition into leaf tasks,
+ * as described in the CountedCompleter class javadoc code samples
+ */
+ public void testRecursiveDecomposition() {
+ testRecursiveDecomposition(CountedCompleterTest::forEach1);
+ testRecursiveDecomposition(CountedCompleterTest::forEach2);
+ testRecursiveDecomposition(CountedCompleterTest::forEach3);
+ testRecursiveDecomposition(CountedCompleterTest::forEach4);
+ }
+
}
--- a/jdk/test/java/util/concurrent/tck/ExecutorCompletionService9Test.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/ExecutorCompletionService9Test.java Mon Sep 12 22:04:48 2016 +0000
@@ -42,7 +42,6 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorCompletionService;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import junit.framework.Test;
--- a/jdk/test/java/util/concurrent/tck/ExecutorCompletionServiceTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/ExecutorCompletionServiceTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -40,7 +40,6 @@
import java.util.concurrent.CompletionService;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
--- a/jdk/test/java/util/concurrent/tck/ForkJoinPool8Test.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/ForkJoinPool8Test.java Mon Sep 12 22:04:48 2016 +0000
@@ -296,12 +296,11 @@
RecursiveAction a = new CheckedRecursiveAction() {
protected void realCompute() {
FibAction f = new FibAction(8);
- final Thread myself = Thread.currentThread();
+ final Thread currentThread = Thread.currentThread();
// test join()
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
assertNull(f.join());
Thread.interrupted();
assertEquals(21, f.result);
@@ -310,8 +309,7 @@
f = new FibAction(8);
f.cancel(true);
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
try {
f.join();
shouldThrow();
@@ -323,8 +321,7 @@
f = new FibAction(8);
f.completeExceptionally(new FJException());
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
try {
f.join();
shouldThrow();
@@ -336,8 +333,7 @@
// test quietlyJoin()
f = new FibAction(8);
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
f.quietlyJoin();
Thread.interrupted();
assertEquals(21, f.result);
@@ -346,8 +342,7 @@
f = new FibAction(8);
f.cancel(true);
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
f.quietlyJoin();
Thread.interrupted();
checkCancelled(f);
@@ -355,8 +350,7 @@
f = new FibAction(8);
f.completeExceptionally(new FJException());
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
f.quietlyJoin();
Thread.interrupted();
checkCompletedAbnormally(f, f.getException());
--- a/jdk/test/java/util/concurrent/tck/ForkJoinTask8Test.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/ForkJoinTask8Test.java Mon Sep 12 22:04:48 2016 +0000
@@ -35,7 +35,6 @@
import static java.util.concurrent.TimeUnit.SECONDS;
import java.util.Arrays;
-import java.util.Collections;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool;
--- a/jdk/test/java/util/concurrent/tck/ForkJoinTaskTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/ForkJoinTaskTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -35,9 +35,7 @@
import static java.util.concurrent.TimeUnit.SECONDS;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
-import java.util.List;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinPool;
--- a/jdk/test/java/util/concurrent/tck/JSR166TestCase.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/JSR166TestCase.java Mon Sep 12 22:04:48 2016 +0000
@@ -1264,7 +1264,7 @@
* Sleeps until the given time has elapsed.
* Throws AssertionFailedError if interrupted.
*/
- void sleep(long millis) {
+ static void sleep(long millis) {
try {
delay(millis);
} catch (InterruptedException fail) {
--- a/jdk/test/java/util/concurrent/tck/RecursiveActionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/RecursiveActionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -285,12 +285,11 @@
RecursiveAction a = new CheckedRecursiveAction() {
protected void realCompute() {
FibAction f = new FibAction(8);
- final Thread myself = Thread.currentThread();
+ final Thread currentThread = Thread.currentThread();
// test join()
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
assertNull(f.join());
Thread.interrupted();
assertEquals(21, f.result);
@@ -299,8 +298,7 @@
f = new FibAction(8);
f.cancel(true);
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
try {
f.join();
shouldThrow();
@@ -312,8 +310,7 @@
f = new FibAction(8);
f.completeExceptionally(new FJException());
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
try {
f.join();
shouldThrow();
@@ -325,8 +322,7 @@
// test quietlyJoin()
f = new FibAction(8);
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
f.quietlyJoin();
Thread.interrupted();
assertEquals(21, f.result);
@@ -335,8 +331,7 @@
f = new FibAction(8);
f.cancel(true);
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
f.quietlyJoin();
Thread.interrupted();
checkCancelled(f);
@@ -344,8 +339,7 @@
f = new FibAction(8);
f.completeExceptionally(new FJException());
assertSame(f, f.fork());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
f.quietlyJoin();
Thread.interrupted();
checkCompletedAbnormally(f, f.getException());
@@ -385,22 +379,20 @@
public void realRun() throws InterruptedException {
FibAction[] fibActions = sq.take();
FibAction f;
- final Thread myself = Thread.currentThread();
+ final Thread currentThread = Thread.currentThread();
// test join() ------------
f = fibActions[0];
assertFalse(ForkJoinTask.inForkJoinPool());
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
assertNull(f.join());
assertTrue(Thread.interrupted());
assertEquals(21, f.result);
checkCompletedNormally(f);
f = fibActions[1];
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
try {
f.join();
shouldThrow();
@@ -410,8 +402,7 @@
}
f = fibActions[2];
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
try {
f.join();
shouldThrow();
@@ -423,23 +414,20 @@
// test quietlyJoin() ---------
f = fibActions[3];
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
f.quietlyJoin();
assertTrue(Thread.interrupted());
assertEquals(21, f.result);
checkCompletedNormally(f);
f = fibActions[4];
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
f.quietlyJoin();
assertTrue(Thread.interrupted());
checkCancelled(f);
f = fibActions[5];
- myself.interrupt();
- assertTrue(myself.isInterrupted());
+ currentThread.interrupt();
f.quietlyJoin();
assertTrue(Thread.interrupted());
assertTrue(f.getException() instanceof FJException);
--- a/jdk/test/java/util/concurrent/tck/ScheduledExecutorSubclassTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/ScheduledExecutorSubclassTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -44,7 +44,6 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Delayed;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.RejectedExecutionException;
--- a/jdk/test/java/util/concurrent/tck/ScheduledExecutorTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/ScheduledExecutorTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -45,7 +45,6 @@
import java.util.concurrent.CancellationException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.RejectedExecutionException;
--- a/jdk/test/java/util/concurrent/tck/StampedLockTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/StampedLockTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -44,7 +44,6 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.StampedLock;
import java.util.function.BiConsumer;
-import java.util.function.Consumer;
import java.util.function.Function;
import junit.framework.Test;
--- a/jdk/test/java/util/concurrent/tck/SubmissionPublisherTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/SubmissionPublisherTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -37,24 +37,14 @@
import java.util.concurrent.Executors;
import java.util.concurrent.Flow;
import java.util.concurrent.ForkJoinPool;
-import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.SubmissionPublisher;
-import java.util.concurrent.ThreadFactory;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.BiPredicate;
-import java.util.stream.Stream;
import junit.framework.Test;
import junit.framework.TestSuite;
-import static java.util.concurrent.Flow.Publisher;
import static java.util.concurrent.Flow.Subscriber;
import static java.util.concurrent.Flow.Subscription;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
public class SubmissionPublisherTest extends JSR166TestCase {
--- a/jdk/test/java/util/concurrent/tck/ThreadPoolExecutorSubclassTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/ThreadPoolExecutorSubclassTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -44,7 +44,6 @@
import java.util.concurrent.CancellationException;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
--- a/jdk/test/java/util/concurrent/tck/ThreadPoolExecutorTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/concurrent/tck/ThreadPoolExecutorTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -55,7 +55,6 @@
import java.util.concurrent.SynchronousQueue;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import junit.framework.Test;
--- a/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,23 +23,29 @@
/*
* @test
- * @bug 8132734 8144062
+ * @bug 8132734 8144062 8165723
* @summary Test the extended API and the aliasing additions in JarFile that
* support multi-release jar files
- * @library /lib/testlibrary/java/util/jar
+ * @library /lib/testlibrary/java/util/jar /lib/testlibrary/
* @build Compiler JarBuilder CreateMultiReleaseTestJars
+ * @build jdk.testlibrary.RandomFactory
* @run testng MultiReleaseJarAPI
*/
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.util.Arrays;
+import java.util.Map;
+import java.util.Random;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import jdk.testlibrary.RandomFactory;
+
import org.testng.Assert;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -48,12 +54,15 @@
public class MultiReleaseJarAPI {
+ private static final Random RANDOM = RandomFactory.getRandom();
+
String userdir = System.getProperty("user.dir",".");
CreateMultiReleaseTestJars creator = new CreateMultiReleaseTestJars();
File unversioned = new File(userdir, "unversioned.jar");
File multirelease = new File(userdir, "multi-release.jar");
File signedmultirelease = new File(userdir, "signed-multi-release.jar");
+
@BeforeClass
public void initialize() throws Exception {
creator.compileEntries();
@@ -99,10 +108,35 @@
testCustomMultiReleaseValue("true\r ", false);
testCustomMultiReleaseValue("true\n true", false);
testCustomMultiReleaseValue("true\r\n true", false);
+
+ // generate "random" Strings to use as extra attributes, and
+ // verify that Multi-Release: true is always properly matched
+ for (int i = 0; i < 100; i++) {
+ byte[] keyBytes = new byte[RANDOM.nextInt(70) + 1];
+ Arrays.fill(keyBytes, (byte)('a' + RANDOM.nextInt(24)));
+ byte[] valueBytes = new byte[RANDOM.nextInt(70) + 1];
+ Arrays.fill(valueBytes, (byte)('a' + RANDOM.nextInt(24)));
+
+ String key = new String(keyBytes, StandardCharsets.UTF_8);
+ String value = new String(valueBytes, StandardCharsets.UTF_8);
+ // test that Multi-Release: true anywhere in the manifest always
+ // return true
+ testCustomMultiReleaseValue("true", Map.of(key, value), true);
+
+ // test that we don't get any false positives
+ testCustomMultiReleaseValue("false", Map.of(key, value), false);
+ }
}
- private void testCustomMultiReleaseValue(String value, boolean expected) throws Exception {
- creator.buildCustomMultiReleaseJar("custom-mr.jar", value);
+ private void testCustomMultiReleaseValue(String value, boolean expected)
+ throws Exception {
+ testCustomMultiReleaseValue(value, Map.of(), expected);
+ }
+
+ private void testCustomMultiReleaseValue(String value,
+ Map<String, String> extraAttributes, boolean expected)
+ throws Exception {
+ creator.buildCustomMultiReleaseJar("custom-mr.jar", value, extraAttributes);
File custom = new File(userdir, "custom-mr.jar");
try (JarFile jf = new JarFile(custom, true, ZipFile.OPEN_READ, Runtime.version())) {
Assert.assertEquals(jf.isMultiRelease(), expected);
--- a/jdk/test/java/util/logging/modules/GetResourceBundleTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/java/util/logging/modules/GetResourceBundleTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -37,6 +37,7 @@
* @bug 8129126 8136802 8137316 8137317 8136804 8139350
* @library /lib/testlibrary
* @modules jdk.compiler
+ * java.logging
* @build GetResourceBundleTest CompilerUtils jdk.testlibrary.ProcessTools
* @run testng GetResourceBundleTest
* @summary Tests Logger.getLogger + logger.getResourceBundle in an named/unnamed module,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/management/remote/mandatory/connection/ObjectInputStreamWithLoaderNullCheckTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2016, 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 8009560
+ * @summary Test RMIConnector.ObjectInputStreamWithLoader constructor with
+ * null Class loader. The test expects a IllegalArgumentException
+ * thrown when constructor is invoked with null class loader as
+ * an argument.
+ * @author Amit Sapre
+ * @modules java.management
+ * @run clean ObjectInputStreamWithLoaderNullCheckTest
+ * @run build ObjectInputStreamWithLoaderNullCheckTest
+ * @run main ObjectInputStreamWithLoaderNullCheckTest
+ */
+
+import java.lang.reflect.*;
+import javax.management.remote.*;
+import javax.management.remote.rmi.*;
+import java.io.*;
+
+public class ObjectInputStreamWithLoaderNullCheckTest {
+
+ private static Class<?> innerClass;
+
+ public static void main(String[] args) throws Exception {
+
+ System.out.println(">> == ObjectInputStreamWithLoaderNullCheckTest started...");
+
+ try {
+ innerClass = Class.forName("javax.management.remote.rmi.RMIConnector$ObjectInputStreamWithLoader");
+ Constructor<?> ctor = innerClass.getDeclaredConstructor(InputStream.class,ClassLoader.class);
+ ctor.setAccessible(true);
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ ObjectOutput objOut = new ObjectOutputStream(baos);
+ objOut.writeObject(new String("Serialize"));
+ objOut.close();
+ baos.close();
+ ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+
+ System.out.println(">> == Testing constructor with null class loader.");
+ Object obj = ctor.newInstance(bais,null);
+
+ System.out.println(">> == Test case failed. No error occured");
+ System.exit(1);
+ } catch (InvocationTargetException ex) {
+ Throwable cause = ex.getCause();
+ System.out.println(">> == InvocationTargetException Cause message : " + cause.toString());
+ if (cause instanceof IllegalArgumentException) {
+ System.out.println(">> == Test case Passed.");
+ } else {
+ System.out.println(">> == Test case Failed.");
+ ex.printStackTrace();
+ System.exit(1);
+ }
+ } catch (Exception ex) {
+ System.out.println(">>> == Test case failed with error " + ex.getCause().getMessage());
+ ex.printStackTrace();
+ System.exit(1);
+ }
+ }
+}
--- a/jdk/test/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/lib/testlibrary/java/util/jar/CreateMultiReleaseTestJars.java Mon Sep 12 22:04:48 2016 +0000
@@ -88,12 +88,35 @@
}
public void buildMultiReleaseJar() throws IOException {
- buildCustomMultiReleaseJar("multi-release.jar", "true");
+ JarBuilder jb = customMultiReleaseJar("multi-release.jar", "true");
+ addEntries(jb);
+ jb.addEntry("META-INF/versions/9/version/Version.class", version9Classes.get("version.Version"));
+ jb.build();
+ }
+
+ public void buildShortMultiReleaseJar() throws IOException {
+ JarBuilder jb = customMultiReleaseJar("short-multi-release.jar", "true");
+ addEntries(jb);
+ jb.build();
}
- public void buildCustomMultiReleaseJar(String filename, String multiReleaseValue) throws IOException {
+ private JarBuilder customMultiReleaseJar(String filename, String multiReleaseValue)
+ throws IOException {
JarBuilder jb = new JarBuilder(filename);
jb.addAttribute("Multi-Release", multiReleaseValue);
+ return jb;
+ }
+
+ public void buildCustomMultiReleaseJar(String filename, String multiReleaseValue,
+ Map<String, String> extraAttributes) throws IOException {
+ JarBuilder jb = new JarBuilder(filename);
+ extraAttributes.entrySet()
+ .forEach(entry -> jb.addAttribute(entry.getKey(), entry.getValue()));
+ jb.addAttribute("Multi-Release", multiReleaseValue);
+ jb.build();
+ }
+
+ private void addEntries(JarBuilder jb) {
jb.addEntry("README", readme8.getBytes());
jb.addEntry("version/Main.java", main.getBytes());
jb.addEntry("version/Main.class", rootClasses.get("version.Main"));
@@ -102,31 +125,10 @@
jb.addEntry("META-INF/versions/9/README", readme9.getBytes());
jb.addEntry("META-INF/versions/9/version/Version.java", java9.getBytes());
jb.addEntry("META-INF/versions/9/version/PackagePrivate.java", ppjava9.getBytes());
- jb.addEntry("META-INF/versions/9/version/Version.class", version9Classes.get("version.Version"));
jb.addEntry("META-INF/versions/9/version/PackagePrivate.class", version9Classes.get("version.PackagePrivate"));
jb.addEntry("META-INF/versions/10/README", readme10.getBytes());
jb.addEntry("META-INF/versions/10/version/Version.java", java10.getBytes());
jb.addEntry("META-INF/versions/10/version/Version.class", version10Classes.get("version.Version"));
- jb.build();
- }
-
- public void buildShortMultiReleaseJar() throws IOException {
- JarBuilder jb = new JarBuilder("short-multi-release.jar");
- jb.addAttribute("Multi-Release", "true");
- jb.addEntry("README", readme8.getBytes());
- jb.addEntry("version/Main.java", main.getBytes());
- jb.addEntry("version/Main.class", rootClasses.get("version.Main"));
- jb.addEntry("version/Version.java", java8.getBytes());
- jb.addEntry("version/Version.class", rootClasses.get("version.Version"));
- jb.addEntry("META-INF/versions/9/README", readme9.getBytes());
- jb.addEntry("META-INF/versions/9/version/Version.java", java9.getBytes());
- jb.addEntry("META-INF/versions/9/version/PackagePrivate.java", ppjava9.getBytes());
- // no entry for META-INF/versions/9/version/Version.class
- jb.addEntry("META-INF/versions/9/version/PackagePrivate.class", version9Classes.get("version.PackagePrivate"));
- jb.addEntry("META-INF/versions/10/README", readme10.getBytes());
- jb.addEntry("META-INF/versions/10/version/Version.java", java10.getBytes());
- jb.addEntry("META-INF/versions/10/version/Version.class", version10Classes.get("version.Version"));
- jb.build();
}
public void buildSignedMultiReleaseJar() throws Exception {
--- a/jdk/test/sun/text/resources/Collator/Bug4248694.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Collator/Bug4248694.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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,11 +24,13 @@
/*
* @test
* @bug 4248694
+ * @modules jdk.localedata
* @summary updating collation tables for icelandic
*/
-import java.text.*;
-import java.util.*;
+import java.text.Collator;
+import java.util.Arrays;
+import java.util.Locale;
public class Bug4248694 {
--- a/jdk/test/sun/text/resources/Collator/Bug4804273.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Collator/Bug4804273.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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,11 +24,13 @@
/*
* @test
* @bug 4804273
+ * @modules jdk.localedata
* @summary updating collation tables for swedish
*/
-import java.text.*;
-import java.util.*;
+import java.text.Collator;
+import java.util.Arrays;
+import java.util.Locale;
public class Bug4804273 {
--- a/jdk/test/sun/text/resources/Collator/Bug6755060.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Collator/Bug6755060.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2016, 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,11 +24,13 @@
/*
* @test
* @bug 6755060
+ * @modules jdk.localedata
* @summary updating collation tables for thai to make it consistent with CLDR 1.9
*/
-import java.text.*;
-import java.util.*;
+import java.text.Collator;
+import java.util.Arrays;
+import java.util.Locale;
public class Bug6755060 {
--- a/jdk/test/sun/text/resources/Format/Bug4395196.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug4395196.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,15 +22,18 @@
*/
/*
- *@test
- *@bug 4395196 4930708 4900884 4890240 8008577
- *@summary verify the ko DateFormat
- *@run main/othervm -Djava.locale.providers=JRE,SPI Bug4395196
-*/
+ * @test
+ * @bug 4395196 4930708 4900884 4890240 8008577
+ * @modules jdk.localedata
+ * @summary verify the ko DateFormat
+ * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4395196
+ */
-import java.io.*;
-import java.text.*;
-import java.util.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
public class Bug4395196
{
--- a/jdk/test/sun/text/resources/Format/Bug4442855.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug4442855.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,14 +22,16 @@
*/
/*
- *@test
- *@bug 4442855
- *@summary verify the era's translation for tradition chinese
+ * @test
+ * @bug 4442855
+ * @modules jdk.localedata
+ * @summary verify the era's translation for tradition chinese
*/
-import java.io.*;
-import java.util.*;
-import java.text.*;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Locale;
public class Bug4442855
{
--- a/jdk/test/sun/text/resources/Format/Bug4621320.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug4621320.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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,10 +24,12 @@
/*
* @test
* @bug 4621320
+ * @modules jdk.localedata
* @summary Verify that Ukrainian month name is correct.
*/
-import java.text.*;
-import java.util.*;
+
+import java.text.DateFormatSymbols;
+import java.util.Locale;
public class Bug4621320 {
--- a/jdk/test/sun/text/resources/Format/Bug4651568.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug4651568.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,10 +22,11 @@
*/
/*
- *@test
- *@bug 4651568 8008577
- *@summary Verifies the currency pattern for pt_BR locale
- *@run main/othervm -Djava.locale.providers=JRE,SPI Bug4651568
+ * @test
+ * @bug 4651568 8008577
+ * @modules jdk.localedata
+ * @summary Verifies the currency pattern for pt_BR locale
+ * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4651568
*/
import java.text.DecimalFormat;
--- a/jdk/test/sun/text/resources/Format/Bug4762201.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug4762201.java Mon Sep 12 22:04:48 2016 +0000
@@ -22,15 +22,17 @@
*/
/*
- *@test
- *@bug 4762201
- *@summary verify the zh_CN full time pattern (and other time patterns)
- *@run main/othervm -Djava.locale.providers=COMPAT,SPI Bug4762201
-*/
+ * @test
+ * @bug 4762201
+ * @modules jdk.localedata
+ * @summary verify the zh_CN full time pattern (and other time patterns)
+ * @run main/othervm -Djava.locale.providers=COMPAT,SPI Bug4762201
+ */
-import java.io.*;
-import java.text.*;
-import java.util.*;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Locale;
public class Bug4762201
{
--- a/jdk/test/sun/text/resources/Format/Bug4807540.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug4807540.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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 @@
/*
* @test %i%
* @bug 4807540 8008577
+ * @modules jdk.localedata
* @summary updating dateformat for sl_SI
* @run main/othervm -Djava.locale.providers=JRE,SPI Bug4807540
*/
--- a/jdk/test/sun/text/resources/Format/Bug4810032.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug4810032.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,14 +22,16 @@
*/
/*
- *@test
- *@bug 4810032 8008577
- *@summary verify the ja full time pattern parsing
+ * @test
+ * @bug 4810032 8008577
+ * @modules jdk.localedata
+ * @summary verify the ja full time pattern parsing
* @run main/othervm -Djava.locale.providers=JRE,SPI Bug4810032
*/
-import java.text.*;
-import java.util.*;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.util.Locale;
public class Bug4810032
{
--- a/jdk/test/sun/text/resources/Format/Bug4994312.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug4994312.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,9 +22,10 @@
*/
/*
- *@test
- *@bug 4994312 8008577
- *@summary verify the German locale will accept localized pattern chars 't' and 'u'.
+ * @test
+ * @bug 4994312 8008577
+ * @modules jdk.localedata
+ * @summary verify the German locale will accept localized pattern chars 't' and 'u'.
* @run main/othervm -Djava.locale.providers=JRE,SPI Bug4994312
*/
--- a/jdk/test/sun/text/resources/Format/Bug5096553.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug5096553.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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 @@
/*
* @test
* @bug 5096553 8008577
+ * @modules jdk.localedata
* @summary updating dateformat for da_DK
* following resources:
* http://oss.software.ibm.com/cvs/icu/~checkout~/locale/common/main/da.xml
--- a/jdk/test/sun/text/resources/Format/Bug8037343.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug8037343.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, 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 @@
/*
* @test
* @bug 8008577 8037343
+ * @modules jdk.localedata
* @summary updating dateformat for es_DO
* @run main/othervm -Djava.locale.providers=JRE,SPI Bug8037343
*/
--- a/jdk/test/sun/text/resources/Format/Bug8074791.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/Format/Bug8074791.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
/*
* @test
* @bug 8074791
+ * @modules jdk.localedata
* @summary Make sure that Finnish month names are correct in formatted text.
*/
@@ -32,7 +33,7 @@
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.Locale;
-import static java.text.DateFormat.*;
+import static java.text.DateFormat.LONG;
import static java.util.Calendar.JANUARY;
public class Bug8074791 {
--- a/jdk/test/sun/text/resources/LocaleDataTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/text/resources/LocaleDataTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -40,6 +40,7 @@
* 8145136
* @summary Verify locale data
* @modules java.base/sun.util.resources
+ * @modules jdk.localedata
* @run main LocaleDataTest
* @run main LocaleDataTest -cldr
*
@@ -145,12 +146,20 @@
* this test against the new version of the data.
*/
-import java.io.*;
-import java.text.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilterReader;
+import java.io.FilterWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Reader;
+import java.io.Writer;
import java.util.Locale;
+import java.util.MissingResourceException;
import java.util.ResourceBundle;
-import java.util.ResourceBundle.Control;
-import java.util.MissingResourceException;
import sun.util.resources.LocaleData;
public class LocaleDataTest
--- a/jdk/test/sun/util/locale/provider/Bug8038436.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/locale/provider/Bug8038436.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,15 +27,25 @@
* @summary Test for changes in 8038436
* @modules java.base/sun.util.locale.provider
* java.base/sun.util.spi
+ * jdk.localedata
* @compile -XDignore.symbol.file Bug8038436.java
* @run main/othervm --limit-modules java.base Bug8038436 security
* @run main/othervm -Djava.locale.providers=COMPAT Bug8038436 availlocs
*/
-import java.security.*;
-import java.util.*;
-import java.util.stream.*;
-import sun.util.locale.provider.*;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Policy;
+import java.security.ProtectionDomain;
+import java.util.Arrays;
+import java.util.Formatter;
+import java.util.GregorianCalendar;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+import sun.util.locale.provider.LocaleProviderAdapter;
public class Bug8038436 {
public static void main(String[] args) {
--- a/jdk/test/sun/util/locale/provider/Bug8152817.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/locale/provider/Bug8152817.java Mon Sep 12 22:04:48 2016 +0000
@@ -28,6 +28,7 @@
* @bug 8152817
* @summary Make sure that resource bundles in the jdk.localedata module are
* loaded under a security manager.
+ * @modules jdk.localedata
* @run main/othervm -Djava.locale.providers=COMPAT
* -Djava.security.debug=access,failure,codebase=jrt:/jdk.localedata Bug8152817
*/
--- a/jdk/test/sun/util/resources/Calendar/Bug4518811.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/Calendar/Bug4518811.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,9 +22,10 @@
*/
/*
- *@test
- *@bug 4518811
- *@summary Verifies the minimum days of the week for euro locales
+ * @test
+ * @bug 4518811
+ * @modules jdk.localedata
+ * @summary Verifies the minimum days of the week for euro locales
*/
// this code is a bit brute-force, but I've been coding in nothing but Shell for the last year, so I'm rusty.
--- a/jdk/test/sun/util/resources/Calendar/Bug4527203.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/Calendar/Bug4527203.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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 @@
/*
* @test 1.1 11/02/01
* @bug 4527203
+ * @modules jdk.localedata
* @summary In Hungary and Ukraine first day of week is Monday not Sunday
*/
--- a/jdk/test/sun/util/resources/Locale/Bug4429024.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/Locale/Bug4429024.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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,12 +20,13 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-/**
- @test
- @summary checking localised language/country names in finnish
- @bug 4429024 4964035 6558856 8008577
- @run main/othervm -Djava.locale.providers=JRE,SPI Bug4429024
-*/
+/*
+ * @test
+ * @summary checking localised language/country names in finnish
+ * @modules jdk.localedata
+ * @bug 4429024 4964035 6558856 8008577
+ * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4429024
+ */
import java.util.Locale;
--- a/jdk/test/sun/util/resources/Locale/Bug4965260.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/Locale/Bug4965260.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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,11 +20,12 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-/**
- *@test
- *@bug 4965260 8008577
- *@summary Verifies the language name of "nl" for supported locales
- *@run main/othervm -Djava.locale.providers=JRE,SPI Bug4965260
+/*
+ * @test
+ * @bug 4965260 8008577
+ * @modules jdk.localedata
+ * @summary Verifies the language name of "nl" for supported locales
+ * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4965260
*/
import java.util.Locale;
--- a/jdk/test/sun/util/resources/Locale/Bug6275682.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/Locale/Bug6275682.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -21,10 +21,11 @@
* questions.
*/
-/**
- @test
- @summary Verifying that the language names starts with lowercase in spanish
- @bug 6275682
+/*
+ * @test
+ * @summary Verifying that the language names starts with lowercase in spanish
+ * @modules jdk.localedata
+ * @bug 6275682
*/
import java.util.Locale;
--- a/jdk/test/sun/util/resources/TimeZone/Bug4938846.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/TimeZone/Bug4938846.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,10 +22,11 @@
*/
/*
- *@test
- *@bug 4938846 8008577
- *@summary Test case for en_IE TimeZone info
- *@run main/othervm -Djava.locale.providers=JRE,SPI Bug4938846
+ * @test
+ * @bug 4938846 8008577
+ * @modules jdk.localedata
+ * @summary Test case for en_IE TimeZone info
+ * @run main/othervm -Djava.locale.providers=JRE,SPI Bug4938846
*/
import java.util.Locale;
--- a/jdk/test/sun/util/resources/TimeZone/Bug6271396.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/TimeZone/Bug6271396.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,10 +22,11 @@
*/
/*
- *@test
- *@bug 6271396 8008577
- *@summary Test case for verifying typo of timezone display name Australia/Lord_Howe
- *@run main/othervm -Djava.locale.providers=JRE,SPI Bug6271396
+ * @test
+ * @bug 6271396 8008577
+ * @modules jdk.localedata
+ * @summary Test case for verifying typo of timezone display name Australia/Lord_Howe
+ * @run main/othervm -Djava.locale.providers=JRE,SPI Bug6271396
*/
import java.util.Locale;
--- a/jdk/test/sun/util/resources/TimeZone/Bug6317929.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/TimeZone/Bug6317929.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,10 +22,11 @@
*/
/*
- *@test
- *@bug 6317929 6409419 8008577
- *@summary Test case for tzdata2005m support for 9 locales
- *@run main/othervm -Djava.locale.providers=JRE,SPI Bug6317929
+ * @test
+ * @bug 6317929 6409419 8008577
+ * @modules jdk.localedata
+ * @summary Test case for tzdata2005m support for 9 locales
+ * @run main/othervm -Djava.locale.providers=JRE,SPI Bug6317929
*/
import java.util.Locale;
--- a/jdk/test/sun/util/resources/TimeZone/Bug6377794.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/TimeZone/Bug6377794.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,10 +22,11 @@
*/
/*
- *@test
- *@bug 6377794
- *@summary Test case for tzdata2005r support for 9 locales
- *@run main/othervm -Djava.locale.providers=JRE,SPI Bug6377794
+ * @test
+ * @bug 6377794
+ * @modules jdk.localedata
+ * @summary Test case for tzdata2005r support for 9 locales
+ * @run main/othervm -Djava.locale.providers=JRE,SPI Bug6377794
*/
import java.util.Locale;
--- a/jdk/test/sun/util/resources/TimeZone/Bug6442006.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/TimeZone/Bug6442006.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2007, 2016, 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
@@ -22,10 +22,11 @@
*/
/*
- *@test
- *@bug 6442006 8008577
- *@summary Test case for verifying timezone display name for Asia/Taipei
- *@run main/othervm -Djava.locale.providers=JRE,SPI Bug6442006
+ * @test
+ * @bug 6442006 8008577
+ * @modules jdk.localedata
+ * @summary Test case for verifying timezone display name for Asia/Taipei
+ * @run main/othervm -Djava.locale.providers=JRE,SPI Bug6442006
*/
import java.util.Locale;
--- a/jdk/test/sun/util/resources/cldr/Bug8134250.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/cldr/Bug8134250.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2016, 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 @@
/*
* @test
* @bug 8134250 8134520
+ * @modules jdk.localedata
* @summary Tests CLDR/LDML features are correctly reflected in JDK.
* @run main/othervm -Djava.locale.providers=CLDR Bug8134250
*/
@@ -31,10 +32,15 @@
// Note this test highly depends on a particular version of CLDR. Results
// may vary in the future.
-import java.time.*;
-import java.time.chrono.*;
-import java.time.format.*;
-import java.util.*;
+import java.time.LocalDate;
+import java.time.Month;
+import java.time.ZoneId;
+import java.time.chrono.Chronology;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.FormatStyle;
+import java.time.format.TextStyle;
+import java.util.Locale;
public class Bug8134250 {
public static void main(String [] args) {
--- a/jdk/test/sun/util/resources/cldr/Bug8145136.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/sun/util/resources/cldr/Bug8145136.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,6 +25,7 @@
/*
* @test
* @bug 8145136
+ * @modules jdk.localedata
* @summary Tests CLDR 28/29 newly added feature LikelySubtags is correctly reflected in JDK.
* @run main/othervm -Djava.locale.providers=CLDR Bug8145136
*/
--- a/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/tools/jlink/plugins/IncludeLocalesPluginTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -126,11 +126,10 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_es_419.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_es_AR.class"),
List.of(
- "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
- "/jdk.localedata/sun/text/resources/thai_dict",
- "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/thai_dict",
+ "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th",
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
- "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class",
@@ -165,11 +164,10 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_001.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ja.class"),
List.of(
- "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
- "/jdk.localedata/sun/text/resources/thai_dict",
- "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/thai_dict",
+ "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th",
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
- "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_zh.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_th.class",
@@ -206,11 +204,10 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_150.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_en_AT.class"),
List.of(
- "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
- "/jdk.localedata/sun/text/resources/thai_dict",
- "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/thai_dict",
+ "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th",
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
- "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
@@ -235,11 +232,10 @@
"/jdk.localedata/sun/util/resources/cldr/ext/CalendarData_kok_IN.class",
"/jdk.localedata/sun/util/resources/cldr/ext/CalendarData_pa_Guru_IN.class"),
List.of(
- "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
- "/jdk.localedata/sun/text/resources/thai_dict",
- "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/thai_dict",
+ "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th",
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
- "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
@@ -261,11 +257,10 @@
"--include-locales=th",
"jdk.localedata",
List.of(
- "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
- "/jdk.localedata/sun/text/resources/thai_dict",
- "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/thai_dict",
+ "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th",
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
- "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class"),
List.of(
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
@@ -290,11 +285,10 @@
"/jdk.localedata/sun/text/resources/ext/FormatData_zh_TW.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"),
List.of(
- "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
- "/jdk.localedata/sun/text/resources/thai_dict",
- "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/thai_dict",
+ "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th",
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
- "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
@@ -318,11 +312,10 @@
"/jdk.localedata/sun/text/resources/ext/FormatData_zh_SG.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_zh.class"),
List.of(
- "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
- "/jdk.localedata/sun/text/resources/thai_dict",
- "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/thai_dict",
+ "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th",
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
- "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
@@ -346,11 +339,10 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_nb.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_nn.class"),
List.of(
- "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
- "/jdk.localedata/sun/text/resources/thai_dict",
- "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/thai_dict",
+ "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th",
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
- "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
@@ -376,11 +368,10 @@
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_iw.class",
"/jdk.localedata/sun/text/resources/cldr/ext/FormatData_ji.class"),
List.of(
- "/jdk.localedata/sun/text/resources/LineBreakIteratorData_th",
- "/jdk.localedata/sun/text/resources/thai_dict",
- "/jdk.localedata/sun/text/resources/WordBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/LineBreakIteratorData_th",
+ "/jdk.localedata/sun/text/resources/ext/thai_dict",
+ "/jdk.localedata/sun/text/resources/ext/WordBreakIteratorData_th",
"/jdk.localedata/sun/text/resources/ext/BreakIteratorInfo_th.class",
- "/jdk.localedata/sun/text/resources/ext/BreakIteratorRules_th.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_en_GB.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_ja.class",
"/jdk.localedata/sun/text/resources/ext/FormatData_th.class",
--- a/jdk/test/tools/pack200/Pack200Test.java Mon Sep 12 15:00:58 2016 -0700
+++ b/jdk/test/tools/pack200/Pack200Test.java Mon Sep 12 22:04:48 2016 +0000
@@ -21,6 +21,14 @@
* questions.
*/
+ /*
+ * @test
+ * @bug 6521334 6712743 8007902 8151901
+ * @summary test general packer/unpacker functionality
+ * using native and java unpackers
+ * @compile -XDignore.symbol.file Utils.java Pack200Test.java
+ * @run main/othervm/timeout=1200 -Xmx1280m -Xshare:off Pack200Test
+ */
import java.util.*;
import java.io.*;
@@ -28,17 +36,6 @@
import java.lang.management.MemoryMXBean;
import java.util.jar.*;
- /*
- * @test
- * @bug 6521334 6712743 8007902
- * @key intermittent
- * @summary check for memory leaks, test general packer/unpacker functionality\
- * using native and java unpackers
- * @compile -XDignore.symbol.file Utils.java Pack200Test.java
- * @run main/othervm/timeout=1200 -Xmx1280m -Xshare:off Pack200Test
- * @author ksrini
- */
-
/**
* Tests the packing/unpacking via the APIs.
*/
@@ -48,6 +45,9 @@
static final MemoryMXBean mmxbean = ManagementFactory.getMemoryMXBean();
static final long m0 = getUsedMemory();
static final int LEAK_TOLERANCE = 21000; // OS and GC related variations.
+ // enable leak checks only if required, GC charecteristics vary on
+ // platforms and this may not yield consistent results
+ static final boolean LEAK_CHECK = Boolean.getBoolean("Pack200Test.enableLeakCheck");
/** Creates a new instance of Pack200Test */
private Pack200Test() {}
@@ -60,9 +60,11 @@
}
private static void leakCheck() throws Exception {
+ if (!LEAK_CHECK)
+ return;
long diff = getUsedMemory() - m0;
System.out.println(" Info: memory diff = " + diff + "K");
- if ( diff > LEAK_TOLERANCE) {
+ if (diff > LEAK_TOLERANCE) {
throw new Exception("memory leak detected " + diff);
}
}
@@ -126,7 +128,7 @@
/**
* @param args the command line arguments
*/
- public static void main(String[] args) throws IOException {
+ public static void main(String[] args) throws Exception {
// select the jars carefully, adding more jars will increase the
// testing time, especially for jprt.
jarList.add(Utils.createRtJar());
Binary file jdk/test/tools/pack200/pack200-verifier/data/golden.jar has changed
--- a/langtools/.hgtags Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/.hgtags Mon Sep 12 22:04:48 2016 +0000
@@ -376,3 +376,4 @@
aebfafc43714d5a27d5064d8a0011eaccde633cf jdk-9+131
2c17b65a37a8d7afdb9f96d5f11b28a3f21c78f2 jdk-9+132
7efa4b3477b2b93edbdb4abf827b74c6391f056e jdk-9+133
+f08683786207a48b652266b3b7b908e6c863c3fc jdk-9+134
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java Mon Sep 12 22:04:48 2016 +0000
@@ -119,10 +119,6 @@
*/
final Name completionFailureName;
- /** Module specified with -Xmodule:
- */
- final Name moduleOverride;
-
/** Access to files
*/
private final JavaFileManager fileManager;
@@ -210,9 +206,6 @@
? names.fromString(options.get("failcomplete"))
: null;
- moduleOverride = options.isSet(Option.XMODULE) ? names.fromString(options.get(Option.XMODULE))
- : null;
-
// Temporary, until more info is available from the module system.
boolean useCtProps;
JavaFileManager fm = context.get(JavaFileManager.class);
@@ -527,16 +520,15 @@
if (msym == syms.noModule) {
preferCurrent = false;
if (userPathsFirst) {
- scanUserPaths(p);
+ scanUserPaths(p, true);
preferCurrent = true;
scanPlatformPath(p);
} else {
scanPlatformPath(p);
- scanUserPaths(p);
+ scanUserPaths(p, true);
}
} else if (msym.classLocation == StandardLocation.CLASS_PATH) {
- // assert p.modle.sourceLocation == StandardLocation.SOURCE_PATH);
- scanUserPaths(p);
+ scanUserPaths(p, msym.sourceLocation == StandardLocation.SOURCE_PATH);
} else {
scanModulePaths(p, msym);
}
@@ -561,23 +553,6 @@
String packageName = p.fullname.toString();
- if (msym.name == moduleOverride) {
- if (wantClassFiles) {
- fillIn(p, CLASS_PATH,
- fileManager.list(CLASS_PATH,
- packageName,
- classKinds,
- false));
- }
- if (wantSourceFiles && fileManager.hasLocation(SOURCE_PATH)) {
- fillIn(p, SOURCE_PATH,
- fileManager.list(SOURCE_PATH,
- packageName,
- sourceKinds,
- false));
- }
- }
-
Location classLocn = msym.classLocation;
Location sourceLocn = msym.sourceLocation;
@@ -600,7 +575,7 @@
/**
* Scans class path and source path for files in given package.
*/
- private void scanUserPaths(PackageSymbol p) throws IOException {
+ private void scanUserPaths(PackageSymbol p, boolean includeSourcePath) throws IOException {
Set<JavaFileObject.Kind> kinds = getPackageFileKinds();
Set<JavaFileObject.Kind> classKinds = EnumSet.copyOf(kinds);
@@ -611,7 +586,7 @@
sourceKinds.remove(JavaFileObject.Kind.CLASS);
boolean wantSourceFiles = !sourceKinds.isEmpty();
- boolean haveSourcePath = fileManager.hasLocation(SOURCE_PATH);
+ boolean haveSourcePath = includeSourcePath && fileManager.hasLocation(SOURCE_PATH);
if (verbose && verbosePath) {
if (fileManager instanceof StandardJavaFileManager) {
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Lint.java Mon Sep 12 22:04:48 2016 +0000
@@ -166,6 +166,11 @@
EMPTY("empty"),
/**
+ * Warn about issues regarding module exports.
+ */
+ EXPORTS("exports"),
+
+ /**
* Warn about falling through from one case of a switch statement to the next.
*/
FALLTHROUGH("fallthrough"),
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symbol.java Mon Sep 12 22:04:48 2016 +0000
@@ -359,6 +359,19 @@
return (flags_field & DEPRECATED) != 0;
}
+ public boolean isDeprecatableViaAnnotation() {
+ switch (getKind()) {
+ case LOCAL_VARIABLE:
+ case PACKAGE:
+ case PARAMETER:
+ case RESOURCE_VARIABLE:
+ case EXCEPTION_PARAMETER:
+ return false;
+ default:
+ return true;
+ }
+ }
+
public boolean isStatic() {
return
(flags() & STATIC) != 0 ||
@@ -915,11 +928,6 @@
return msym;
}
- public ModuleSymbol() {
- super(MDL, 0, null, null, null);
- this.type = new ModuleType(this);
- }
-
public ModuleSymbol(Name name, Symbol owner) {
super(MDL, 0, name, null, owner);
this.type = new ModuleType(this);
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Symtab.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,6 +27,7 @@
import java.util.Collection;
import java.util.Collections;
+import java.util.EnumSet;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -363,6 +364,17 @@
// create the basic builtin symbols
unnamedModule = new ModuleSymbol(names.empty, null) {
+ {
+ directives = List.nil();
+ exports = List.nil();
+ provides = List.nil();
+ uses = List.nil();
+ ModuleSymbol java_base = enterModule(names.java_base);
+ com.sun.tools.javac.code.Directive.RequiresDirective d =
+ new com.sun.tools.javac.code.Directive.RequiresDirective(java_base,
+ EnumSet.of(com.sun.tools.javac.code.Directive.RequiresFlag.MANDATED));
+ requires = List.of(d);
+ }
@Override
public String toString() {
return messages.getLocalizedString("compiler.misc.unnamed.module");
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Check.java Mon Sep 12 22:04:48 2016 +0000
@@ -3192,7 +3192,7 @@
}
void checkDeprecatedAnnotation(DiagnosticPosition pos, Symbol s) {
- if (lint.isEnabled(LintCategory.DEP_ANN) &&
+ if (lint.isEnabled(LintCategory.DEP_ANN) && s.isDeprecatableViaAnnotation() &&
(s.flags() & DEPRECATED) != 0 &&
!syms.deprecatedType.isErroneous() &&
s.attribute(syms.deprecatedType.tsym) == null) {
@@ -3200,18 +3200,10 @@
pos, "missing.deprecated.annotation");
}
// Note: @Deprecated has no effect on local variables, parameters and package decls.
- if (lint.isEnabled(LintCategory.DEPRECATION)) {
+ if (lint.isEnabled(LintCategory.DEPRECATION) && !s.isDeprecatableViaAnnotation()) {
if (!syms.deprecatedType.isErroneous() && s.attribute(syms.deprecatedType.tsym) != null) {
- switch (s.getKind()) {
- case LOCAL_VARIABLE:
- case PACKAGE:
- case PARAMETER:
- case RESOURCE_VARIABLE:
- case EXCEPTION_PARAMETER:
- log.warning(LintCategory.DEPRECATION, pos,
- "deprecated.annotation.has.no.effect", Kinds.kindName(s));
- break;
- }
+ log.warning(LintCategory.DEPRECATION, pos,
+ "deprecated.annotation.has.no.effect", Kinds.kindName(s));
}
}
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java Mon Sep 12 22:04:48 2016 +0000
@@ -392,6 +392,7 @@
if (moduleOverride != null) {
checkNoAllModulePath();
defaultModule = moduleFinder.findModule(names.fromString(moduleOverride));
+ defaultModule.sourceLocation = StandardLocation.SOURCE_PATH;
} else {
// Question: why not do findAllModules and initVisiblePackages here?
// i.e. body of unnamedModuleCompleter
@@ -432,7 +433,9 @@
if (defaultModule != syms.unnamedModule) {
syms.unnamedModule.completer = getUnnamedModuleCompleter();
- syms.unnamedModule.sourceLocation = StandardLocation.SOURCE_PATH;
+ if (moduleOverride == null) {
+ syms.unnamedModule.sourceLocation = StandardLocation.SOURCE_PATH;
+ }
syms.unnamedModule.classLocation = StandardLocation.CLASS_PATH;
}
@@ -1090,7 +1093,7 @@
Set<ModuleSymbol> requiresPublic = requiresPublicCache.get(msym);
if (requiresPublic == null) {
- //the module graph may contain cycles involving automatic modules or -XaddReads edges
+ //the module graph may contain cycles involving automatic modules or --add-reads edges
requiresPublic = new HashSet<>();
Set<ModuleSymbol> seen = new HashSet<>();
@@ -1192,7 +1195,7 @@
}
// Terminology comes from
- // -XaddExports:module/package=target,...
+ // --add-exports module/package=target,...
// Compare to
// module module { exports package to target, ... }
String moduleName = em.group(1);
@@ -1245,7 +1248,7 @@
}
// Terminology comes from
- // -XaddReads:target-module=source-module,...
+ // --add-reads target-module=source-module,...
// Compare to
// module target-module { requires source-module; ... }
String targetName = rm.group(1);
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/file/Locations.java Mon Sep 12 22:04:48 2016 +0000
@@ -810,7 +810,7 @@
* SYSTEM_MODULES and MODULE_PATH.
*
* The Location can be specified to accept overriding classes from the
- * {@code -Xpatch:<module>=<path> } parameter.
+ * {@code --patch-module <module>=<path> } parameter.
*/
private class ModuleLocationHandler extends LocationHandler implements Location {
protected final String name;
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java Mon Sep 12 22:04:48 2016 +0000
@@ -183,15 +183,15 @@
SOURCE_PATH("--source-path -sourcepath", "opt.arg.path", "opt.sourcepath", STANDARD, FILEMANAGER),
- MODULE_SOURCE_PATH("--module-source-path -modulesourcepath", "opt.arg.mspath", "opt.modulesourcepath", STANDARD, FILEMANAGER),
+ MODULE_SOURCE_PATH("--module-source-path", "opt.arg.mspath", "opt.modulesourcepath", STANDARD, FILEMANAGER),
- MODULE_PATH("--module-path -p -modulepath -mp", "opt.arg.path", "opt.modulepath", STANDARD, FILEMANAGER),
+ MODULE_PATH("--module-path -p", "opt.arg.path", "opt.modulepath", STANDARD, FILEMANAGER),
- UPGRADE_MODULE_PATH("--upgrade-module-path -upgrademodulepath", "opt.arg.path", "opt.upgrademodulepath", STANDARD, FILEMANAGER),
+ UPGRADE_MODULE_PATH("--upgrade-module-path", "opt.arg.path", "opt.upgrademodulepath", STANDARD, FILEMANAGER),
- SYSTEM("--system -system", "opt.arg.jdk", "opt.system", STANDARD, FILEMANAGER),
+ SYSTEM("--system", "opt.arg.jdk", "opt.system", STANDARD, FILEMANAGER),
- PATCH_MODULE("--patch-module -Xpatch:", "opt.arg.patch", "opt.patch", EXTENDED, FILEMANAGER) {
+ PATCH_MODULE("--patch-module", "opt.arg.patch", "opt.patch", EXTENDED, FILEMANAGER) {
// The deferred filemanager diagnostics mechanism assumes a single value per option,
// but --patch-module can be used multiple times, once per module. Therefore we compose
// a value for the option containing the last value specified for each module, and separate
@@ -273,7 +273,7 @@
PROCESSOR_PATH("--processor-path -processorpath", "opt.arg.path", "opt.processorpath", STANDARD, FILEMANAGER),
- PROCESSOR_MODULE_PATH("--processor-module-path -processormodulepath", "opt.arg.path", "opt.processormodulepath", STANDARD, FILEMANAGER),
+ PROCESSOR_MODULE_PATH("--processor-module-path", "opt.arg.path", "opt.processormodulepath", STANDARD, FILEMANAGER),
PARAMETERS("-parameters","opt.parameters", STANDARD, BASIC),
@@ -311,7 +311,7 @@
}
},
- RELEASE("--release -release", "opt.arg.release", "opt.release", STANDARD, BASIC) {
+ RELEASE("--release", "opt.arg.release", "opt.release", STANDARD, BASIC) {
@Override
protected void help(Log log) {
Iterable<PlatformProvider> providers =
@@ -566,7 +566,7 @@
}
},
- ADD_EXPORTS("--add-exports -XaddExports:", "opt.arg.addExports", "opt.addExports", EXTENDED, BASIC) {
+ ADD_EXPORTS("--add-exports", "opt.arg.addExports", "opt.addExports", EXTENDED, BASIC) {
@Override
public boolean process(OptionHelper helper, String option, String arg) {
String prev = helper.get(ADD_EXPORTS);
@@ -575,7 +575,7 @@
}
},
- ADD_READS("--add-reads -XaddReads:", "opt.arg.addReads", "opt.addReads", EXTENDED, BASIC) {
+ ADD_READS("--add-reads", "opt.arg.addReads", "opt.addReads", EXTENDED, BASIC) {
@Override
public boolean process(OptionHelper helper, String option, String arg) {
String prev = helper.get(ADD_READS);
@@ -598,9 +598,9 @@
MODULE("--module -m", "opt.arg.m", "opt.m", STANDARD, BASIC),
- ADD_MODULES("--add-modules -addmods", "opt.arg.addmods", "opt.addmods", STANDARD, BASIC),
+ ADD_MODULES("--add-modules", "opt.arg.addmods", "opt.addmods", STANDARD, BASIC),
- LIMIT_MODULES("--limit-modules -limitmods", "opt.arg.limitmods", "opt.limitmods", STANDARD, BASIC),
+ LIMIT_MODULES("--limit-modules", "opt.arg.limitmods", "opt.limitmods", STANDARD, BASIC),
// This option exists only for the purpose of documenting itself.
// It's actually implemented by the CommandLine class.
@@ -645,7 +645,7 @@
}
},
- MULTIRELEASE("--multi-release -multi-release", "opt.arg.multi-release", "opt.multi-release", HIDDEN, FILEMANAGER),
+ MULTIRELEASE("--multi-release", "opt.arg.multi-release", "opt.multi-release", HIDDEN, FILEMANAGER),
INHERIT_RUNTIME_ENVIRONMENT("--inherit-runtime-environment", "opt.inherit_runtime_environment",
EXTENDED, BASIC) {
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformDescription.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformDescription.java Mon Sep 12 22:04:48 2016 +0000
@@ -36,7 +36,7 @@
import com.sun.source.util.Plugin;
-/**A description of settings needed for a particular {@code -release name} option.
+/**A description of settings needed for a particular {@code --release name} option.
*
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformProvider.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/PlatformProvider.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,7 +25,7 @@
package com.sun.tools.javac.platform;
-/** A collection of platform descriptions that can be selected using {@code -release name}
+/** A collection of platform descriptions that can be selected using {@code --release name}
* command line option.
* Register in {@code META-INF/services/com.sun.tools.javac.platform.PlatformProvider}.
*
@@ -36,7 +36,7 @@
*/
public interface PlatformProvider {
- /**Names of platforms supported by this provider. Each returned name can be used as the key for -release.
+ /**Names of platforms supported by this provider. Each returned name can be used as the key for --release.
*
* @return the platform keys
*/
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/package-info.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/platform/package-info.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
*/
/**
- * An internal API for plugging in -release implementations.
+ * An internal API for plugging in --release implementations.
*
* <p><b>This is NOT part of any supported API.
* If you write code that depends on this, you do so at your own risk.
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties Mon Sep 12 22:04:48 2016 +0000
@@ -2780,10 +2780,10 @@
illegal combination of -Xmodule and module-info on classpath
compiler.err.xmodule.no.module.sourcepath=\
- illegal combination of -Xmodule and -modulesourcepath
+ illegal combination of -Xmodule and --module-source-path
compiler.err.processorpath.no.processormodulepath=\
- illegal combination of -processorpath and -processormodulepath
+ illegal combination of -processorpath and --processor-module-path
# 0: symbol
compiler.err.package.in.other.module=\
@@ -2817,22 +2817,22 @@
# 0: string
compiler.err.xaddexports.malformed.entry=\
- bad value for -XaddExports: {0}
+ bad value for --add-exports {0}
# 0: string
compiler.err.xaddexports.too.many=\
- multiple -XaddExports options for {0}
+ multiple --add-exports options for {0}
# 0: string
compiler.err.xaddreads.malformed.entry=\
- bad value for -XaddReads: {0}
+ bad value for --add-reads {0}
# 0: string
compiler.err.xaddreads.too.many=\
- multiple -XaddReads options for {0}
+ multiple --add-reads options for {0}
compiler.err.addmods.all.module.path.invalid=\
- -addmods ALL-MODULE-PATH can only be used when compiling the unnamed module
+ --add-modules ALL-MODULE-PATH can only be used when compiling the unnamed module
compiler.misc.locn.module_source_path=\
module source path
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/resources/javac.properties Mon Sep 12 22:04:48 2016 +0000
@@ -192,6 +192,9 @@
javac.opt.Xlint.desc.empty=\
Warn about empty statement after if.
+javac.opt.Xlint.desc.exports=\
+ Warn about issues regarding module exports.
+
javac.opt.Xlint.desc.fallthrough=\
Warn about falling through from one case of a switch statement to the next.
@@ -390,10 +393,10 @@
javac.fullVersion={0} full version "{1}"
javac.err.release.bootclasspath.conflict=\
- option {0} cannot be used together with -release
+ option {0} cannot be used together with --release
javac.err.unsupported.release.version=\
release version {0} not supported
javac.err.release.not.standard.file.manager=\
- -release option specified, but the provided JavaFileManager is not a StandardJavaFileManager.
+ --release option specified, but the provided JavaFileManager is not a StandardJavaFileManager.
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Options.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,6 +26,8 @@
package com.sun.tools.javac.util;
import java.util.*;
+
+import com.sun.tools.javac.code.Source;
import com.sun.tools.javac.main.Option;
import static com.sun.tools.javac.main.Option.*;
@@ -176,7 +178,17 @@
// disabled
return
isSet(XLINT_CUSTOM, s) ||
- (isSet(XLINT) || isSet(XLINT_CUSTOM, "all")) &&
+ (isSet(XLINT) || isSet(XLINT_CUSTOM, "all") || (s.equals("dep-ann") && depAnnOnByDefault())) &&
isUnset(XLINT_CUSTOM, "-" + s);
}
+ // where
+ private boolean depAnnOnByDefault() {
+ String sourceName = get(Option.SOURCE);
+ Source source = null;
+ if (sourceName != null)
+ source = Source.lookup(sourceName);
+ if (source == null)
+ source = Source.DEFAULT;
+ return source.compareTo(Source.JDK1_9) >= 0;
+ }
}
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac/options/Option.java Mon Sep 12 22:04:48 2016 +0000
@@ -85,13 +85,7 @@
helper.modulepath(paths);
}
},
- MODULEPATH("-modulepath", "An alias for -modulepath") {
- @Override
- protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
- MODULE_PATH.processMatching(iter, helper);
- }
- },
- P("-p", "An alias for -modulepath") {
+ P("-p", "An alias for --module-path") {
@Override
protected void processMatching(ArgumentIterator iter, OptionHelper helper) {
MODULE_PATH.processMatching(iter, helper);
--- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/ToolOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -104,13 +104,6 @@
}
},
- MODULESOURCEPATH("-modulesourcepath", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.MODULE_SOURCE_PATH, arg);
- }
- },
-
MODULE_SOURCE_PATH("--module-source-path", true) {
@Override
public void process(Helper helper, String arg) {
@@ -118,13 +111,6 @@
}
},
- UPGRADEMODULEPATH("-upgrademodulepath", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.UPGRADE_MODULE_PATH, arg);
- }
- },
-
UPGRADE_MODULE_PATH("--upgrade-module-path", true) {
@Override
public void process(Helper helper, String arg) {
@@ -132,13 +118,6 @@
}
},
- SYSTEM("-system", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.SYSTEM, arg);
- }
- },
-
SYSTEM_("--system", true) {
@Override
public void process(Helper helper, String arg) {
@@ -146,13 +125,6 @@
}
},
- MODULEPATH("-modulepath", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.MODULE_PATH, arg);
- }
- },
-
MODULE_PATH("--module-path", true) {
@Override
public void process(Helper helper, String arg) {
@@ -167,13 +139,6 @@
}
},
- ADDMODS("-addmods", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setCompilerOpt(opt, arg);
- }
- },
-
ADD_MODULES("--add-modules", true) {
@Override
public void process(Helper helper, String arg) {
@@ -181,13 +146,6 @@
}
},
- LIMITMODS("-limitmods", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setCompilerOpt(opt, arg);
- }
- },
-
LIMIT_MODULES("--limit-modules", true) {
@Override
public void process(Helper helper, String arg) {
@@ -210,13 +168,6 @@
}
},
- RELEASE_OLD("-release", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setCompilerOpt("--release", arg);
- }
- },
-
SOURCE("-source", true) {
@Override
public void process(Helper helper, String arg) {
@@ -238,13 +189,6 @@
}
},
- XADDREADS("-XaddReads:", false) {
- @Override
- public void process(Helper helper, String arg) {
- Option.ADD_READS.process(helper.getOptionHelper(), arg);
- }
- },
-
ADD_READS("--add-reads", true) {
@Override
public void process(Helper helper, String arg) {
@@ -252,13 +196,6 @@
}
},
- ADDEXPORTS("-XaddExports:", false) {
- @Override
- public void process(Helper helper, String arg) {
- Option.ADD_EXPORTS.process(helper.getOptionHelper(), arg);
- }
- },
-
ADD_EXPORTS("--add-exports", true) {
@Override
public void process(Helper helper, String arg) {
@@ -273,13 +210,6 @@
}
},
- XPATCH("-Xpatch:", false) {
- @Override
- public void process(Helper helper, String arg) {
- Option.XMODULE.process(helper.getOptionHelper(), arg);
- }
- },
-
PATCH_MODULE("--patch-module", true) {
@Override
public void process(Helper helper, String arg) {
--- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/ToolOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -106,13 +106,6 @@
}
},
- MODULESOURCEPATH("-modulesourcepath", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.MODULE_SOURCE_PATH, arg);
- }
- },
-
MODULE_SOURCE_PATH("--module-source-path", true) {
@Override
public void process(Helper helper, String arg) {
@@ -120,13 +113,6 @@
}
},
- UPGRADEMODULEPATH("-upgrademodulepath", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.UPGRADE_MODULE_PATH, arg);
- }
- },
-
UPGRADE_MODULE_PATH("--upgrade-module-path", true) {
@Override
public void process(Helper helper, String arg) {
@@ -134,27 +120,13 @@
}
},
- SYSTEM("-system", true) {
+ SYSTEM("--system", true) {
@Override
public void process(Helper helper, String arg) {
helper.setFileManagerOpt(Option.SYSTEM, arg);
}
},
- SYSTEM_("--system", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.SYSTEM, arg);
- }
- },
-
- MODULEPATH("-modulepath", true) {
- @Override
- public void process(Helper helper, String arg) {
- helper.setFileManagerOpt(Option.MODULE_PATH, arg);
- }
- },
-
MODULE_PATH("--module-path", true) {
@Override
public void process(Helper helper, String arg) {
@@ -169,13 +141,6 @@
}
},
- ADDMODS("-addmods", true) {
- @Override
- public void process(Helper helper, String arg) {
- Option.ADD_MODULES.process(helper.getOptionHelper(), opt, arg);
- }
- },
-
ADD_MODULES("--add-modules", true) {
@Override
public void process(Helper helper, String arg) {
@@ -183,13 +148,6 @@
}
},
- LIMITMODS("-limitmods", true) {
- @Override
- public void process(Helper helper, String arg) {
- Option.LIMIT_MODULES.process(helper.getOptionHelper(), opt, arg);
- }
- },
-
LIMIT_MODULES("--limit-modules", true) {
@Override
public void process(Helper helper, String arg) {
@@ -218,13 +176,6 @@
}
},
- RELEASE_OLD("-release", true) {
- @Override
- public void process(Helper helper, String arg) {
- Option.RELEASE.process(helper.getOptionHelper(), opt, arg);
- }
- },
-
SOURCE("-source", true) {
@Override
public void process(Helper helper, String arg) {
@@ -246,13 +197,6 @@
}
},
- XADDREADS("-XaddReads:", false) {
- @Override
- public void process(Helper helper, String arg) {
- Option.ADD_READS.process(helper.getOptionHelper(), arg);
- }
- },
-
ADD_READS("--add-reads", true) {
@Override
public void process(Helper helper, String arg) {
@@ -260,13 +204,6 @@
}
},
- ADDEXPORTS("-XaddExports:", false) {
- @Override
- public void process(Helper helper, String arg) {
- Option.ADD_EXPORTS.process(helper.getOptionHelper(), arg);
- }
- },
-
ADD_EXPORTS("--add-exports", true) {
@Override
public void process(Helper helper, String arg) {
@@ -281,13 +218,6 @@
}
},
- XPATCH("-Xpatch:", false) {
- @Override
- public void process(Helper helper, String arg) {
- Option.XMODULE.process(helper.getOptionHelper(), arg);
- }
- },
-
PATCH_MODULE("--patch-module", true) {
@Override
public void process(Helper helper, String arg) {
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeprscan/Main.java Mon Sep 12 22:04:48 2016 +0000
@@ -81,7 +81,7 @@
* - more rigorous GNU style option parsing; use joptsimple?
*
* FUTURES:
- * - add module support: -addmods, -modulepath, module arg
+ * - add module support: --add-modules, --module-path, module arg
* - load deprecation declarations from a designated class library instead
* of the JDK
* - load deprecation declarations from a module
@@ -181,7 +181,7 @@
.filter(name -> !name.endsWith("package-info.class"))
.filter(name -> !name.endsWith("module-info.class"))
.map(s -> s.replaceAll("\\.class$", ""))
- .map(s -> s.replace('/', '.'))
+ .map(s -> s.replace(File.separatorChar, '.'))
.collect(toList()));
}
@@ -331,7 +331,7 @@
* @throws IOException if an I/O error occurs
*/
boolean processSelf(Collection<String> classes) throws IOException {
- options.add("-addmods");
+ options.add("--add-modules");
options.add("java.se.ee,jdk.xml.bind"); // TODO why jdk.xml.bind?
if (classes.isEmpty()) {
@@ -360,7 +360,7 @@
* @return success value
*/
boolean processRelease(String release, Collection<String> classes) throws IOException {
- options.addAll(List.of("-release", release));
+ options.addAll(List.of("--release", release));
if (release.equals("9")) {
List<String> rootMods = List.of("java.se", "java.se.ee");
@@ -368,7 +368,7 @@
JavaCompiler.CompilationTask task =
compiler.getTask(null, fm, this,
// options
- List.of("-addmods", String.join(",", rootMods)),
+ List.of("--add-modules", String.join(",", rootMods)),
// classes
List.of("java.lang.Object"),
null);
@@ -377,7 +377,7 @@
return false;
}
Map<PackageElement, List<TypeElement>> types = proc.getPublicTypes();
- options.add("-addmods");
+ options.add("--add-modules");
options.add(String.join(",", rootMods));
return doClassNames(
types.values().stream()
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/DepsAnalyzer.java Mon Sep 12 22:04:48 2016 +0000
@@ -56,7 +56,7 @@
* 1. archives specified in the command line arguments
* 2. observable modules matching the source filter
* 3. classpath archives matching the source filter or target filter
- * 4. -addmods and -m root modules
+ * 4. --add-modules and -m root modules
*/
public class DepsAnalyzer {
final JdepsConfiguration configuration;
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsConfiguration.java Mon Sep 12 22:04:48 2016 +0000
@@ -127,7 +127,7 @@
}
}
- // all roots specified in -addmods or -m are included
+ // all roots specified in --add-modules or -m are included
// as the initial set for analysis.
roots.stream()
.map(nameToModule::get)
@@ -342,7 +342,7 @@
SystemModuleFinder(String javaHome) throws IOException {
if (javaHome == null) {
- // -system none
+ // --system none
this.fileSystem = null;
this.root = null;
this.systemModules = Collections.emptyMap();
--- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/JdepsTask.java Mon Sep 12 22:04:48 2016 +0000
@@ -313,7 +313,7 @@
}
},
- // Another alternative to list modules in -addmods option
+ // Another alternative to list modules in --add-modules option
new HiddenOption(true, "--include-system-modules") {
void process(JdepsTask task, String opt, String arg) throws BadArgs {
task.options.includeSystemModulePattern = Pattern.compile(arg);
--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ConsoleIOContext.java Mon Sep 12 22:04:48 2016 +0000
@@ -57,6 +57,8 @@
import jdk.internal.jline.console.KeyMap;
import jdk.internal.jline.console.UserInterruptException;
import jdk.internal.jline.console.completer.Completer;
+import jdk.internal.jline.console.history.History;
+import jdk.internal.jline.console.history.MemoryHistory;
import jdk.internal.jline.extra.EditingHistory;
import jdk.internal.jshell.tool.StopDetectingInputStream.State;
@@ -68,6 +70,7 @@
final StopDetectingInputStream input;
final ConsoleReader in;
final EditingHistory history;
+ final MemoryHistory userInputHistory = new MemoryHistory();
String prefix = "";
@@ -299,6 +302,9 @@
}
public void beforeUserCode() {
+ synchronized (this) {
+ inputBytes = null;
+ }
input.setState(State.BUFFER);
}
@@ -380,6 +386,36 @@
}
}
+ private byte[] inputBytes;
+ private int inputBytesPointer;
+
+ @Override
+ public synchronized int readUserInput() {
+ while (inputBytes == null || inputBytes.length <= inputBytesPointer) {
+ boolean prevHandleUserInterrupt = in.getHandleUserInterrupt();
+ History prevHistory = in.getHistory();
+
+ try {
+ input.setState(State.WAIT);
+ in.setHandleUserInterrupt(true);
+ in.setHistory(userInputHistory);
+ inputBytes = (in.readLine("") + System.getProperty("line.separator")).getBytes();
+ inputBytesPointer = 0;
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ return -1;
+ } catch (UserInterruptException ex) {
+ repl.state.stop();
+ return -1;
+ } finally {
+ in.setHistory(prevHistory);
+ in.setHandleUserInterrupt(prevHandleUserInterrupt);
+ input.setState(State.BUFFER);
+ }
+ }
+ return inputBytes[inputBytesPointer++];
+ }
+
/**
* A possible action which the user can choose to perform.
*/
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ContinuousCompletionProvider.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package jdk.internal.jshell.tool;
+
+import java.util.List;
+import static java.util.Comparator.comparing;
+import java.util.Map;
+import java.util.function.BiPredicate;
+import java.util.function.Supplier;
+import static java.util.stream.Collectors.toList;
+import java.util.stream.Stream;
+import jdk.internal.jshell.tool.JShellTool.CompletionProvider;
+import jdk.jshell.SourceCodeAnalysis;
+import jdk.jshell.SourceCodeAnalysis.Suggestion;
+
+class ContinuousCompletionProvider implements CompletionProvider {
+
+ static final BiPredicate<String, String> STARTSWITH_MATCHER =
+ (word, input) -> word.startsWith(input);
+ static final BiPredicate<String, String> PERFECT_MATCHER =
+ (word, input) -> word.equals(input);
+
+ private final Supplier<Map<String, CompletionProvider>> wordCompletionProviderSupplier;
+ private final BiPredicate<String, String> matcher;
+
+ ContinuousCompletionProvider(
+ Map<String, CompletionProvider> wordCompletionProvider,
+ BiPredicate<String, String> matcher) {
+ this(() -> wordCompletionProvider, matcher);
+ }
+
+ ContinuousCompletionProvider(
+ Supplier<Map<String, CompletionProvider>> wordCompletionProviderSupplier,
+ BiPredicate<String, String> matcher) {
+ this.wordCompletionProviderSupplier = wordCompletionProviderSupplier;
+ this.matcher = matcher;
+ }
+
+ @Override
+ public List<Suggestion> completionSuggestions(String input, int cursor, int[] anchor) {
+ String prefix = input.substring(0, cursor);
+ int space = prefix.indexOf(' ');
+
+ Stream<SourceCodeAnalysis.Suggestion> result;
+
+ Map<String, CompletionProvider> wordCompletionProvider = wordCompletionProviderSupplier.get();
+
+ if (space == (-1)) {
+ result = wordCompletionProvider.keySet().stream()
+ .distinct()
+ .filter(key -> key.startsWith(prefix))
+ .map(key -> new JShellTool.ArgSuggestion(key + " "));
+ anchor[0] = 0;
+ } else {
+ String rest = prefix.substring(space + 1);
+ String word = prefix.substring(0, space);
+
+ List<CompletionProvider> candidates = wordCompletionProvider.entrySet().stream()
+ .filter(e -> matcher.test(e.getKey(), word))
+ .map(Map.Entry::getValue)
+ .collect(toList());
+ if (candidates.size() == 1) {
+ result = candidates.get(0).completionSuggestions(rest, cursor - space - 1, anchor).stream();
+ } else {
+ result = Stream.empty();
+ }
+ anchor[0] += space + 1;
+ }
+
+ return result.sorted(comparing(Suggestion::continuation))
+ .collect(toList());
+ }
+
+}
--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/Feedback.java Mon Sep 12 22:04:48 2016 +0000
@@ -35,9 +35,14 @@
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.function.Function;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toMap;
+import static jdk.internal.jshell.tool.ContinuousCompletionProvider.PERFECT_MATCHER;
+import jdk.internal.jshell.tool.JShellTool.CompletionProvider;
+import static jdk.internal.jshell.tool.JShellTool.EMPTY_COMPLETION_PROVIDER;
/**
* Feedback customization support
@@ -146,6 +151,17 @@
.forEach(m -> m.readOnly = true);
}
+ JShellTool.CompletionProvider modeCompletions() {
+ return modeCompletions(EMPTY_COMPLETION_PROVIDER);
+ }
+
+ JShellTool.CompletionProvider modeCompletions(CompletionProvider successor) {
+ return new ContinuousCompletionProvider(
+ () -> modeMap.keySet().stream()
+ .collect(toMap(Function.identity(), m -> successor)),
+ PERFECT_MATCHER);
+ }
+
{
for (FormatCase e : FormatCase.all)
selectorMap.put(e.name().toLowerCase(Locale.US), e);
--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/IOContext.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/IOContext.java Mon Sep 12 22:04:48 2016 +0000
@@ -54,6 +54,8 @@
public abstract void replaceLastHistoryEntry(String source);
+ public abstract int readUserInput();
+
class InputInterruptedException extends Exception {
private static final long serialVersionUID = 1L;
}
--- a/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/JShellTool.java Mon Sep 12 22:04:48 2016 +0000
@@ -26,7 +26,6 @@
package jdk.internal.jshell.tool;
import java.io.BufferedWriter;
-import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
@@ -112,6 +111,7 @@
import static jdk.internal.jshell.debug.InternalDebugControl.DBG_EVNT;
import static jdk.internal.jshell.debug.InternalDebugControl.DBG_FMGR;
import static jdk.internal.jshell.debug.InternalDebugControl.DBG_GEN;
+import static jdk.internal.jshell.tool.ContinuousCompletionProvider.STARTSWITH_MATCHER;
/**
* Command line REPL tool for Java using the JShell API.
@@ -141,11 +141,30 @@
/**
* The constructor for the tool (used by tool launch via main and by test
* harnesses to capture ins and outs.
+ * @param in command line input -- snippets, commands and user input
+ * @param cmdout command line output, feedback including errors
+ * @param cmderr start-up errors and debugging info
+ * @param console console control interaction
+ * @param userout code execution output -- System.out.printf("hi")
+ * @param usererr code execution error stream -- System.err.printf("Oops")
+ * @param prefs preferences to use
+ * @param locale locale to use
+ */
+ public JShellTool(InputStream in, PrintStream cmdout, PrintStream cmderr,
+ PrintStream console,
+ PrintStream userout, PrintStream usererr,
+ Preferences prefs, Locale locale) {
+ this(in, cmdout, cmderr, console, null, userout, usererr, prefs, locale);
+ }
+
+ /**
+ * The constructor for the tool (used by tool launch via main and by test
+ * harnesses to capture ins and outs.
* @param cmdin command line input -- snippets and commands
* @param cmdout command line output, feedback including errors
* @param cmderr start-up errors and debugging info
* @param console console control interaction
- * @param userin code execution input (not yet functional)
+ * @param userin code execution input, or null to use IOContext
* @param userout code execution output -- System.out.printf("hi")
* @param usererr code execution error stream -- System.err.printf("Oops")
* @param prefs preferences to use
@@ -159,7 +178,12 @@
this.cmdout = cmdout;
this.cmderr = cmderr;
this.console = console;
- this.userin = userin;
+ this.userin = userin != null ? userin : new InputStream() {
+ @Override
+ public int read() throws IOException {
+ return input.readUserInput();
+ }
+ };
this.userout = userout;
this.usererr = usererr;
this.prefs = prefs;
@@ -451,7 +475,7 @@
*/
public static void main(String[] args) throws Exception {
new JShellTool(System.in, System.out, System.err, System.out,
- new ByteArrayInputStream(new byte[0]), System.out, System.err,
+ System.out, System.err,
Preferences.userRoot().node("tool/JShell"),
Locale.getDefault())
.start(args);
@@ -909,6 +933,7 @@
interface CompletionProvider {
List<Suggestion> completionSuggestions(String input, int cursor, int[] anchor);
+
}
enum CommandKind {
@@ -953,14 +978,31 @@
}
- private static final CompletionProvider EMPTY_COMPLETION_PROVIDER = new FixedCompletionProvider();
+ static final CompletionProvider EMPTY_COMPLETION_PROVIDER = new FixedCompletionProvider();
private static final CompletionProvider KEYWORD_COMPLETION_PROVIDER = new FixedCompletionProvider("-all ", "-start ", "-history ");
private static final CompletionProvider RELOAD_OPTIONS_COMPLETION_PROVIDER = new FixedCompletionProvider("-restore", "-quiet");
+ private static final CompletionProvider SET_MODE_OPTIONS_COMPLETION_PROVIDER = new FixedCompletionProvider("-command", "-quiet", "-delete");
private static final CompletionProvider FILE_COMPLETION_PROVIDER = fileCompletions(p -> true);
private final Map<String, Command> commands = new LinkedHashMap<>();
private void registerCommand(Command cmd) {
commands.put(cmd.command, cmd);
}
+
+ private static CompletionProvider skipWordThenCompletion(CompletionProvider completionProvider) {
+ return (input, cursor, anchor) -> {
+ List<Suggestion> result = Collections.emptyList();
+
+ int space = input.indexOf(' ');
+ if (space != -1) {
+ String rest = input.substring(space + 1);
+ result = completionProvider.completionSuggestions(rest, cursor - space - 1, anchor);
+ anchor[0] += space + 1;
+ }
+
+ return result;
+ };
+ }
+
private static CompletionProvider fileCompletions(Predicate<Path> accept) {
return (code, cursor, anchor) -> {
int lastSlash = code.lastIndexOf('/');
@@ -1037,6 +1079,31 @@
};
}
+ private static CompletionProvider orMostSpecificCompletion(
+ CompletionProvider left, CompletionProvider right) {
+ return (code, cursor, anchor) -> {
+ int[] leftAnchor = {-1};
+ int[] rightAnchor = {-1};
+
+ List<Suggestion> leftSuggestions = left.completionSuggestions(code, cursor, leftAnchor);
+ List<Suggestion> rightSuggestions = right.completionSuggestions(code, cursor, rightAnchor);
+
+ List<Suggestion> suggestions = new ArrayList<>();
+
+ if (leftAnchor[0] >= rightAnchor[0]) {
+ anchor[0] = leftAnchor[0];
+ suggestions.addAll(leftSuggestions);
+ }
+
+ if (leftAnchor[0] <= rightAnchor[0]) {
+ anchor[0] = rightAnchor[0];
+ suggestions.addAll(rightSuggestions);
+ }
+
+ return suggestions;
+ };
+ }
+
// Snippet lists
Stream<Snippet> allSnippets() {
@@ -1123,10 +1190,26 @@
EMPTY_COMPLETION_PROVIDER));
registerCommand(new Command("/set",
arg -> cmdSet(arg),
- new FixedCompletionProvider(SET_SUBCOMMANDS)));
+ new ContinuousCompletionProvider(Map.of(
+ // need more completion for format for usability
+ "format", feedback.modeCompletions(),
+ "truncation", feedback.modeCompletions(),
+ "feedback", feedback.modeCompletions(),
+ "mode", skipWordThenCompletion(orMostSpecificCompletion(
+ feedback.modeCompletions(SET_MODE_OPTIONS_COMPLETION_PROVIDER),
+ SET_MODE_OPTIONS_COMPLETION_PROVIDER)),
+ "prompt", feedback.modeCompletions(),
+ "editor", fileCompletions(Files::isExecutable),
+ "start", FILE_COMPLETION_PROVIDER),
+ STARTSWITH_MATCHER)));
registerCommand(new Command("/retain",
arg -> cmdRetain(arg),
- new FixedCompletionProvider(RETAIN_SUBCOMMANDS)));
+ new ContinuousCompletionProvider(Map.of(
+ "feedback", feedback.modeCompletions(),
+ "mode", feedback.modeCompletions(),
+ "editor", fileCompletions(Files::isExecutable),
+ "start", FILE_COMPLETION_PROVIDER),
+ STARTSWITH_MATCHER)));
registerCommand(new Command("/?",
"help.quest",
arg -> cmdHelp(arg),
@@ -1151,36 +1234,18 @@
registerCommand(new Command("shortcuts",
"help.shortcuts",
CommandKind.HELP_SUBJECT));
+
+ commandCompletions = new ContinuousCompletionProvider(
+ commands.values().stream()
+ .filter(c -> c.kind.shouldSuggestCompletions)
+ .collect(toMap(c -> c.command, c -> c.completions)),
+ STARTSWITH_MATCHER);
}
+ private ContinuousCompletionProvider commandCompletions;
+
public List<Suggestion> commandCompletionSuggestions(String code, int cursor, int[] anchor) {
- String prefix = code.substring(0, cursor);
- int space = prefix.indexOf(' ');
- Stream<Suggestion> result;
-
- if (space == (-1)) {
- result = commands.values()
- .stream()
- .distinct()
- .filter(cmd -> cmd.kind.shouldSuggestCompletions)
- .map(cmd -> cmd.command)
- .filter(key -> key.startsWith(prefix))
- .map(key -> new ArgSuggestion(key + " "));
- anchor[0] = 0;
- } else {
- String arg = prefix.substring(space + 1);
- String cmd = prefix.substring(0, space);
- Command[] candidates = findCommand(cmd, c -> true);
- if (candidates.length == 1) {
- result = candidates[0].completions.completionSuggestions(arg, cursor - space, anchor).stream();
- anchor[0] += space + 1;
- } else {
- result = Stream.empty();
- }
- }
-
- return result.sorted((s1, s2) -> s1.continuation().compareTo(s2.continuation()))
- .collect(Collectors.toList());
+ return commandCompletions.completionSuggestions(code, cursor, anchor);
}
public String commandDocumentation(String code, int cursor) {
@@ -2484,7 +2549,7 @@
}
}
- private static class ArgSuggestion implements Suggestion {
+ static class ArgSuggestion implements Suggestion {
private final String continuation;
@@ -2579,6 +2644,11 @@
public void close() {
scannerIn.close();
}
+
+ @Override
+ public int readUserInput() {
+ return -1;
+ }
}
class FileScannerIOContext extends ScannerIOContext {
@@ -2617,4 +2687,9 @@
@Override
public void close() {
}
+
+ @Override
+ public int readUserInput() {
+ return -1;
+ }
}
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java Mon Sep 12 22:04:48 2016 +0000
@@ -46,6 +46,8 @@
import static jdk.jshell.CompletenessAnalyzer.TK.*;
import jdk.jshell.TaskFactory.ParseTask;
import java.util.List;
+import java.util.function.Function;
+import java.util.function.Supplier;
/**
* Low level scanner to determine completeness of input.
@@ -81,13 +83,13 @@
CaInfo scan(String s) {
try {
- Scanner scanner = scannerFactory.newScanner(s, false);
- Matched in = new Matched(scanner);
- Parser parser = new Parser(in, proc, s);
+ Parser parser = new Parser(
+ () -> new Matched(scannerFactory.newScanner(s, false)),
+ () -> proc.taskFactory.new ParseTask(s));
Completeness stat = parser.parseUnit();
int endPos = stat == Completeness.UNKNOWN
? s.length()
- : in.prevCT.endPos;
+ : parser.endPos();
return new CaInfo(stat, endPos);
} catch (SyntaxException ex) {
return new CaInfo(error(), s.length());
@@ -188,7 +190,7 @@
ERROR(TokenKind.ERROR, XERRO), //
IDENTIFIER(TokenKind.IDENTIFIER, XEXPR1|XDECL1|XTERM), //
UNDERSCORE(TokenKind.UNDERSCORE, XERRO), // _
- CLASS(TokenKind.CLASS, XEXPR|XDECL1|XTERM), // class decl and .class
+ CLASS(TokenKind.CLASS, XEXPR|XDECL1), // class decl (MAPPED: DOTCLASS)
MONKEYS_AT(TokenKind.MONKEYS_AT, XEXPR|XDECL1), // @
IMPORT(TokenKind.IMPORT, XDECL1|XSTART), // import -- consider declaration
SEMI(TokenKind.SEMI, XSTMT1|XTERM|XSTART), // ;
@@ -206,15 +208,15 @@
THROWS(TokenKind.THROWS, XDECL), // throws
// Primarive type names
- BOOLEAN(TokenKind.BOOLEAN, XEXPR|XDECL1), // boolean
- BYTE(TokenKind.BYTE, XEXPR|XDECL1), // byte
- CHAR(TokenKind.CHAR, XEXPR|XDECL1), // char
- DOUBLE(TokenKind.DOUBLE, XEXPR|XDECL1), // double
- FLOAT(TokenKind.FLOAT, XEXPR|XDECL1), // float
- INT(TokenKind.INT, XEXPR|XDECL1), // int
- LONG(TokenKind.LONG, XEXPR|XDECL1), // long
- SHORT(TokenKind.SHORT, XEXPR|XDECL1), // short
- VOID(TokenKind.VOID, XEXPR|XDECL1), // void
+ BOOLEAN(TokenKind.BOOLEAN, XEXPR1|XDECL1), // boolean
+ BYTE(TokenKind.BYTE, XEXPR1|XDECL1), // byte
+ CHAR(TokenKind.CHAR, XEXPR1|XDECL1), // char
+ DOUBLE(TokenKind.DOUBLE, XEXPR1|XDECL1), // double
+ FLOAT(TokenKind.FLOAT, XEXPR1|XDECL1), // float
+ INT(TokenKind.INT, XEXPR1|XDECL1), // int
+ LONG(TokenKind.LONG, XEXPR1|XDECL1), // long
+ SHORT(TokenKind.SHORT, XEXPR1|XDECL1), // short
+ VOID(TokenKind.VOID, XEXPR1|XDECL1), // void
// Modifiers keywords
ABSTRACT(TokenKind.ABSTRACT, XDECL1), // abstract
@@ -230,7 +232,7 @@
// Declarations and type parameters (thus expressions)
EXTENDS(TokenKind.EXTENDS, XEXPR|XDECL), // extends
- COMMA(TokenKind.COMMA, XEXPR|XDECL), // ,
+ COMMA(TokenKind.COMMA, XEXPR|XDECL|XTERM), // ,
AMP(TokenKind.AMP, XEXPR|XDECL), // &
GT(TokenKind.GT, XEXPR|XDECL), // >
LT(TokenKind.LT, XEXPR|XDECL1), // <
@@ -239,7 +241,7 @@
GTGTGT(TokenKind.GTGTGT, XEXPR|XDECL), // >>>
QUES(TokenKind.QUES, XEXPR|XDECL), // ?
DOT(TokenKind.DOT, XEXPR|XDECL), // .
- STAR(TokenKind.STAR, XEXPR|XDECL|XTERM), // * -- import foo.* //TODO handle these case separately, XTERM
+ STAR(TokenKind.STAR, XEXPR), // * (MAPPED: DOTSTAR)
// Statement keywords
ASSERT(TokenKind.ASSERT, XSTMT1|XSTART), // assert
@@ -280,7 +282,7 @@
// Expressions cannot terminate
INSTANCEOF(TokenKind.INSTANCEOF, XEXPR), // instanceof
- NEW(TokenKind.NEW, XEXPR1), // new
+ NEW(TokenKind.NEW, XEXPR1), // new (MAPPED: COLCOLNEW)
SUPER(TokenKind.SUPER, XEXPR1|XDECL), // super -- shouldn't see as rec. But in type parameters
ARROW(TokenKind.ARROW, XEXPR), // ->
COLCOL(TokenKind.COLCOL, XEXPR), // ::
@@ -323,24 +325,29 @@
UNMATCHED(XERRO),
PARENS(XEXPR1|XDECL|XSTMT|XTERM),
BRACKETS(XEXPR|XDECL|XTERM),
- BRACES(XSTMT1|XEXPR|XTERM);
+ BRACES(XSTMT1|XEXPR|XTERM),
+ DOTSTAR(XDECL|XTERM), // import foo.*
+ COLCOLNEW(XEXPR|XTERM), // :: new
+ DOTCLASS(XEXPR|XTERM), // class decl and .class
+ ;
static final EnumMap<TokenKind,TK> tokenKindToTKMap = new EnumMap<>(TokenKind.class);
final TokenKind tokenKind;
final int belongs;
+ Function<TK,TK> mapping;
TK(int b) {
- this.tokenKind = null;
- this.belongs = b;
+ this(null, b);
}
TK(TokenKind tokenKind, int b) {
this.tokenKind = tokenKind;
this.belongs = b;
+ this.mapping = null;
}
- private static TK tokenKindToTK(TokenKind kind) {
+ private static TK tokenKindToTK(TK prev, TokenKind kind) {
TK tk = tokenKindToTKMap.get(kind);
if (tk == null) {
System.err.printf("No corresponding %s for %s: %s\n",
@@ -349,7 +356,9 @@
kind);
throw new InternalError("No corresponding TK for TokenKind: " + kind);
}
- return tk;
+ return tk.mapping != null
+ ? tk.mapping.apply(prev)
+ : tk;
}
boolean isOkToTerminate() {
@@ -383,8 +392,12 @@
}
}
for (TokenKind kind : TokenKind.values()) {
- tokenKindToTK(kind); // assure they can be retrieved without error
+ tokenKindToTK(null, kind); // assure they can be retrieved without error
}
+ // Mappings of disambiguated contexts
+ STAR.mapping = prev -> prev == DOT ? DOTSTAR : STAR;
+ NEW.mapping = prev -> prev == COLCOL ? COLCOLNEW : NEW;
+ CLASS.mapping = prev -> prev == DOT ? DOTCLASS : CLASS;
}
}
@@ -520,7 +533,7 @@
ct = match(BRACKETS, TokenKind.LBRACKET);
break;
default:
- ct = new CT(TK.tokenKindToTK(current.kind), advance());
+ ct = new CT(TK.tokenKindToTK(prevTK, current.kind), advance());
break;
}
if (ct.kind.isStart() && !prevTK.isOkToTerminate()) {
@@ -539,21 +552,21 @@
*/
private static class Parser {
- final Matched in;
- CT token;
- Completeness checkResult;
-
- final JShell proc;
- final String scannedInput;
-
+ private final Supplier<Matched> matchedFactory;
+ private final Supplier<ParseTask> parseFactory;
+ private Matched in;
+ private CT token;
+ private Completeness checkResult;
+ Parser(Supplier<Matched> matchedFactory, Supplier<ParseTask> parseFactory) {
+ this.matchedFactory = matchedFactory;
+ this.parseFactory = parseFactory;
+ resetInput();
+ }
- Parser(Matched in, JShell proc, String scannedInput) {
- this.in = in;
+ final void resetInput() {
+ this.in = matchedFactory.get();
nextToken();
-
- this.proc = proc;
- this.scannedInput = scannedInput;
}
final void nextToken() {
@@ -598,6 +611,10 @@
return flags != Completeness.COMPLETE;
}
+ public int endPos() {
+ return in.prevCT.endPos;
+ }
+
public Completeness parseUnit() {
//System.err.printf("%s: belongs %o XANY1 %o\n", token.kind, token.kind.belongs, token.kind.belongs & XANY1);
switch (token.kind.belongs & XANY1) {
@@ -651,11 +668,11 @@
case IDENTIFIER:
case BRACKETS:
return Completeness.COMPLETE_WITH_SEMI;
- case STAR:
+ case DOTSTAR:
if (isImport) {
return Completeness.COMPLETE_WITH_SEMI;
} else {
- return Completeness.DEFINITELY_INCOMPLETE;
+ return Completeness.UNKNOWN;
}
default:
return Completeness.DEFINITELY_INCOMPLETE;
@@ -667,7 +684,7 @@
public Completeness disambiguateDeclarationVsExpression() {
// String folding messes up position information.
- ParseTask pt = proc.taskFactory.new ParseTask(scannedInput);
+ ParseTask pt = parseFactory.get();
List<? extends Tree> units = pt.units();
if (units.isEmpty()) {
return error();
@@ -679,7 +696,7 @@
case LABELED_STATEMENT:
if (shouldAbort(IDENTIFIER)) return checkResult;
if (shouldAbort(COLON)) return checkResult;
- return parseStatement();
+ return parseStatement();
case VARIABLE:
case IMPORT:
case CLASS:
@@ -693,51 +710,6 @@
}
}
-// public Status parseExpressionOrDeclaration() {
-// if (token.kind == IDENTIFIER) {
-// nextToken();
-// switch (token.kind) {
-// case IDENTIFIER:
-// return parseDeclaration();
-// }
-// }
-// while (token.kind.isExpressionOrDeclaration()) {
-// if (!token.kind.isExpression()) {
-// return parseDeclaration();
-// }
-// if (!token.kind.isDeclaration()) {
-// // Expression not declaration
-// if (token.kind == EQ) {
-// // Check for array initializer
-// nextToken();
-// if (token.kind == BRACES) {
-// nextToken();
-// return lastly(SEMI);
-// }
-// }
-// return parseExpressionStatement();
-// }
-// nextToken();
-// }
-// switch (token.kind) {
-// case BRACES:
-// case SEMI:
-// nextToken();
-// return Status.COMPLETE;
-// case UNMATCHED:
-// nextToken();
-// return Status.DEFINITELY_INCOMPLETE;
-// case EOF:
-// if (in.prevCT.kind.isOkToTerminate()) {
-// return Status.COMPLETE_WITH_SEMI;
-// } else {
-// return Status.DEFINITELY_INCOMPLETE;
-// }
-// default:
-// return error();
-// }
-// }
-
public Completeness parseExpressionStatement() {
if (shouldAbort(parseExpression())) return checkResult;
return lastly(SEMI);
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/Eval.java Mon Sep 12 22:04:48 2016 +0000
@@ -555,9 +555,11 @@
: "";
} catch (ResolutionException ex) {
DeclarationSnippet sn = (DeclarationSnippet) state.maps.getSnippetDeadOrAlive(ex.id());
- exception = new UnresolvedReferenceException(sn, ex.getStackTrace());
+ exception = new UnresolvedReferenceException(sn, translateExceptionStack(ex));
} catch (UserException ex) {
- exception = translateExecutionException(ex);
+ exception = new EvalException(translateExceptionMessage(ex),
+ ex.causeExceptionClass(),
+ translateExceptionStack(ex));
} catch (RunException ex) {
// StopException - no-op
} catch (InternalException ex) {
@@ -732,7 +734,7 @@
}
}
- private EvalException translateExecutionException(UserException ex) {
+ private StackTraceElement[] translateExceptionStack(Exception ex) {
StackTraceElement[] raw = ex.getStackTrace();
int last = raw.length;
do {
@@ -759,11 +761,14 @@
elems[i] = r;
}
}
+ return elems;
+ }
+
+ private String translateExceptionMessage(Exception ex) {
String msg = ex.getMessage();
- if (msg.equals("<none>")) {
- msg = null;
- }
- return new EvalException(msg, ex.causeExceptionClass(), elems);
+ return msg.equals("<none>")
+ ? null
+ : msg;
}
private boolean isWrap(StackTraceElement ste) {
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/JShell.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/JShell.java Mon Sep 12 22:04:48 2016 +0000
@@ -51,8 +51,6 @@
import jdk.jshell.spi.ExecutionControl.ExecutionControlException;
import jdk.jshell.spi.ExecutionEnv;
import static jdk.jshell.execution.Util.failOverExecutionControlGenerator;
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.toList;
import static jdk.jshell.Util.expunge;
/**
@@ -120,7 +118,8 @@
this.executionControlGenerator = b.executionControlGenerator==null
? failOverExecutionControlGenerator(
JDIDefaultExecutionControl.launch(),
- JDIDefaultExecutionControl.listen())
+ JDIDefaultExecutionControl.listen("localhost"),
+ JDIDefaultExecutionControl.listen(null))
: b.executionControlGenerator;
this.maps = new SnippetMaps(this);
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/DemultiplexInput.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/DemultiplexInput.java Mon Sep 12 22:04:48 2016 +0000
@@ -40,15 +40,14 @@
class DemultiplexInput extends Thread {
private final DataInputStream delegate;
- private final PipeInputStream command;
private final Map<String, OutputStream> io;
+ private final Iterable<OutputStream> closeList;
- DemultiplexInput(InputStream input, PipeInputStream command,
- Map<String, OutputStream> io) {
+ DemultiplexInput(InputStream input, Map<String, OutputStream> io, Iterable<OutputStream> closeList) {
super("output reader");
this.delegate = new DataInputStream(input);
- this.command = command;
this.io = io;
+ this.closeList = closeList;
}
@Override
@@ -65,23 +64,23 @@
byte[] data = new byte[dataLen];
DemultiplexInput.this.delegate.readFully(data);
String chan = new String(name, "UTF-8");
- if (chan.equals("command")) {
- for (byte b : data) {
- command.write(Byte.toUnsignedInt(b));
- }
+ OutputStream out = io.get(chan);
+ if (out == null) {
+ debug("Unexpected channel name: %s", chan);
} else {
- OutputStream out = io.get(chan);
- if (out == null) {
- debug("Unexpected channel name: %s", chan);
- } else {
- out.write(data);
- }
+ out.write(data);
}
}
} catch (IOException ex) {
debug(ex, "Failed reading output");
} finally {
- command.close();
+ for (OutputStream out : closeList) {
+ try {
+ out.close();
+ } catch (IOException ex) {
+ debug(ex, "Failed reading output");
+ }
+ }
}
}
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JDIDefaultExecutionControl.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JDIDefaultExecutionControl.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,9 +25,9 @@
package jdk.jshell.execution;
import java.io.IOException;
+import java.io.InputStream;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
import java.io.OutputStream;
import java.net.ServerSocket;
import java.net.Socket;
@@ -48,7 +48,7 @@
import com.sun.jdi.VirtualMachine;
import jdk.jshell.spi.ExecutionControl;
import jdk.jshell.spi.ExecutionEnv;
-import static jdk.jshell.execution.Util.remoteInput;
+import static jdk.jshell.execution.Util.remoteInputOutput;
/**
* The implementation of {@link jdk.jshell.spi.ExecutionControl} that the
@@ -77,17 +77,19 @@
* @return the generator
*/
public static ExecutionControl.Generator launch() {
- return env -> create(env, true);
+ return env -> create(env, true, null);
}
/**
* Creates an ExecutionControl instance based on a JDI
* {@code ListeningConnector}.
*
+ * @param host explicit hostname to use, if null use discovered
+ * hostname, applies to listening only (!isLaunch)
* @return the generator
*/
- public static ExecutionControl.Generator listen() {
- return env -> create(env, false);
+ public static ExecutionControl.Generator listen(String host) {
+ return env -> create(env, false, host);
}
/**
@@ -100,10 +102,15 @@
*
* @param env the context passed by
* {@link jdk.jshell.spi.ExecutionControl#start(jdk.jshell.spi.ExecutionEnv) }
+ * @param isLaunch does JDI do the launch? That is, LaunchingConnector,
+ * otherwise we start explicitly and use ListeningConnector
+ * @param host explicit hostname to use, if null use discovered
+ * hostname, applies to listening only (!isLaunch)
* @return the channel
* @throws IOException if there are errors in set-up
*/
- private static JDIDefaultExecutionControl create(ExecutionEnv env, boolean isLaunch) throws IOException {
+ private static ExecutionControl create(ExecutionEnv env,
+ boolean isLaunch, String host) throws IOException {
try (final ServerSocket listener = new ServerSocket(0)) {
// timeout after 60 seconds
listener.setSoTimeout(60000);
@@ -111,14 +118,10 @@
// Set-up the JDI connection
JDIInitiator jdii = new JDIInitiator(port,
- env.extraRemoteVMOptions(), REMOTE_AGENT, isLaunch);
+ env.extraRemoteVMOptions(), REMOTE_AGENT, isLaunch, host);
VirtualMachine vm = jdii.vm();
Process process = jdii.process();
- // Forward input to the remote agent
- Util.forwardInputToRemote(env.userIn(), process.getOutputStream(),
- ex -> debug(ex, "input forwarding failure"));
-
List<Consumer<String>> deathListeners = new ArrayList<>();
deathListeners.add(s -> env.closeDown());
Util.detectJDIExitEvent(vm, s -> {
@@ -131,12 +134,13 @@
// output.
Socket socket = listener.accept();
// out before in -- match remote creation so we don't hang
- ObjectOutput cmdout = new ObjectOutputStream(socket.getOutputStream());
- Map<String, OutputStream> io = new HashMap<>();
- io.put("out", env.userOut());
- io.put("err", env.userErr());
- ObjectInput cmdin = remoteInput(socket.getInputStream(), io);
- return new JDIDefaultExecutionControl(cmdout, cmdin, vm, process, deathListeners);
+ OutputStream out = socket.getOutputStream();
+ Map<String, OutputStream> outputs = new HashMap<>();
+ outputs.put("out", env.userOut());
+ outputs.put("err", env.userErr());
+ Map<String, InputStream> input = new HashMap<>();
+ input.put("in", env.userIn());
+ return remoteInputOutput(socket.getInputStream(), out, outputs, input, (objIn, objOut) -> new JDIDefaultExecutionControl(objOut, objIn, vm, process, deathListeners));
}
}
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JDIInitiator.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/JDIInitiator.java Mon Sep 12 22:04:48 2016 +0000
@@ -56,9 +56,11 @@
* @param remoteAgent full class name of remote agent to launch
* @param isLaunch does JDI do the launch? That is, LaunchingConnector,
* otherwise we start explicitly and use ListeningConnector
+ * @param host explicit hostname to use, if null use discovered
+ * hostname, applies to listening only (!isLaunch)
*/
- public JDIInitiator(int port, List<String> remoteVMOptions,
- String remoteAgent, boolean isLaunch) {
+ public JDIInitiator(int port, List<String> remoteVMOptions, String remoteAgent,
+ boolean isLaunch, String host) {
this.remoteAgent = remoteAgent;
String connectorName
= isLaunch
@@ -72,6 +74,9 @@
= isLaunch
? launchArgs(port, String.join(" ", remoteVMOptions))
: new HashMap<>();
+ if (host != null && !isLaunch) {
+ argumentName2Value.put("localAddress", host);
+ }
this.connectorArgs = mergeConnectorArgs(connector, argumentName2Value);
this.vm = isLaunch
? launchTarget()
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/MultiplexingOutputStream.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/MultiplexingOutputStream.java Mon Sep 12 22:04:48 2016 +0000
@@ -50,13 +50,7 @@
@Override
public void write(int b) throws IOException {
- synchronized (delegate) {
- delegate.write(name.length); //assuming the len is small enough to fit into byte
- delegate.write(name);
- delegate.write(1);
- delegate.write(b);
- delegate.flush();
- }
+ write(new byte[] {(byte) b});
}
@Override
@@ -65,10 +59,12 @@
int i = 0;
while (len > 0) {
int size = Math.min(PACKET_SIZE, len);
- delegate.write(name.length); //assuming the len is small enough to fit into byte
- delegate.write(name);
- delegate.write(size);
- delegate.write(b, off + i, size);
+ byte[] data = new byte[name.length + 1 + size + 1];
+ data[0] = (byte) name.length; //assuming the len is small enough to fit into byte
+ System.arraycopy(name, 0, data, 1, name.length);
+ data[name.length + 1] = (byte) size;
+ System.arraycopy(b, off + i, data, name.length + 2, size);
+ delegate.write(data);
i += size;
len -= size;
}
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/PipeInputStream.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/PipeInputStream.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,9 @@
*/
package jdk.jshell.execution;
+import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
/**
*
@@ -39,7 +41,10 @@
private boolean closed;
@Override
- public synchronized int read() {
+ public synchronized int read() throws IOException {
+ if (start == end) {
+ inputNeeded();
+ }
while (start == end) {
if (closed) {
return -1;
@@ -57,7 +62,9 @@
}
}
- public synchronized void write(int b) {
+ protected void inputNeeded() throws IOException {}
+
+ private synchronized void write(int b) {
if (closed) {
throw new IllegalStateException("Already closed.");
}
@@ -85,4 +92,22 @@
notifyAll();
}
+ public OutputStream createOutput() {
+ return new OutputStream() {
+ @Override public void write(int b) throws IOException {
+ PipeInputStream.this.write(b);
+ }
+ @Override
+ public void write(byte[] b, int off, int len) throws IOException {
+ for (int i = 0 ; i < len ; i++) {
+ write(Byte.toUnsignedInt(b[off + i]));
+ }
+ }
+ @Override
+ public void close() throws IOException {
+ PipeInputStream.this.close();
+ }
+ };
+ }
+
}
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteExecutionControl.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/RemoteExecutionControl.java Mon Sep 12 22:04:48 2016 +0000
@@ -61,10 +61,12 @@
Socket socket = new Socket(loopBack, Integer.parseInt(args[0]));
InputStream inStream = socket.getInputStream();
OutputStream outStream = socket.getOutputStream();
- Map<String, Consumer<OutputStream>> chans = new HashMap<>();
- chans.put("out", st -> System.setOut(new PrintStream(st, true)));
- chans.put("err", st -> System.setErr(new PrintStream(st, true)));
- forwardExecutionControlAndIO(new RemoteExecutionControl(), inStream, outStream, chans);
+ Map<String, Consumer<OutputStream>> outputs = new HashMap<>();
+ outputs.put("out", st -> System.setOut(new PrintStream(st, true)));
+ outputs.put("err", st -> System.setErr(new PrintStream(st, true)));
+ Map<String, Consumer<InputStream>> input = new HashMap<>();
+ input.put("in", st -> System.setIn(st));
+ forwardExecutionControlAndIO(new RemoteExecutionControl(), inStream, outStream, outputs, input);
}
// These three variables are used by the main JShell process in interrupting
--- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/Util.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/execution/Util.java Mon Sep 12 22:04:48 2016 +0000
@@ -25,6 +25,7 @@
package jdk.jshell.execution;
import jdk.jshell.spi.ExecutionEnv;
+
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectInput;
@@ -32,9 +33,13 @@
import java.io.ObjectOutput;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.function.BiFunction;
import java.util.function.Consumer;
+
import com.sun.jdi.VirtualMachine;
import jdk.jshell.spi.ExecutionControl;
@@ -99,21 +104,40 @@
* instance, then responses back on the output.
* @param ec the direct instance of {@link ExecutionControl} to process commands
* @param inStream the stream from which to create the command input
- * @param outStream the stream that will carry {@code System.out},
- * {@code System.err}, any specified auxiliary channels, and the
- * command response output.
- * @param streamMap a map between names of additional streams to carry and setters
- * for the stream
+ * @param outStream the stream that will carry any specified auxiliary channels (like
+ * {@code System.out} and {@code System.err}), and the command response output.
+ * @param outputStreamMap a map between names of additional streams to carry and setters
+ * for the stream. Names starting with '$' are reserved for internal use.
+ * @param inputStreamMap a map between names of additional streams to carry and setters
+ * for the stream. Names starting with '$' are reserved for internal use.
* @throws IOException if there are errors using the passed streams
*/
public static void forwardExecutionControlAndIO(ExecutionControl ec,
InputStream inStream, OutputStream outStream,
- Map<String, Consumer<OutputStream>> streamMap) throws IOException {
- ObjectInputStream cmdIn = new ObjectInputStream(inStream);
- for (Entry<String, Consumer<OutputStream>> e : streamMap.entrySet()) {
+ Map<String, Consumer<OutputStream>> outputStreamMap,
+ Map<String, Consumer<InputStream>> inputStreamMap) throws IOException {
+ for (Entry<String, Consumer<OutputStream>> e : outputStreamMap.entrySet()) {
e.getValue().accept(multiplexingOutputStream(e.getKey(), outStream));
}
- ObjectOutputStream cmdOut = new ObjectOutputStream(multiplexingOutputStream("command", outStream));
+
+ ObjectOutputStream cmdOut = new ObjectOutputStream(multiplexingOutputStream("$command", outStream));
+ PipeInputStream cmdInPipe = new PipeInputStream();
+ Map<String, OutputStream> inputs = new HashMap<>();
+ inputs.put("$command", cmdInPipe.createOutput());
+ for (Entry<String, Consumer<InputStream>> e : inputStreamMap.entrySet()) {
+ OutputStream inputSignal = multiplexingOutputStream("$" + e.getKey() + "-input-requested", outStream);
+ PipeInputStream inputPipe = new PipeInputStream() {
+ @Override protected void inputNeeded() throws IOException {
+ inputSignal.write('1');
+ inputSignal.flush();
+ }
+ };
+ inputs.put(e.getKey(), inputPipe.createOutput());
+ e.getValue().accept(inputPipe);
+ }
+ new DemultiplexInput(inStream, inputs, inputs.values()).start();
+ ObjectInputStream cmdIn = new ObjectInputStream(cmdInPipe);
+
forwardExecutionControl(ec, cmdIn, cmdOut);
}
@@ -122,18 +146,41 @@
}
/**
- * Reads from an InputStream which has been packetized and write its contents
- * to the out and err OutputStreams; Copies the command stream.
+ * Creates an ExecutionControl for given packetized input and output. The given InputStream
+ * is de-packetized, and content forwarded to ObjectInput and given OutputStreams. The ObjectOutput
+ * and values read from the given InputStream are packetized and sent to the given OutputStream.
+ *
* @param input the packetized input stream
- * @param streamMap a map between stream names and the output streams to forward
- * @return the command stream
+ * @param output the packetized output stream
+ * @param outputStreamMap a map between stream names and the output streams to forward.
+ * Names starting with '$' are reserved for internal use.
+ * @param inputStreamMap a map between stream names and the input streams to forward.
+ * Names starting with '$' are reserved for internal use.
+ * @param factory to create the ExecutionControl from ObjectInput and ObjectOutput.
+ * @return the created ExecutionControl
* @throws IOException if setting up the streams raised an exception
*/
- public static ObjectInput remoteInput(InputStream input,
- Map<String, OutputStream> streamMap) throws IOException {
+ public static ExecutionControl remoteInputOutput(InputStream input, OutputStream output,
+ Map<String, OutputStream> outputStreamMap, Map<String, InputStream> inputStreamMap,
+ BiFunction<ObjectInput, ObjectOutput, ExecutionControl> factory) throws IOException {
+ Map<String, OutputStream> augmentedStreamMap = new HashMap<>(outputStreamMap);
+ ObjectOutput commandOut = new ObjectOutputStream(Util.multiplexingOutputStream("$command", output));
+ for (Entry<String, InputStream> e : inputStreamMap.entrySet()) {
+ InputStream in = e.getValue();
+ OutputStream inTarget = Util.multiplexingOutputStream(e.getKey(), output);
+ augmentedStreamMap.put("$" + e.getKey() + "-input-requested", new OutputStream() {
+ @Override
+ public void write(int b) throws IOException {
+ //value ignored, just a trigger to read from the input
+ inTarget.write(in.read());
+ }
+ });
+ }
PipeInputStream commandIn = new PipeInputStream();
- new DemultiplexInput(input, commandIn, streamMap).start();
- return new ObjectInputStream(commandIn);
+ OutputStream commandInTarget = commandIn.createOutput();
+ augmentedStreamMap.put("$command", commandInTarget);
+ new DemultiplexInput(input, augmentedStreamMap, Arrays.asList(commandInTarget)).start();
+ return factory.apply(new ObjectInputStream(commandIn), commandOut);
}
/**
@@ -151,32 +198,4 @@
}
}
- /**
- * Creates a Thread that will ship all input to the remote agent.
- *
- * @param inputStream the user input
- * @param outStream the input to the remote agent
- * @param handler a failure handler
- */
- public static void forwardInputToRemote(final InputStream inputStream,
- final OutputStream outStream, final Consumer<Exception> handler) {
- Thread thr = new Thread("input reader") {
- @Override
- public void run() {
- try {
- byte[] buf = new byte[256];
- int cnt;
- while ((cnt = inputStream.read(buf)) != -1) {
- outStream.write(buf, 0, cnt);
- outStream.flush();
- }
- } catch (Exception ex) {
- handler.accept(ex);
- }
- }
- };
- thr.setPriority(Thread.MAX_PRIORITY - 1);
- thr.start();
- }
-
}
--- a/langtools/test/ProblemList.txt Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/ProblemList.txt Mon Sep 12 22:04:48 2016 +0000
@@ -77,10 +77,3 @@
###########################################################################
#
# jdeps
-
-###########################################################################
-#
-# jdeprscan
-
-tools/jdeprscan/tests/jdk/jdeprscan/TestLoad.java 8164837 windows-all probably line breaks or encoding
-tools/jdeprscan/tests/jdk/jdeprscan/TestScan.java 8164837 windows-all probably line breaks or encoding
--- a/langtools/test/jdk/javadoc/tool/ReleaseOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/jdk/javadoc/tool/ReleaseOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -33,7 +33,7 @@
/**
* @test
* @bug 8086737
- * @summary Test -release option in javadoc
+ * @summary Test --release option in javadoc
* @run main ReleaseOption
* @modules jdk.javadoc/jdk.javadoc.internal.tool
*/
@@ -43,10 +43,10 @@
}
void run() {
- doRunTest(0, out -> out.contains("compiler.err.doesnt.exist: java.util.stream"), "-release", "7");
- doRunTest(0, out -> !out.contains("compiler.err.doesnt.exist: java.util.stream"), "-release", "8");
- doRunTest(1, out -> true, "-release", "7", "-source", "7");
- doRunTest(1, out -> true, "-release", "7", "-bootclasspath", "any");
+ doRunTest(0, out -> out.contains("compiler.err.doesnt.exist: java.util.stream"), "--release", "7");
+ doRunTest(0, out -> !out.contains("compiler.err.doesnt.exist: java.util.stream"), "--release", "8");
+ doRunTest(1, out -> true, "--release", "7", "-source", "7");
+ doRunTest(1, out -> true, "--release", "7", "-bootclasspath", "any");
}
void doRunTest(int expectedResult, Predicate<String> validate, String... args) {
--- a/langtools/test/jdk/jshell/CommandCompletionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/jdk/jshell/CommandCompletionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8144095
+ * @bug 8144095 8164825
* @summary Test Command Completion
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
@@ -40,6 +40,7 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.function.Predicate;
@@ -148,6 +149,80 @@
assertCompletion("/classpath ~/|", false, completions.toArray(new String[completions.size()]));
}
+ public void testSet() throws IOException {
+ List<String> p1 = listFiles(Paths.get(""));
+ FileSystems.getDefault().getRootDirectories().forEach(s -> p1.add(s.toString()));
+ Collections.sort(p1);
+
+ String[] modes = {"concise ", "normal ", "silent ", "verbose "};
+ String[] options = {"-command", "-delete", "-quiet"};
+ String[] modesWithOptions = Stream.concat(Arrays.stream(options), Arrays.stream(modes)).sorted().toArray(String[]::new);
+ test(false, new String[] {"--no-startup"},
+ a -> assertCompletion(a, "/se|", false, "/set "),
+ a -> assertCompletion(a, "/set |", false, "editor ", "feedback ", "format ", "mode ", "prompt ", "start ", "truncation "),
+
+ // /set editor
+ a -> assertCompletion(a, "/set e|", false, "editor "),
+ a -> assertCompletion(a, "/set editor |", false, p1.toArray(new String[p1.size()])),
+
+ // /set feedback
+ a -> assertCompletion(a, "/set fe|", false, "feedback "),
+ a -> assertCompletion(a, "/set fe |", false, modes),
+
+ // /set format
+ a -> assertCompletion(a, "/set fo|", false, "format "),
+ a -> assertCompletion(a, "/set fo |", false, modes),
+
+ // /set mode
+ a -> assertCompletion(a, "/set mo|", false, "mode "),
+ a -> assertCompletion(a, "/set mo |", false),
+ a -> assertCompletion(a, "/set mo newmode |", false, modesWithOptions),
+ a -> assertCompletion(a, "/set mo newmode -|", false, options),
+ a -> assertCompletion(a, "/set mo newmode -command |", false),
+ a -> assertCompletion(a, "/set mo newmode normal |", false, options),
+
+ // /set prompt
+ a -> assertCompletion(a, "/set pro|", false, "prompt "),
+ a -> assertCompletion(a, "/set pro |", false, modes),
+
+ // /set start
+ a -> assertCompletion(a, "/set st|", false, "start "),
+ a -> assertCompletion(a, "/set st |", false, p1.toArray(new String[p1.size()])),
+
+ // /set truncation
+ a -> assertCompletion(a, "/set tr|", false, "truncation "),
+ a -> assertCompletion(a, "/set tr |", false, modes)
+ );
+ }
+
+ public void testRetain() throws IOException {
+ List<String> p1 = listFiles(Paths.get(""));
+ FileSystems.getDefault().getRootDirectories().forEach(s -> p1.add(s.toString()));
+ Collections.sort(p1);
+
+ String[] modes = {"concise ", "normal ", "silent ", "verbose "};
+ test(false, new String[] {"--no-startup"},
+ a -> assertCompletion(a, "/ret|", false, "/retain "),
+ a -> assertCompletion(a, "/retain |", false, "editor ", "feedback ", "mode ", "start "),
+
+ // /retain editor
+ a -> assertCompletion(a, "/retain e|", false, "editor "),
+ a -> assertCompletion(a, "/retain editor |", false, p1.toArray(new String[p1.size()])),
+
+ // /retain feedback
+ a -> assertCompletion(a, "/retain fe|", false, "feedback "),
+ a -> assertCompletion(a, "/retain fe |", false, modes),
+
+ // /retain mode
+ a -> assertCompletion(a, "/retain mo|", false, "mode "),
+ a -> assertCompletion(a, "/retain mo |", false, modes),
+
+ // /retain start
+ a -> assertCompletion(a, "/retain st|", false, "start "),
+ a -> assertCompletion(a, "/retain st |", false, p1.toArray(new String[p1.size()]))
+ );
+ }
+
private void createIfNeeded(Path file) throws IOException {
if (!Files.exists(file))
Files.createFile(file);
--- a/langtools/test/jdk/jshell/CompletenessTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/jdk/jshell/CompletenessTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8149524 8131024
+ * @bug 8149524 8131024 8165211 8080071 8130454
* @summary Test SourceCodeAnalysis
* @build KullaTesting TestingInputStream
* @run testng CompletenessTest
@@ -63,6 +63,7 @@
"foo: while (true) { printf(\"Innn\"); break foo; }",
"class Case<E1 extends Enum<E1>, E2 extends Enum<E2>, E3 extends Enum<E3>> {}",
";",
+ "enum Tt { FOO, BAR, BAZ,; }"
};
static final String[] expression = new String[] {
@@ -77,6 +78,8 @@
"new int[] {1, 2,3}",
"new Foo() {}",
"i >= 0 && Character.isWhitespace(s.charAt(i))",
+ "int.class",
+ "String.class",
};
static final String[] complete_with_semi = new String[] {
@@ -113,6 +116,7 @@
"BufferedReader br = new BufferedReader(new FileReader(path))",
"bar: g()",
"baz: while (true) if (t()) printf('-'); else break baz",
+ "java.util.function.IntFunction<int[]> ggg = int[]::new",
};
static final String[] considered_incomplete = new String[] {
@@ -141,6 +145,8 @@
"if (match.kind == BRACES && (prevCT.kind == ARROW || prevCT.kind == NEW_MIDDLE)) {",
"if (match.kind == BRACES && (prevCT.kind == ARROW || prevCT.kind == NEW_MIDDLE)) { new CT(UNMATCHED, current, \"Unmatched \" + unmatched);",
"x +",
+ "x *",
+ "3 *",
"int",
"for (int i = 0; i < lines.length(); ++i) {",
"new",
@@ -156,6 +162,7 @@
"enum TK { EOF(TokenKind.EOF, 0),",
"enum TK { EOF(TokenKind.EOF, 0), NEW_MIDDLE(XEXPR1|XTERM)",
"enum TK { EOF(TokenKind.EOF, 0), NEW_MIDDLE(XEXPR1|XTERM); ",
+ "enum Tt { FOO, BAR, BAZ,;"
};
static final String[] unknown = new String[] {
--- a/langtools/test/jdk/jshell/CompletionSuggestionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/jdk/jshell/CompletionSuggestionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -419,9 +419,9 @@
public void testUncompletedDeclaration() {
assertCompletion("class Clazz { Claz|", "Clazz");
assertCompletion("class Clazz { class A extends Claz|", "Clazz");
- assertCompletion("class Clazz { Clazz clazz; Object o = cla|", "clazz");
- assertCompletion("class Clazz { static Clazz clazz; Object o = cla|", "clazz");
- assertCompletion("class Clazz { Clazz clazz; static Object o = cla|", true);
+ assertCompletion("class Clazz { Clazz clazz; Object o = claz|", "clazz");
+ assertCompletion("class Clazz { static Clazz clazz; Object o = claz|", "clazz");
+ assertCompletion("class Clazz { Clazz clazz; static Object o = claz|", true);
assertCompletion("class Clazz { void method(Claz|", "Clazz");
assertCompletion("class A { int method() { return 0; } int a = meth|", "method()");
assertCompletion("class A { int field = 0; int method() { return fiel|", "field");
--- a/langtools/test/jdk/jshell/IdGeneratorTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/jdk/jshell/IdGeneratorTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -99,19 +99,18 @@
}
}
- @Test(enabled = false) // TODO 8133507
public void testIdInException() {
JShell.Builder builder = getBuilder().idGenerator(((snippet, id) -> "custom" + id));
try (JShell jShell = builder.build()) {
EvalException evalException = (EvalException) jShell.eval("throw new Error();").get(0).exception();
for (StackTraceElement ste : evalException.getStackTrace()) {
- assertTrue(ste.getFileName().startsWith("custom"), "Not started with \"custom\": "
+ assertTrue(ste.getFileName().startsWith("#custom"), "Not started with \"#custom\": "
+ ste.getFileName());
}
jShell.eval("void f() { g(); }");
UnresolvedReferenceException unresolvedException = (UnresolvedReferenceException) jShell.eval("f();").get(0).exception();
for (StackTraceElement ste : unresolvedException.getStackTrace()) {
- assertTrue(ste.getFileName().startsWith("custom"), "Not started with \"custom\": "
+ assertTrue(ste.getFileName().startsWith("#custom"), "Not started with \"#custom\": "
+ ste.getFileName());
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/jshell/JDILaunchingExecutionControlTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016, 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 8164518
+ * @summary Tests for standard JDI connector (without failover) -- launching
+ * @modules jdk.jshell/jdk.jshell.execution
+ * @build KullaTesting ExecutionControlTestBase
+ * @run testng JDILaunchingExecutionControlTest
+ */
+
+
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeMethod;
+import jdk.jshell.execution.JDIDefaultExecutionControl;
+
+@Test
+public class JDILaunchingExecutionControlTest extends ExecutionControlTestBase {
+
+ @BeforeMethod
+ @Override
+ public void setUp() {
+ setUp(builder -> builder.executionEngine(JDIDefaultExecutionControl.launch()));
+ }
+}
--- a/langtools/test/jdk/jshell/JDIListeningExecutionControlTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/jdk/jshell/JDIListeningExecutionControlTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 8131029 8159935 8160127
+ * @bug 8131029 8159935 8160127 8164518
* @summary Tests for alternate JDI connector -- listening
* @modules jdk.jshell/jdk.jshell.execution
* @build KullaTesting ExecutionControlTestBase
@@ -41,6 +41,6 @@
@BeforeMethod
@Override
public void setUp() {
- setUp(builder -> builder.executionEngine(JDIDefaultExecutionControl.listen()));
+ setUp(builder -> builder.executionEngine(JDIDefaultExecutionControl.listen(null)));
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/jshell/JDIListeningLocalhostExecutionControlTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2016, 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 8164518
+ * @summary Tests for alternate JDI connector -- listening to "localhost"
+ * @modules jdk.jshell/jdk.jshell.execution
+ * @build KullaTesting ExecutionControlTestBase
+ * @run testng JDIListeningLocalhostExecutionControlTest
+ */
+
+
+import org.testng.annotations.Test;
+import org.testng.annotations.BeforeMethod;
+import jdk.jshell.execution.JDIDefaultExecutionControl;
+
+@Test
+public class JDIListeningLocalhostExecutionControlTest extends ExecutionControlTestBase {
+
+ @BeforeMethod
+ @Override
+ public void setUp() {
+ setUp(builder -> builder.executionEngine(JDIDefaultExecutionControl.listen("localhost")));
+ }
+}
--- a/langtools/test/jdk/jshell/ReplToolTesting.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/jdk/jshell/ReplToolTesting.java Mon Sep 12 22:04:48 2016 +0000
@@ -247,7 +247,6 @@
new PrintStream(cmdout),
new PrintStream(cmderr),
new PrintStream(console),
- userin,
new PrintStream(userout),
new PrintStream(usererr),
prefs,
@@ -463,7 +462,7 @@
private List<String> computeCompletions(String code, boolean isSmart) {
JShellTool js = this.repl != null ? this.repl
- : new JShellTool(null, null, null, null, null, null, null, prefs, Locale.ROOT);
+ : new JShellTool(null, null, null, null, null, null, prefs, Locale.ROOT);
int cursor = code.indexOf('|');
code = code.replace("|", "");
assertTrue(cursor > -1, "'|' not found: " + code);
--- a/langtools/test/jdk/jshell/StartOptionTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/jdk/jshell/StartOptionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -63,7 +63,6 @@
new PrintStream(cmdout),
new PrintStream(cmderr),
new PrintStream(console),
- new TestingInputStream(),
new PrintStream(userout),
new PrintStream(usererr),
new ReplToolTesting.MemoryPreferences(),
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/jdk/jshell/UserInputTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2016, 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 8131023
+ * @summary Verify that the user's code can read System.in
+ * @build KullaTesting TestingInputStream
+ * @run testng UserInputTest
+ */
+
+import org.testng.annotations.Test;
+
+@Test
+public class UserInputTest extends KullaTesting {
+
+ public void testReadInput() {
+ setInput("AB\n");
+ assertEval("System.in.read()", "65");
+ setInput("BC\n");
+ assertEval("System.in.read()", "66");
+ }
+
+}
--- a/langtools/test/jdk/jshell/UserJDIUserRemoteTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/jdk/jshell/UserJDIUserRemoteTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -37,7 +37,6 @@
import java.io.IOException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.ObjectOutputStream;
import java.net.ServerSocket;
import java.util.ArrayList;
import java.util.List;
@@ -62,7 +61,7 @@
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
import static jdk.jshell.execution.Util.forwardExecutionControlAndIO;
-import static jdk.jshell.execution.Util.remoteInput;
+import static jdk.jshell.execution.Util.remoteInputOutput;
@Test
public class UserJDIUserRemoteTest extends ExecutionControlTestBase {
@@ -146,7 +145,7 @@
* @return the channel
* @throws IOException if there are errors in set-up
*/
- static MyExecutionControl make(ExecutionEnv env, UserJDIUserRemoteTest test) throws IOException {
+ static ExecutionControl make(ExecutionEnv env, UserJDIUserRemoteTest test) throws IOException {
try (final ServerSocket listener = new ServerSocket(0)) {
// timeout after 60 seconds
listener.setSoTimeout(60000);
@@ -159,7 +158,7 @@
+ System.getProperty("path.separator")
+ System.getProperty("user.dir"));
JDIInitiator jdii = new JDIInitiator(port,
- opts, REMOTE_AGENT, true);
+ opts, REMOTE_AGENT, true, null);
VirtualMachine vm = jdii.vm();
Process process = jdii.process();
@@ -175,13 +174,14 @@
// output.
Socket socket = listener.accept();
// out before in -- match remote creation so we don't hang
- ObjectOutput cmdout = new ObjectOutputStream(socket.getOutputStream());
- Map<String, OutputStream> io = new HashMap<>();
- io.put("out", env.userOut());
- io.put("err", env.userErr());
- io.put("aux", test.auxStream);
- ObjectInput cmdin = remoteInput(socket.getInputStream(), io);
- MyExecutionControl myec = new MyExecutionControl(cmdout, cmdin, vm, process, deathListeners);
+ OutputStream out = socket.getOutputStream();
+ Map<String, OutputStream> outputs = new HashMap<>();
+ outputs.put("out", env.userOut());
+ outputs.put("err", env.userErr());
+ outputs.put("aux", test.auxStream);
+ Map<String, InputStream> input = new HashMap<>();
+ input.put("in", env.userIn());
+ ExecutionControl myec = remoteInputOutput(socket.getInputStream(), out, outputs, input, (objIn, objOut) -> new MyExecutionControl(objOut, objIn, vm, process, deathListeners));
test.currentEC = myec;
return myec;
}
@@ -255,11 +255,13 @@
Socket socket = new Socket(loopBack, Integer.parseInt(args[0]));
InputStream inStream = socket.getInputStream();
OutputStream outStream = socket.getOutputStream();
- Map<String, Consumer<OutputStream>> chans = new HashMap<>();
- chans.put("out", st -> System.setOut(new PrintStream(st, true)));
- chans.put("err", st -> System.setErr(new PrintStream(st, true)));
- chans.put("aux", st -> { auxPrint = new PrintStream(st, true); });
- forwardExecutionControlAndIO(new MyRemoteExecutionControl(), inStream, outStream, chans);
+ Map<String, Consumer<OutputStream>> outputs = new HashMap<>();
+ outputs.put("out", st -> System.setOut(new PrintStream(st, true)));
+ outputs.put("err", st -> System.setErr(new PrintStream(st, true)));
+ outputs.put("aux", st -> { auxPrint = new PrintStream(st, true); });
+ Map<String, Consumer<InputStream>> input = new HashMap<>();
+ input.put("in", st -> System.setIn(st));
+ forwardExecutionControlAndIO(new MyRemoteExecutionControl(), inStream, outStream, outputs, input);
} catch (Throwable ex) {
throw ex;
}
--- a/langtools/test/tools/javac/T4994049/DeprecatedYES.out Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/T4994049/DeprecatedYES.out Mon Sep 12 22:04:48 2016 +0000
@@ -1,4 +1,5 @@
-DeprecatedYES.java:18:10: compiler.warn.has.been.deprecated: foo(), A
+DeprecatedYES.java:12:10: compiler.warn.missing.deprecated.annotation
- compiler.err.warnings.and.werror
+DeprecatedYES.java:18:10: compiler.warn.has.been.deprecated: foo(), A
1 error
-1 warning
+2 warnings
--- a/langtools/test/tools/javac/T8139474/DashRelease7DashVerboseTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/T8139474/DashRelease7DashVerboseTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,8 +24,8 @@
/*
* @test
* bug 8139474
- * @summary -release 7 -verbose causes Javac exception
- * @compile -release 7 -verbose DashRelease7DashVerboseTest.java
+ * @summary --release 7 -verbose causes Javac exception
+ * @compile --release 7 -verbose DashRelease7DashVerboseTest.java
*/
public class DashRelease7DashVerboseTest {}
--- a/langtools/test/tools/javac/danglingDep/DepX.out Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/danglingDep/DepX.out Mon Sep 12 22:04:48 2016 +0000
@@ -1,2 +1,4 @@
+DepX.java:38:1: compiler.warn.missing.deprecated.annotation
- compiler.note.deprecated.filename: RefX.java
- compiler.note.deprecated.recompile
+1 warning
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/depDocComment/SuppressDepAnnWithSwitchTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2016, 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 8164073
+ * @summary Verify that -Xlint:-dep-ann suppresses warnings.
+ * @compile -Xlint:-dep-ann -Werror SuppressDepAnnWithSwitchTest.java
+ */
+
+public class SuppressDepAnnWithSwitchTest {
+ /** @deprecated */
+ int f;
+}
--- a/langtools/test/tools/javac/depDocComment/SuppressDeprecation.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/depDocComment/SuppressDeprecation.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,10 +1,11 @@
/**
* @test /nodynamiccopyright/
- * @bug 4216683 4346296 4656556 4785453
+ * @bug 4216683 4346296 4656556 4785453 8164073
* @summary New rules for when deprecation messages are suppressed
* @author gafter
*
* @compile/ref=SuppressDeprecation.out -Xlint:deprecation -XDrawDiagnostics SuppressDeprecation.java
+ * @compile/ref=SuppressDeprecation8.out -source 8 -Xlint:deprecation -XDrawDiagnostics SuppressDeprecation.java
*/
/* Test for the contexts in which deprecations warnings should
--- a/langtools/test/tools/javac/depDocComment/SuppressDeprecation.out Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/depDocComment/SuppressDeprecation.out Mon Sep 12 22:04:48 2016 +0000
@@ -1,8 +1,20 @@
-SuppressDeprecation.java:82:10: compiler.warn.has.been.deprecated: g(), T
-SuppressDeprecation.java:83:14: compiler.warn.has.been.deprecated: g(), T
-SuppressDeprecation.java:84:9: compiler.warn.has.been.deprecated: var, T
-SuppressDeprecation.java:87:9: compiler.warn.has.been.deprecated: T(), T
-SuppressDeprecation.java:90:9: compiler.warn.has.been.deprecated: T(int), T
-SuppressDeprecation.java:98:1: compiler.warn.has.been.deprecated: T(), T
-SuppressDeprecation.java:130:17: compiler.warn.has.been.deprecated: X, compiler.misc.unnamed.package
-7 warnings
+SuppressDeprecation.java:29:9: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:33:10: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:38:10: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:48:5: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:53:5: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:67:10: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:74:9: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:80:10: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:83:10: compiler.warn.has.been.deprecated: g(), T
+SuppressDeprecation.java:84:14: compiler.warn.has.been.deprecated: g(), T
+SuppressDeprecation.java:85:9: compiler.warn.has.been.deprecated: var, T
+SuppressDeprecation.java:88:9: compiler.warn.has.been.deprecated: T(), T
+SuppressDeprecation.java:91:9: compiler.warn.has.been.deprecated: T(int), T
+SuppressDeprecation.java:99:1: compiler.warn.has.been.deprecated: T(), T
+SuppressDeprecation.java:124:9: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:103:1: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:129:1: compiler.warn.missing.deprecated.annotation
+SuppressDeprecation.java:131:17: compiler.warn.has.been.deprecated: X, compiler.misc.unnamed.package
+SuppressDeprecation.java:135:1: compiler.warn.missing.deprecated.annotation
+19 warnings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/depDocComment/SuppressDeprecation8.out Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,9 @@
+- compiler.warn.source.no.bootclasspath: 1.8
+SuppressDeprecation.java:83:10: compiler.warn.has.been.deprecated: g(), T
+SuppressDeprecation.java:84:14: compiler.warn.has.been.deprecated: g(), T
+SuppressDeprecation.java:85:9: compiler.warn.has.been.deprecated: var, T
+SuppressDeprecation.java:88:9: compiler.warn.has.been.deprecated: T(), T
+SuppressDeprecation.java:91:9: compiler.warn.has.been.deprecated: T(int), T
+SuppressDeprecation.java:99:1: compiler.warn.has.been.deprecated: T(), T
+SuppressDeprecation.java:131:17: compiler.warn.has.been.deprecated: X, compiler.misc.unnamed.package
+8 warnings
--- a/langtools/test/tools/javac/depOverrides/doccomment/Test1.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test1.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, 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,11 +26,11 @@
* @bug 5086088
* @summary check warnings generated when overriding deprecated methods
*
- * @compile/ref=empty -XDrawDiagnostics -Xlint:deprecation I.java
+ * @compile/ref=Test1I.out -XDrawDiagnostics -Xlint:deprecation I.java
* @compile/ref=Test1A.out -XDrawDiagnostics -Xlint:deprecation A.java
* @compile/ref=Test1B.out -XDrawDiagnostics -Xlint:deprecation B.java
* @compile/ref=Test1B2.out -XDrawDiagnostics -Xlint:deprecation B2.java
- * @compile/ref=empty -XDrawDiagnostics -Xlint:deprecation B3.java
+ * @compile/ref=Test1B3.out -XDrawDiagnostics -Xlint:deprecation B3.java
* @compile/ref=empty -XDrawDiagnostics -Xlint:deprecation Test1.java
*/
--- a/langtools/test/tools/javac/depOverrides/doccomment/Test1A.out Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test1A.out Mon Sep 12 22:04:48 2016 +0000
@@ -1,4 +1,10 @@
A.java:13:36: compiler.warn.has.been.deprecated: iDep_aUnd_bInh(), I
A.java:12:36: compiler.warn.has.been.deprecated: iDep_aUnd_bUnd(), I
A.java:11:36: compiler.warn.has.been.deprecated: iDep_aUnd_bDep(), I
-3 warnings
+A.java:8:36: compiler.warn.missing.deprecated.annotation
+A.java:9:36: compiler.warn.missing.deprecated.annotation
+A.java:10:36: compiler.warn.missing.deprecated.annotation
+A.java:17:36: compiler.warn.missing.deprecated.annotation
+A.java:18:36: compiler.warn.missing.deprecated.annotation
+A.java:19:36: compiler.warn.missing.deprecated.annotation
+9 warnings
--- a/langtools/test/tools/javac/depOverrides/doccomment/Test1B.out Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test1B.out Mon Sep 12 22:04:48 2016 +0000
@@ -1,4 +1,10 @@
B.java:15:36: compiler.warn.has.been.deprecated: iDep_aInh_bUnd(), I
+B.java:8:36: compiler.warn.missing.deprecated.annotation
B.java:9:36: compiler.warn.has.been.deprecated: iDep_aDep_bUnd(), A
+B.java:11:36: compiler.warn.missing.deprecated.annotation
+B.java:14:36: compiler.warn.missing.deprecated.annotation
+B.java:17:36: compiler.warn.missing.deprecated.annotation
B.java:18:36: compiler.warn.has.been.deprecated: iUnd_aDep_bUnd(), A
-3 warnings
+B.java:20:36: compiler.warn.missing.deprecated.annotation
+B.java:23:36: compiler.warn.missing.deprecated.annotation
+9 warnings
--- a/langtools/test/tools/javac/depOverrides/doccomment/Test1B2.out Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test1B2.out Mon Sep 12 22:04:48 2016 +0000
@@ -2,6 +2,12 @@
B2.java:7:10: compiler.warn.has.been.deprecated: iDep_aUnd_bInh(), I
B2.java:12:36: compiler.warn.has.been.deprecated: iDep_aUnd_bUnd(), I
B2.java:9:36: compiler.warn.has.been.deprecated: iDep_aDep_bUnd(), I
+B2.java:8:36: compiler.warn.missing.deprecated.annotation
B2.java:9:36: compiler.warn.has.been.deprecated: iDep_aDep_bUnd(), A
+B2.java:11:36: compiler.warn.missing.deprecated.annotation
+B2.java:14:36: compiler.warn.missing.deprecated.annotation
+B2.java:17:36: compiler.warn.missing.deprecated.annotation
B2.java:18:36: compiler.warn.has.been.deprecated: iUnd_aDep_bUnd(), A
-6 warnings
+B2.java:20:36: compiler.warn.missing.deprecated.annotation
+B2.java:23:36: compiler.warn.missing.deprecated.annotation
+12 warnings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test1B3.out Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,8 @@
+B3.java:32:36: compiler.warn.missing.deprecated.annotation
+B3.java:35:36: compiler.warn.missing.deprecated.annotation
+B3.java:38:36: compiler.warn.missing.deprecated.annotation
+B3.java:41:36: compiler.warn.missing.deprecated.annotation
+B3.java:44:36: compiler.warn.missing.deprecated.annotation
+B3.java:47:36: compiler.warn.missing.deprecated.annotation
+B3.java:31:10: compiler.warn.missing.deprecated.annotation
+7 warnings
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test1I.out Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,9 @@
+I.java:30:36: compiler.warn.missing.deprecated.annotation
+I.java:31:36: compiler.warn.missing.deprecated.annotation
+I.java:32:36: compiler.warn.missing.deprecated.annotation
+I.java:33:36: compiler.warn.missing.deprecated.annotation
+I.java:34:36: compiler.warn.missing.deprecated.annotation
+I.java:35:36: compiler.warn.missing.deprecated.annotation
+I.java:36:36: compiler.warn.missing.deprecated.annotation
+I.java:37:36: compiler.warn.missing.deprecated.annotation
+8 warnings
--- a/langtools/test/tools/javac/depOverrides/doccomment/Test2.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test2.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -26,7 +26,7 @@
* @bug 5086088
* @summary check warnings generated when overriding deprecated methods
*
- * @compile/ref=empty -XDrawDiagnostics -Xlint:deprecation P.java
+ * @compile/ref=Test2P.out -XDrawDiagnostics -Xlint:deprecation P.java
* @compile/ref=Test2Q.out -XDrawDiagnostics -Xlint:deprecation Q.java
* @compile/ref=Test2R.out -XDrawDiagnostics -Xlint:deprecation R.java
* @compile/ref=empty -XDrawDiagnostics -Xlint:deprecation Test2.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test2P.out Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,10 @@
+P.java:30:36: compiler.warn.missing.deprecated.annotation
+P.java:31:36: compiler.warn.missing.deprecated.annotation
+P.java:32:36: compiler.warn.missing.deprecated.annotation
+P.java:33:36: compiler.warn.missing.deprecated.annotation
+P.java:34:36: compiler.warn.missing.deprecated.annotation
+P.java:35:36: compiler.warn.missing.deprecated.annotation
+P.java:36:36: compiler.warn.missing.deprecated.annotation
+P.java:37:36: compiler.warn.missing.deprecated.annotation
+P.java:38:36: compiler.warn.missing.deprecated.annotation
+9 warnings
--- a/langtools/test/tools/javac/depOverrides/doccomment/Test2Q.out Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test2Q.out Mon Sep 12 22:04:48 2016 +0000
@@ -1,4 +1,10 @@
+Q.java:8:36: compiler.warn.missing.deprecated.annotation
+Q.java:9:36: compiler.warn.missing.deprecated.annotation
+Q.java:10:36: compiler.warn.missing.deprecated.annotation
Q.java:11:36: compiler.warn.has.been.deprecated: pDep_qUnd_rDep(), P
Q.java:12:36: compiler.warn.has.been.deprecated: pDep_qUnd_rUnd(), P
Q.java:13:36: compiler.warn.has.been.deprecated: pDep_qUnd_rInh(), P
-3 warnings
+Q.java:17:36: compiler.warn.missing.deprecated.annotation
+Q.java:18:36: compiler.warn.missing.deprecated.annotation
+Q.java:19:36: compiler.warn.missing.deprecated.annotation
+9 warnings
--- a/langtools/test/tools/javac/depOverrides/doccomment/Test2R.out Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test2R.out Mon Sep 12 22:04:48 2016 +0000
@@ -1,4 +1,10 @@
+R.java:8:36: compiler.warn.missing.deprecated.annotation
R.java:9:36: compiler.warn.has.been.deprecated: pDep_qDep_rUnd(), Q
+R.java:11:36: compiler.warn.missing.deprecated.annotation
+R.java:14:36: compiler.warn.missing.deprecated.annotation
R.java:15:36: compiler.warn.has.been.deprecated: pDep_qInh_rUnd(), P
+R.java:17:36: compiler.warn.missing.deprecated.annotation
R.java:18:36: compiler.warn.has.been.deprecated: pUnd_qDep_rUnd(), Q
-3 warnings
+R.java:20:36: compiler.warn.missing.deprecated.annotation
+R.java:23:36: compiler.warn.missing.deprecated.annotation
+9 warnings
--- a/langtools/test/tools/javac/depOverrides/doccomment/Test3.out Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/depOverrides/doccomment/Test3.out Mon Sep 12 22:04:48 2016 +0000
@@ -1,2 +1,3 @@
+Test3.java:11:14: compiler.warn.missing.deprecated.annotation
Test3.java:18:1: compiler.warn.has.been.deprecated: m(), LibInterface
-1 warning
+2 warnings
--- a/langtools/test/tools/javac/diags/examples/ProcessorPathNoProcessorModulePath/ProcessorPathNoProcessorModulePath.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/diags/examples/ProcessorPathNoProcessorModulePath/ProcessorPathNoProcessorModulePath.java Mon Sep 12 22:04:48 2016 +0000
@@ -22,6 +22,6 @@
*/
// key: compiler.err.processorpath.no.processormodulepath
-// options: -processormodulepath mods -processorpath mods
+// options: --processor-module-path mods -processorpath mods
class ProcessorPathNoProcessorModulePath {}
--- a/langtools/test/tools/javac/file/MultiReleaseJar/MultiReleaseJarAwareSJFM.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/file/MultiReleaseJar/MultiReleaseJarAwareSJFM.java Mon Sep 12 22:04:48 2016 +0000
@@ -174,7 +174,7 @@
jfm.setLocation(jloc, List.of(new File("multi-release.jar")));
if (version.length() > 0) {
- jfm.handleOption("-multi-release", List.of(version).iterator());
+ jfm.handleOption("--multi-release", List.of(version).iterator());
}
CustomClassLoader cldr = new CustomClassLoader(jfm);
--- a/langtools/test/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/file/MultiReleaseJar/MultiReleaseJarTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -135,12 +135,12 @@
}
@Test(dataProvider="modes")
- // javac -d classes -release 8 -cp multi-release.jar Main.java -> succeeds
+ // javac -d classes --release 8 -cp multi-release.jar Main.java -> succeeds
public void main1Release8(Task.Mode mode) throws Exception {
tb.writeFile("Main.java", main1);
Task.Result result = new JavacTask(tb, mode)
.outdir("classes")
- .options("-release", "8")
+ .options("--release", "8")
.classpath("multi-release.jar")
.files("Main.java")
.run();
@@ -149,12 +149,12 @@
}
@Test(dataProvider="modes")
- // javac -d classes -release 9 -cp multi-release.jar Main.java -> fails
+ // javac -d classes --release 9 -cp multi-release.jar Main.java -> fails
public void main1Release9(Task.Mode mode) throws Exception {
tb.writeFile("Main.java", main1);
Task.Result result = new JavacTask(tb, mode)
.outdir("classes")
- .options("-release", "9")
+ .options("--release", "9")
.classpath("multi-release.jar")
.files("Main.java")
.run(Task.Expect.FAIL, 1);
@@ -177,12 +177,12 @@
}
@Test(dataProvider="modes")
- // javac -d classes -release 8 -cp multi-release.jar Main.java -> fails
+ // javac -d classes --release 8 -cp multi-release.jar Main.java -> fails
public void main2Release8(Task.Mode mode) throws Exception {
tb.writeFile("Main.java", main2);
Task.Result result = new JavacTask(tb, mode)
.outdir("classes")
- .options("-release", "8")
+ .options("--release", "8")
.classpath("multi-release.jar")
.files("Main.java")
.run(Task.Expect.FAIL, 1);
@@ -191,12 +191,12 @@
}
@Test(dataProvider="modes")
- // javac -d classes -release 9 -cp multi-release.jar Main.java -> succeeds
+ // javac -d classes --release 9 -cp multi-release.jar Main.java -> succeeds
public void main2Release9(Task.Mode mode) throws Exception {
tb.writeFile("Main.java", main2);
Task.Result result = new JavacTask(tb, mode)
.outdir("classes")
- .options("-release", "9")
+ .options("--release", "9")
.classpath("multi-release.jar")
.files("Main.java")
.run();
--- a/langtools/test/tools/javac/lint/Deprecation.out Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/lint/Deprecation.out Mon Sep 12 22:04:48 2016 +0000
@@ -1,4 +1,5 @@
-Deprecation.java:14:17: compiler.warn.has.been.deprecated: A, compiler.misc.unnamed.package
+Deprecation.java:11:1: compiler.warn.missing.deprecated.annotation
- compiler.err.warnings.and.werror
+Deprecation.java:14:17: compiler.warn.has.been.deprecated: A, compiler.misc.unnamed.package
1 error
-1 warning
+2 warnings
--- a/langtools/test/tools/javac/modules/AnachronisticModuleInfo/AnachronisticModuleInfoTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/modules/AnachronisticModuleInfo/AnachronisticModuleInfoTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -78,7 +78,7 @@
String log = new JavacTask(tb, Task.Mode.CMDLINE)
.options("-XDrawDiagnostics",
- "-upgrademodulepath", modulePath)
+ "--upgrade-module-path", modulePath)
.files(findJavaFiles(src))
.run(Task.Expect.FAIL)
.writeAll()
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/modules/T8160454/NPEGetDirectivesTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2016, 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 8160454
+ * @summary JSR269 jigsaw update: javax.lang.model.element.ModuleElement.getDirectives() causes NPE on unnamed modules
+ * @modules
+ * jdk.compiler/com.sun.tools.javac.code
+ * jdk.compiler/com.sun.tools.javac.util
+ * @compile NPEGetDirectivesTest.java
+ * @compile -processor NPEGetDirectivesTest NPEGetDirectivesTest.java
+ */
+
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.*;
+
+import java.util.Set;
+
+import com.sun.tools.javac.code.Directive.RequiresDirective;
+import com.sun.tools.javac.code.Symbol.ModuleSymbol;
+import com.sun.tools.javac.util.Assert;
+
+import static com.sun.tools.javac.code.Directive.RequiresFlag.MANDATED;
+
+@SupportedAnnotationTypes("*")
+public class NPEGetDirectivesTest extends AbstractProcessor {
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ for (Element e: roundEnv.getRootElements()) {
+ Element m = e.getEnclosingElement();
+ while (!(m instanceof ModuleElement)) {
+ m = m.getEnclosingElement();
+ }
+ ((ModuleSymbol)m).getDirectives();
+ RequiresDirective requiresDirective = ((ModuleSymbol)m).requires.head;
+ Assert.check(requiresDirective.getDependency().getQualifiedName().toString().equals("java.base"));
+ Assert.check(requiresDirective.flags.contains(MANDATED));
+ }
+ return false;
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+}
--- a/langtools/test/tools/javac/modules/UpgradeModulePathTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/modules/UpgradeModulePathTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -23,7 +23,7 @@
/*
* @test
- * @summary tests for -upgrademodulepath
+ * @summary tests for --upgrade-module-path
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
--- a/langtools/test/tools/javac/modules/XModuleTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/modules/XModuleTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -27,7 +27,9 @@
* @library /tools/lib
* @modules
* jdk.compiler/com.sun.tools.javac.api
+ * jdk.compiler/com.sun.tools.javac.code
* jdk.compiler/com.sun.tools.javac.main
+ * jdk.compiler/com.sun.tools.javac.processing
* @build toolbox.ToolBox toolbox.JavacTask toolbox.ModuleBuilder ModuleTestBase
* @run main XModuleTest
*/
@@ -35,12 +37,22 @@
import java.nio.file.Path;
import java.util.Arrays;
import java.util.List;
+import java.util.Set;
+import javax.annotation.processing.AbstractProcessor;
+import javax.annotation.processing.RoundEnvironment;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
+import javax.lang.model.element.ModuleElement;
+import javax.lang.model.element.TypeElement;
+import javax.lang.model.util.Elements;
+
+import com.sun.tools.javac.code.Symtab;
+import com.sun.tools.javac.processing.JavacProcessingEnvironment;
import toolbox.JavacTask;
import toolbox.ModuleBuilder;
import toolbox.Task;
-import toolbox.TestRunner;
-import toolbox.ToolBox;
+import toolbox.Task.Expect;
public class XModuleTest extends ModuleTestBase {
@@ -111,15 +123,22 @@
Path classes = base.resolve("classes");
tb.createDirectories(classes);
- String log = new JavacTask(tb)
- .options("-Xmodule:java.compiler", "--class-path", cpClasses.toString())
+ List<String> log = new JavacTask(tb)
+ .options("-Xmodule:java.compiler",
+ "--class-path", cpClasses.toString(),
+ "-XDrawDiagnostics")
.outdir(classes)
.files(src.resolve("javax/lang/model/element/Extra.java"))
- .run()
+ .run(Expect.FAIL)
.writeAll()
- .getOutput(Task.OutputKind.DIRECT);
+ .getOutputLines(Task.OutputKind.DIRECT);
- if (!log.isEmpty())
+ List<String> expectedOut = Arrays.asList(
+ "Extra.java:1:76: compiler.err.doesnt.exist: p",
+ "1 error"
+ );
+
+ if (!expectedOut.equals(log))
throw new Exception("expected output not found: " + log);
}
@@ -302,4 +321,103 @@
.run()
.writeAll();
}
+
+ @Test
+ public void testUnnamedIsolation(Path base) throws Exception {
+ //note: avoiding use of java.base, as that gets special handling on some places:
+ Path sourcePath = base.resolve("source-path");
+ tb.writeJavaFiles(sourcePath, "package src; public class Src {}");
+
+ Path classPathSrc = base.resolve("class-path-src");
+ tb.writeJavaFiles(classPathSrc, "package cp; public class CP { }");
+ Path classPath = base.resolve("classPath");
+ tb.createDirectories(classPath);
+
+ String cpLog = new JavacTask(tb)
+ .outdir(classPath)
+ .files(findJavaFiles(classPathSrc))
+ .run()
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ if (!cpLog.isEmpty())
+ throw new Exception("expected output not found: " + cpLog);
+
+ Path modulePathSrc = base.resolve("module-path-src");
+ tb.writeJavaFiles(modulePathSrc,
+ "module m {}",
+ "package m; public class M {}");
+ Path modulePath = base.resolve("modulePath");
+ tb.createDirectories(modulePath.resolve("m"));
+
+ String modLog = new JavacTask(tb)
+ .outdir(modulePath.resolve("m"))
+ .files(findJavaFiles(modulePathSrc))
+ .run()
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ if (!modLog.isEmpty())
+ throw new Exception("expected output not found: " + modLog);
+
+ Path src = base.resolve("src");
+ tb.writeJavaFiles(src, "package m; public class Extra { }");
+ Path classes = base.resolve("classes");
+ tb.createDirectories(classes);
+
+ String log = new JavacTask(tb)
+ .options("-Xmodule:m",
+ "--class-path", classPath.toString(),
+ "--source-path", sourcePath.toString(),
+ "--module-path", modulePath.toString(),
+ "--processor-path", System.getProperty("test.classes"),
+ "-XDaccessInternalAPI=true",
+ "-processor", CheckModuleContentProcessing.class.getName())
+ .outdir(classes)
+ .files(findJavaFiles(sourcePath))
+ .run()
+ .writeAll()
+ .getOutput(Task.OutputKind.DIRECT);
+
+ if (!log.isEmpty())
+ throw new Exception("expected output not found: " + log);
+ }
+
+ @SupportedAnnotationTypes("*")
+ public static final class CheckModuleContentProcessing extends AbstractProcessor {
+
+ @Override
+ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
+ Symtab syms = Symtab.instance(((JavacProcessingEnvironment) processingEnv).getContext());
+ Elements elements = processingEnv.getElementUtils();
+ ModuleElement unnamedModule = syms.unnamedModule;
+ ModuleElement mModule = elements.getModuleElement("m");
+
+ assertNonNull("mModule found", mModule);
+ assertNonNull("src.Src from m", elements.getTypeElement(mModule, "src.Src"));
+ assertNull("cp.CP not from m", elements.getTypeElement(mModule, "cp.CP"));
+ assertNull("src.Src not from unnamed", elements.getTypeElement(unnamedModule, "src.Src"));
+ assertNonNull("cp.CP from unnamed", elements.getTypeElement(unnamedModule, "cp.CP"));
+
+ return false;
+ }
+
+ @Override
+ public SourceVersion getSupportedSourceVersion() {
+ return SourceVersion.latest();
+ }
+
+ private static void assertNonNull(String msg, Object val) {
+ if (val == null) {
+ throw new AssertionError(msg);
+ }
+ }
+
+ private static void assertNull(String msg, Object val) {
+ if (val != null) {
+ throw new AssertionError(msg);
+ }
+ }
+ }
+
}
--- a/langtools/test/tools/javac/options/release/ReleaseOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/options/release/ReleaseOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,9 +1,9 @@
/**
* @test /nodynamiccopyright/
* @bug 8072480
- * @summary Verify that javac rejects Java 8 program with -release 7
+ * @summary Verify that javac rejects Java 8 program with --release 7
* @compile ReleaseOption.java
- * @compile/fail/ref=ReleaseOption-release7.out -XDrawDiagnostics -release 7 ReleaseOption.java
+ * @compile/fail/ref=ReleaseOption-release7.out -XDrawDiagnostics --release 7 ReleaseOption.java
*/
interface ReleaseOption extends java.util.stream.Stream {
--- a/langtools/test/tools/javac/options/release/ReleaseOptionClashes.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/options/release/ReleaseOptionClashes.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/**
* @test
* @bug 8072480
- * @summary Verify option clash between -release and -source is reported correctly.
+ * @summary Verify option clash between --release and -source is reported correctly.
* @modules jdk.compiler/com.sun.tools.javac.util
*/
@@ -62,7 +62,7 @@
useRawMessages.setBoolean(null, true);
ByteArrayOutputStream out = new ByteArrayOutputStream();
List<String> options = new ArrayList<>();
- options.addAll(Arrays.asList("-release", "7"));
+ options.addAll(Arrays.asList("--release", "7"));
options.addAll(Arrays.asList(args));
options.add(System.getProperty("test.src") + File.separator + "ReleaseOptionClashes.java");
compiler.run(null, null, out, options.toArray(new String[0]));
--- a/langtools/test/tools/javac/options/release/ReleaseOptionThroughAPI.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/options/release/ReleaseOptionThroughAPI.java Mon Sep 12 22:04:48 2016 +0000
@@ -24,7 +24,7 @@
/**
* @test
* @bug 8072480
- * @summary Verify that javac can handle -release when invoked using the Compiler API
+ * @summary Verify that javac can handle --release when invoked using the Compiler API
*/
import java.io.IOException;
@@ -50,7 +50,7 @@
PrintWriter outWriter = new PrintWriter(out)) {
Iterable<? extends JavaFileObject> input =
fm.getJavaFileObjects(System.getProperty("test.src") + "/ReleaseOption.java");
- List<String> options = Arrays.asList("-release", "7", "-XDrawDiagnostics");
+ List<String> options = Arrays.asList("--release", "7", "-XDrawDiagnostics");
compiler.getTask(outWriter, fm, null, options, null, input).call();
String expected =
--- a/langtools/test/tools/javac/platform/PlatformProviderTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/platform/PlatformProviderTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -101,7 +101,7 @@
"-J--add-exports=jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED",
"-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
"-XDrawDiagnostics",
- "-release",
+ "--release",
platformSpec,
System.getProperty("test.src") + "/PlatformProviderTestSource.java")
.run();
@@ -135,7 +135,7 @@
.options("-J--class-path=" + System.getProperty("test.classes"),
"-J--add-exports=jdk.compiler/com.sun.tools.javac.platform=ALL-UNNAMED",
"-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED",
- "-release",
+ "--release",
"fail",
System.getProperty("test.src") + "/PlatformProviderTestSource.java")
.run(Task.Expect.FAIL);
--- a/langtools/test/tools/javac/sym/ElementStructureTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/sym/ElementStructureTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -255,7 +255,7 @@
}
void run(Writer output, String version) throws Exception {
- List<String> options = Arrays.asList("-release", version, "-classpath", "");
+ List<String> options = Arrays.asList("--release", version, "-classpath", "");
List<ToolBox.JavaSource> files = Arrays.asList(new ToolBox.JavaSource("Test", ""));
JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
JavacTaskImpl task = (JavacTaskImpl) compiler.getTask(null, null, null, options, null, files);
--- a/langtools/test/tools/javac/synthesize/Main.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/synthesize/Main.java Mon Sep 12 22:04:48 2016 +0000
@@ -99,7 +99,7 @@
if (stdBootClassPath) {
args.add("-Xmodule:java.base");
} else {
- args.add("-system");
+ args.add("--system");
args.add("none");
files.add("module-info.java");
}
--- a/langtools/test/tools/javac/tree/JavacTreeScannerTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/tree/JavacTreeScannerTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
* jdk.compiler/com.sun.tools.javac.tree
* jdk.compiler/com.sun.tools.javac.util
* @build AbstractTreeScannerTest JavacTreeScannerTest
- * @run main JavacTreeScannerTest -q -r .
+ * @run main/othervm JavacTreeScannerTest -q -r .
*/
import java.io.*;
--- a/langtools/test/tools/javac/tree/SourceTreeScannerTest.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javac/tree/SourceTreeScannerTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
* jdk.compiler/com.sun.tools.javac.tree
* jdk.compiler/com.sun.tools.javac.util
* @build AbstractTreeScannerTest SourceTreeScannerTest
- * @run main SourceTreeScannerTest -q -r .
+ * @run main/othervm SourceTreeScannerTest -q -r .
*/
import java.io.*;
--- a/langtools/test/tools/javadoc/ReleaseOption.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/javadoc/ReleaseOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -34,7 +34,7 @@
/**
* @test
* @bug 8086737
- * @summary Test -release option in javadoc
+ * @summary Test --release option in javadoc
* @run main ReleaseOption
*/
public class ReleaseOption {
@@ -43,10 +43,10 @@
}
void run() {
- doRunTest(0, out -> out.contains("compiler.err.doesnt.exist: java.util.stream"), "-release", "7");
- doRunTest(0, out -> !out.contains("compiler.err.doesnt.exist: java.util.stream"), "-release", "8");
- doRunTest(1, out -> true, "-release", "7", "-source", "7");
- doRunTest(1, out -> true, "-release", "7", "-bootclasspath", "any");
+ doRunTest(0, out -> out.contains("compiler.err.doesnt.exist: java.util.stream"), "--release", "7");
+ doRunTest(0, out -> !out.contains("compiler.err.doesnt.exist: java.util.stream"), "--release", "8");
+ doRunTest(1, out -> true, "--release", "7", "-source", "7");
+ doRunTest(1, out -> true, "--release", "7", "-bootclasspath", "any");
}
void doRunTest(int expectedResult, Predicate<String> validate, String... args) {
--- a/langtools/test/tools/lib/toolbox/ModuleBuilder.java Mon Sep 12 15:00:58 2016 -0700
+++ b/langtools/test/tools/lib/toolbox/ModuleBuilder.java Mon Sep 12 22:04:48 2016 +0000
@@ -205,7 +205,7 @@
.collect(Collectors.joining(File.pathSeparator));
new JavacTask(tb)
.outdir(Files.createDirectories(modules.resolve(name)))
- .options("-mp", mp)
+ .options("--module-path", mp)
.files(tb.findJavaFiles(moduleSrc))
.run()
.writeAll();
--- a/make/CompileJavaModules.gmk Mon Sep 12 15:00:58 2016 -0700
+++ b/make/CompileJavaModules.gmk Mon Sep 12 22:04:48 2016 +0000
@@ -504,7 +504,7 @@
$($(MODULE)_ADD_JAVAC_FLAGS) \
--module-source-path $(MODULESOURCEPATH) \
--module-path $(MODULEPATH) \
- -system none, \
+ --system none, \
))
TARGETS += $($(MODULE)) $($(MODULE)_COPY_EXTRA)
--- a/make/Images.gmk Mon Sep 12 15:00:58 2016 -0700
+++ b/make/Images.gmk Mon Sep 12 22:04:48 2016 +0000
@@ -116,8 +116,10 @@
JIMAGE_TARGET_FILE := bin/java$(EXE_SUFFIX)
JLINK_ORDER_RESOURCES := **module-info.class
+JLINK_JLI_CLASSES :=
ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
JLINK_ORDER_RESOURCES += @$(SUPPORT_OUTPUTDIR)/classlist/classlist
+ JLINK_JLI_CLASSES := --generate-jli-classes=@$(SUPPORT_OUTPUTDIR)/classlist/jli_trace.out
endif
JLINK_ORDER_RESOURCES += \
/java.base/java/** \
@@ -131,6 +133,7 @@
--endian $(OPENJDK_BUILD_CPU_ENDIAN) \
--release-info $(BASE_RELEASE_FILE) \
--order-resources=$(call CommaList, $(JLINK_ORDER_RESOURCES)) \
+ $(JLINK_JLI_CLASSES) \
#
ifeq ($(JLINK_KEEP_PACKAGED_MODULES), true)
--- a/make/Init.gmk Mon Sep 12 15:00:58 2016 -0700
+++ b/make/Init.gmk Mon Sep 12 22:04:48 2016 +0000
@@ -314,6 +314,9 @@
endif
on-failure:
+ $(call CleanupSmartJavac)
+ $(call StopGlobalTimer)
+ $(call ReportBuildTimes)
$(call PrintFailureReports)
$(call PrintBuildLogFailures)
$(PRINTF) "Hint: If caused by a warning, try configure --disable-warnings-as-errors.\n\n"
--- a/make/common/SetupJavaCompilers.gmk Mon Sep 12 15:00:58 2016 -0700
+++ b/make/common/SetupJavaCompilers.gmk Mon Sep 12 22:04:48 2016 +0000
@@ -88,7 +88,7 @@
$(eval $(call SetupJavaCompiler,GENERATE_USINGJDKBYTECODE, \
JVM := $(JAVA_SMALL), \
JAVAC := $(NEW_JAVAC), \
- FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules -system none $(DISABLE_WARNINGS), \
+ FLAGS := --upgrade-module-path $(JDK_OUTPUTDIR)/modules --system none $(DISABLE_WARNINGS), \
SERVER_DIR := $(SJAVAC_SERVER_DIR), \
SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
--- a/make/common/TestFilesCompilation.gmk Mon Sep 12 15:00:58 2016 -0700
+++ b/make/common/TestFilesCompilation.gmk Mon Sep 12 22:04:48 2016 +0000
@@ -86,6 +86,7 @@
LANG := C, \
CFLAGS := $$($1_CFLAGS) $$($1_CFLAGS_$$($1_PREFIX)$$(name)), \
LDFLAGS := $$($1_LDFLAGS) $$($1_LDFLAGS_$$($1_PREFIX)$$(name)), \
+ LIBS := $$($1_LIBS_$$($1_PREFIX)$$(name)), \
OPTIMIZATION := LOW, \
)) \
$$(eval $1 += $$(BUILD_TEST_$$(name)) ) \
--- a/make/test/BuildTestLib.gmk Mon Sep 12 15:00:58 2016 -0700
+++ b/make/test/BuildTestLib.gmk Mon Sep 12 22:04:48 2016 +0000
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, 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
@@ -48,7 +48,7 @@
# test-lib.jar will contain only hprof classes until JDK-8081381 is resolved
$(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
SETUP := GENERATE_USINGJDKBYTECODE, \
- SRC := $(TEST_LIB_SOURCE_DIR)/share/classes/jdk/test/lib/hprof, \
+ SRC := $(TEST_LIB_SOURCE_DIR)/jdk/test/lib/hprof, \
BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
))
--- a/nashorn/.hgtags Mon Sep 12 15:00:58 2016 -0700
+++ b/nashorn/.hgtags Mon Sep 12 22:04:48 2016 +0000
@@ -367,3 +367,4 @@
ee77c6b3713ab293e027ac3ea1cc16f86dac535f jdk-9+131
55a75af751dfe44039baef2b762ee7347021025b jdk-9+132
3a924b820d02b108cf57b51e145b5150d1eedcca jdk-9+133
+e05400ba935753c77697af936db24657eb811022 jdk-9+134
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/ClassFileInstaller.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,257 @@
+/*
+ * Copyright (c) 2016, 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.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.io.ByteArrayInputStream;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * Dump a class file for a class on the class path in the current directory, or
+ * in the specified JAR file. This class is usually used when you build a class
+ * from a test library, but want to use this class in a sub-process.
+ *
+ * For example, to build the following library class:
+ * test/lib/sun/hotspot/WhiteBox.java
+ *
+ * You would use the following tags:
+ *
+ * @library /test/lib
+ * @build sun.hotspot.WhiteBox
+ *
+ * JTREG would build the class file under
+ * ${JTWork}/classes/test/lib/sun/hotspot/WhiteBox.class
+ *
+ * With you run your main test class using "@run main MyMainClass", JTREG would setup the
+ * -classpath to include "${JTWork}/classes/test/lib/", so MyMainClass would be able to
+ * load the WhiteBox class.
+ *
+ * However, if you run a sub process, and do not wish to use the exact same -classpath,
+ * You can use ClassFileInstaller to ensure that WhiteBox is available in the current
+ * directory of your test:
+ *
+ * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ *
+ * Or, you can use the -jar option to store the class in the specified JAR file. If a relative
+ * path name is given, the JAR file would be relative to the current directory of
+ *
+ * @run main ClassFileInstaller -jar myjar.jar sun.hotspot.WhiteBox
+ */
+public class ClassFileInstaller {
+ /**
+ * You can enable debug tracing of ClassFileInstaller by running JTREG with
+ * jtreg -DClassFileInstaller.debug=true ... <names of tests>
+ */
+ public static boolean DEBUG = Boolean.getBoolean("ClassFileInstaller.debug");
+
+ /**
+ * @param args The names of the classes to dump
+ * @throws Exception
+ */
+ public static void main(String... args) throws Exception {
+ if (args.length > 1 && args[0].equals("-jar")) {
+ if (args.length < 2) {
+ throw new RuntimeException("Usage: ClassFileInstaller <options> <classes>\n" +
+ "where possible options include:\n" +
+ " -jar <path> Write to the JAR file <path>");
+ }
+ writeJar(args[1], null, args, 2, args.length);
+ } else {
+ if (DEBUG) {
+ System.out.println("ClassFileInstaller: Writing to " + System.getProperty("user.dir"));
+ }
+ for (String arg : args) {
+ writeClassToDisk(arg);
+ }
+ }
+ }
+
+ public static class Manifest {
+ private InputStream in;
+
+ private Manifest(InputStream in) {
+ this.in = in;
+ }
+
+ static Manifest fromSourceFile(String fileName) throws Exception {
+ String pathName = System.getProperty("test.src") + File.separator + fileName;
+ return new Manifest(new FileInputStream(pathName));
+ }
+
+ // Example:
+ // String manifest = "Premain-Class: RedefineClassHelper\n" +
+ // "Can-Redefine-Classes: true\n";
+ // ClassFileInstaller.writeJar("redefineagent.jar",
+ // ClassFileInstaller.Manifest.fromString(manifest),
+ // "RedefineClassHelper");
+ static Manifest fromString(String manifest) throws Exception {
+ return new Manifest(new ByteArrayInputStream(manifest.getBytes()));
+ }
+
+ public InputStream getInputStream() {
+ return in;
+ }
+ }
+
+ private static void writeJar(String jarFile, Manifest manifest, String classes[], int from, int to) throws Exception {
+ if (DEBUG) {
+ System.out.println("ClassFileInstaller: Writing to " + getJarPath(jarFile));
+ }
+
+ (new File(jarFile)).delete();
+ FileOutputStream fos = new FileOutputStream(jarFile);
+ ZipOutputStream zos = new ZipOutputStream(fos);
+
+ // The manifest must be the first or second entry. See comments in JarInputStream
+ // constructor and JDK-5046178.
+ if (manifest != null) {
+ writeToDisk(zos, "META-INF/MANIFEST.MF", manifest.getInputStream());
+ }
+
+ for (int i=from; i<to; i++) {
+ writeClassToDisk(zos, classes[i]);
+ }
+
+ zos.close();
+ fos.close();
+ }
+
+ /*
+ * You can call ClassFileInstaller.writeJar() from your main test class instead of
+ * using "@run ClassFileInstaller -jar ...". E.g.,
+ *
+ * String jarPath = ClassFileInstaller.getJarPath("myjar.jar", "sun.hotspot.WhiteBox")
+ *
+ * If you call this API, make sure you build ClassFileInstaller with the following tags:
+ *
+ * @library testlibrary
+ * @build ClassFileInstaller
+ */
+ public static String writeJar(String jarFile, String... classes) throws Exception {
+ writeJar(jarFile, null, classes, 0, classes.length);
+ return getJarPath(jarFile);
+ }
+
+ public static String writeJar(String jarFile, Manifest manifest, String... classes) throws Exception {
+ writeJar(jarFile, manifest, classes, 0, classes.length);
+ return getJarPath(jarFile);
+ }
+
+ /**
+ * This returns the absolute path to the file specified in "@ClassFileInstaller -jar myjar.jar",
+ * In your test program, instead of using the JAR file name directly:
+ *
+ * String jarPath = "myjar.jar";
+ *
+ * you should call this function, like:
+ *
+ * String jarPath = ClassFileInstaller.getJarPath("myjar.jar")
+ *
+ * The reasons are:
+ * (1) Using absolute path makes it easy to cut-and-paste from the JTR file and rerun your
+ * test in any directory.
+ * (2) In the future, we may make the JAR file name unique to avoid clobbering
+ * during parallel JTREG execution.
+ *
+ */
+ public static String getJarPath(String jarFileName) {
+ return new File(jarFileName).getAbsolutePath();
+ }
+
+ public static void writeClassToDisk(String className) throws Exception {
+ writeClassToDisk((ZipOutputStream)null, className);
+ }
+ private static void writeClassToDisk(ZipOutputStream zos, String className) throws Exception {
+ writeClassToDisk(zos, className, "");
+ }
+
+ public static void writeClassToDisk(String className, String prependPath) throws Exception {
+ writeClassToDisk(null, className, prependPath);
+ }
+ private static void writeClassToDisk(ZipOutputStream zos, String className, String prependPath) throws Exception {
+ ClassLoader cl = ClassFileInstaller.class.getClassLoader();
+
+ // Convert dotted class name to a path to a class file
+ String pathName = className.replace('.', '/').concat(".class");
+ InputStream is = cl.getResourceAsStream(pathName);
+ if (is == null) {
+ throw new RuntimeException("Failed to find " + pathName);
+ }
+ if (prependPath.length() > 0) {
+ pathName = prependPath + "/" + pathName;
+ }
+ writeToDisk(zos, pathName, is);
+ }
+
+ public static void writeClassToDisk(String className, byte[] bytecode) throws Exception {
+ writeClassToDisk(null, className, bytecode);
+ }
+ private static void writeClassToDisk(ZipOutputStream zos, String className, byte[] bytecode) throws Exception {
+ writeClassToDisk(zos, className, bytecode, "");
+ }
+
+ public static void writeClassToDisk(String className, byte[] bytecode, String prependPath) throws Exception {
+ writeClassToDisk(null, className, bytecode, prependPath);
+ }
+ private static void writeClassToDisk(ZipOutputStream zos, String className, byte[] bytecode, String prependPath) throws Exception {
+ // Convert dotted class name to a path to a class file
+ String pathName = className.replace('.', '/').concat(".class");
+ if (prependPath.length() > 0) {
+ pathName = prependPath + "/" + pathName;
+ }
+ writeToDisk(zos, pathName, new ByteArrayInputStream(bytecode));
+ }
+
+ private static void writeToDisk(ZipOutputStream zos, String pathName, InputStream is) throws Exception {
+ if (DEBUG) {
+ System.out.println("ClassFileInstaller: Writing " + pathName);
+ }
+ if (zos != null) {
+ ZipEntry ze = new ZipEntry(pathName);
+ zos.putNextEntry(ze);
+ byte[] buf = new byte[1024];
+ int len;
+ while ((len = is.read(buf))>0){
+ zos.write(buf, 0, len);
+ }
+ } else {
+ // Create the class file's package directory
+ Path p = Paths.get(pathName);
+ if (pathName.contains("/")) {
+ Files.createDirectories(p.getParent());
+ }
+ // Create the class file
+ Files.copy(is, p, StandardCopyOption.REPLACE_EXISTING);
+ }
+ is.close();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/RedefineClassHelper.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2014, 2016, 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.PrintWriter;
+import java.lang.instrument.*;
+import jdk.test.lib.InMemoryJavaCompiler;
+
+/*
+ * Helper class to write tests that redefine classes.
+ * When main method is run, it will create a redefineagent.jar that can be used
+ * with the -javaagent option to support redefining classes in jtreg tests.
+ *
+ * See sample test in test/testlibrary_tests/RedefineClassTest.java
+ */
+public class RedefineClassHelper {
+
+ public static Instrumentation instrumentation;
+ public static void premain(String agentArgs, Instrumentation inst) {
+ instrumentation = inst;
+ }
+
+ /**
+ * Redefine a class
+ *
+ * @param clazz Class to redefine
+ * @param javacode String with the new java code for the class to be redefined
+ */
+ public static void redefineClass(Class clazz, String javacode) throws Exception {
+ byte[] bytecode = InMemoryJavaCompiler.compile(clazz.getName(), javacode);
+ redefineClass(clazz, bytecode);
+ }
+
+ /**
+ * Redefine a class
+ *
+ * @param clazz Class to redefine
+ * @param bytecode byte[] with the new class
+ */
+ public static void redefineClass(Class clazz, byte[] bytecode) throws Exception {
+ instrumentation.redefineClasses(new ClassDefinition(clazz, bytecode));
+ }
+
+ /**
+ * Main method to be invoked before test to create the redefineagent.jar
+ */
+ public static void main(String[] args) throws Exception {
+ ClassFileInstaller.main("RedefineClassHelper");
+
+ PrintWriter pw = new PrintWriter("MANIFEST.MF");
+ pw.println("Premain-Class: RedefineClassHelper");
+ pw.println("Can-Redefine-Classes: true");
+ pw.close();
+
+ sun.tools.jar.Main jarTool = new sun.tools.jar.Main(System.out, System.err, "jar");
+ if (!jarTool.run(new String[] { "-cmf", "MANIFEST.MF", "redefineagent.jar", "RedefineClassHelper.class" })) {
+ throw new Exception("jar operation failed");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/Asserts.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,620 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib;
+
+import java.util.Objects;
+
+/**
+ * Asserts that can be used for verifying assumptions in tests.
+ *
+ * An assertion will throw a {@link RuntimeException} if the assertion isn't true.
+ * All the asserts can be imported into a test by using a static import:
+ *
+ * <pre>
+ * {@code
+ * import static jdk.testlibrary.Asserts.*;
+ * }
+ *
+ * Always provide a message describing the assumption if the line number of the
+ * failing assertion isn't enough to understand why the assumption failed. For
+ * example, if the assertion is in a loop or in a method that is called
+ * multiple times, then the line number won't provide enough context to
+ * understand the failure.
+ * </pre>
+ */
+public class Asserts {
+
+ /**
+ * Shorthand for {@link #assertLessThan(Comparable, Comparable)}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertLessThan(Comparable, Comparable)
+ */
+ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs) {
+ assertLessThan(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertLessThan(Comparable, Comparable, String)}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @see #assertLessThan(Comparable, Comparable, String)
+ */
+ public static <T extends Comparable<T>> void assertLT(T lhs, T rhs, String msg) {
+ assertLessThan(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertLessThan(Comparable, Comparable, String)} with a default message.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertLessThan(Comparable, Comparable, String)
+ */
+ public static <T extends Comparable<T>> void assertLessThan(T lhs, T rhs) {
+ assertLessThan(lhs, rhs, null);
+ }
+
+ /**
+ * Asserts that {@code lhs} is less than {@code rhs}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static <T extends Comparable<T>>void assertLessThan(T lhs, T rhs, String msg) {
+ if (!(compare(lhs, rhs, msg) < 0)) {
+ msg = Objects.toString(msg, "assertLessThan")
+ + ": expected that " + Objects.toString(lhs)
+ + " < " + Objects.toString(rhs);
+ fail(msg);
+ }
+ }
+
+ /**
+ * Shorthand for {@link #assertLessThanOrEqual(Comparable, Comparable)}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertLessThanOrEqual(Comparable, Comparable)
+ */
+ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs) {
+ assertLessThanOrEqual(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertLessThanOrEqual(Comparable, Comparable, String)}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @see #assertLessThanOrEqual(Comparable, Comparable, String)
+ */
+ public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs, String msg) {
+ assertLessThanOrEqual(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertLessThanOrEqual(Comparable, Comparable, String)} with a default message.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertLessThanOrEqual(Comparable, Comparable, String)
+ */
+ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs) {
+ assertLessThanOrEqual(lhs, rhs, null);
+ }
+
+ /**
+ * Asserts that {@code lhs} is less than or equal to {@code rhs}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs, String msg) {
+ if (!(compare(lhs, rhs, msg) <= 0)) {
+ msg = Objects.toString(msg, "assertLessThanOrEqual")
+ + ": expected that " + Objects.toString(lhs)
+ + " <= " + Objects.toString(rhs);
+ fail(msg);
+ }
+ }
+
+ /**
+ * Shorthand for {@link #assertEquals(Object, Object)}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertEquals(Object, Object)
+ */
+ public static void assertEQ(Object lhs, Object rhs) {
+ assertEquals(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertEquals(Object, Object, String)}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @see #assertEquals(Object, Object, String)
+ */
+ public static void assertEQ(Object lhs, Object rhs, String msg) {
+ assertEquals(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertEquals(java.lang.Object, java.lang.Object, java.lang.String)} with a default message.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertEquals(Object, Object, String)
+ */
+ public static void assertEquals(Object lhs, Object rhs) {
+ assertEquals(lhs, rhs, null);
+ }
+
+ /**
+ * Asserts that {@code lhs} is equal to {@code rhs}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static void assertEquals(Object lhs, Object rhs, String msg) {
+ if ((lhs != rhs) && ((lhs == null) || !(lhs.equals(rhs)))) {
+ msg = Objects.toString(msg, "assertEquals")
+ + ": expected " + Objects.toString(lhs)
+ + " to equal " + Objects.toString(rhs);
+ fail(msg);
+ }
+ }
+
+ /**
+ * Calls {@link #assertSame(java.lang.Object, java.lang.Object, java.lang.String)} with a default message.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertSame(Object, Object, String)
+ */
+ public static void assertSame(Object lhs, Object rhs) {
+ assertSame(lhs, rhs, null);
+ }
+
+ /**
+ * Asserts that {@code lhs} is the same as {@code rhs}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static void assertSame(Object lhs, Object rhs, String msg) {
+ if (lhs != rhs) {
+ msg = Objects.toString(msg, "assertSame")
+ + ": expected " + Objects.toString(lhs)
+ + " to equal " + Objects.toString(rhs);
+ fail(msg);
+ }
+ }
+
+ /**
+ * Shorthand for {@link #assertGreaterThanOrEqual(Comparable, Comparable)}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertGreaterThanOrEqual(Comparable, Comparable)
+ */
+ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs) {
+ assertGreaterThanOrEqual(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertGreaterThanOrEqual(Comparable, Comparable, String)}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @see #assertGreaterThanOrEqual(Comparable, Comparable, String)
+ */
+ public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs, String msg) {
+ assertGreaterThanOrEqual(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertGreaterThanOrEqual(Comparable, Comparable, String)} with a default message.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertGreaterThanOrEqual(Comparable, Comparable, String)
+ */
+ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs) {
+ assertGreaterThanOrEqual(lhs, rhs, null);
+ }
+
+ /**
+ * Asserts that {@code lhs} is greater than or equal to {@code rhs}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs, String msg) {
+ if (!(compare(lhs, rhs, msg) >= 0)) {
+ msg = Objects.toString(msg, "assertGreaterThanOrEqual")
+ + ": expected " + Objects.toString(lhs)
+ + " >= " + Objects.toString(rhs);
+ fail(msg);
+ }
+ }
+
+ /**
+ * Shorthand for {@link #assertGreaterThan(Comparable, Comparable)}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertGreaterThan(Comparable, Comparable)
+ */
+ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs) {
+ assertGreaterThan(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertGreaterThan(Comparable, Comparable, String)}.
+ *
+ * @param <T> a type
+ * @param lhs the left hand value
+ * @param rhs the right hand value
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @see #assertGreaterThan(Comparable, Comparable, String)
+ */
+ public static <T extends Comparable<T>> void assertGT(T lhs, T rhs, String msg) {
+ assertGreaterThan(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertGreaterThan(Comparable, Comparable, String)} with a default message.
+ *
+ * @param <T> a type
+ * @param lhs the left hand value
+ * @param rhs the right hand value
+ * @see #assertGreaterThan(Comparable, Comparable, String)
+ */
+ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs) {
+ assertGreaterThan(lhs, rhs, null);
+ }
+
+ /**
+ * Asserts that {@code lhs} is greater than {@code rhs}.
+ *
+ * @param <T> a type
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs, String msg) {
+ if (!(compare(lhs, rhs, msg) > 0)) {
+ msg = Objects.toString(msg, "assertGreaterThan")
+ + ": expected " + Objects.toString(lhs)
+ + " > " + Objects.toString(rhs);
+ fail(msg);
+ }
+ }
+
+ /**
+ * Shorthand for {@link #assertNotEquals(Object, Object)}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertNotEquals(Object, Object)
+ */
+ public static void assertNE(Object lhs, Object rhs) {
+ assertNotEquals(lhs, rhs);
+ }
+
+ /**
+ * Shorthand for {@link #assertNotEquals(Object, Object, String)}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @see #assertNotEquals(Object, Object, String)
+ */
+ public static void assertNE(Object lhs, Object rhs, String msg) {
+ assertNotEquals(lhs, rhs, msg);
+ }
+
+ /**
+ * Calls {@link #assertNotEquals(Object, Object, String)} with a default message.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @see #assertNotEquals(Object, Object, String)
+ */
+ public static void assertNotEquals(Object lhs, Object rhs) {
+ assertNotEquals(lhs, rhs, null);
+ }
+
+ /**
+ * Asserts that {@code lhs} is not equal to {@code rhs}.
+ *
+ * @param lhs The left hand side of the comparison.
+ * @param rhs The right hand side of the comparison.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static void assertNotEquals(Object lhs, Object rhs, String msg) {
+ if ((lhs == rhs) || (lhs != null && lhs.equals(rhs))) {
+ msg = Objects.toString(msg, "assertNotEquals")
+ + ": expected " + Objects.toString(lhs)
+ + " to not equal " + Objects.toString(rhs);
+ fail(msg);
+ }
+ }
+
+ /**
+ * Calls {@link #assertNull(Object, String)} with a default message.
+ *
+ * @param o The reference assumed to be null.
+ * @see #assertNull(Object, String)
+ */
+ public static void assertNull(Object o) {
+ assertNull(o, null);
+ }
+
+ /**
+ * Asserts that {@code o} is null.
+ *
+ * @param o The reference assumed to be null.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static void assertNull(Object o, String msg) {
+ assertEquals(o, null, msg);
+ }
+
+ /**
+ * Calls {@link #assertNotNull(Object, String)} with a default message.
+ *
+ * @param o The reference assumed <i>not</i> to be null,
+ * @see #assertNotNull(Object, String)
+ */
+ public static void assertNotNull(Object o) {
+ assertNotNull(o, null);
+ }
+
+ /**
+ * Asserts that {@code o} is <i>not</i> null.
+ *
+ * @param o The reference assumed <i>not</i> to be null,
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static void assertNotNull(Object o, String msg) {
+ assertNotEquals(o, null, msg);
+ }
+
+ /**
+ * Calls {@link #assertFalse(boolean, String)} with a default message.
+ *
+ * @param value The value assumed to be false.
+ * @see #assertFalse(boolean, String)
+ */
+ public static void assertFalse(boolean value) {
+ assertFalse(value, null);
+ }
+
+ /**
+ * Asserts that {@code value} is {@code false}.
+ *
+ * @param value The value assumed to be false.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static void assertFalse(boolean value, String msg) {
+ if (value) {
+ msg = Objects.toString(msg, "assertFalse")
+ + ": expected false, was true";
+ fail(msg);
+ }
+ }
+
+ /**
+ * Calls {@link #assertTrue(boolean, String)} with a default message.
+ *
+ * @param value The value assumed to be true.
+ * @see #assertTrue(boolean, String)
+ */
+ public static void assertTrue(boolean value) {
+ assertTrue(value, null);
+ }
+
+ /**
+ * Asserts that {@code value} is {@code true}.
+ *
+ * @param value The value assumed to be true.
+ * @param msg A description of the assumption; {@code null} for a default message.
+ * @throws RuntimeException if the assertion is not true.
+ */
+ public static void assertTrue(boolean value, String msg) {
+ if (!value) {
+ msg = Objects.toString(msg, "assertTrue")
+ + ": expected true, was false";
+ fail(msg);
+ }
+ }
+
+ private static <T extends Comparable<T>> int compare(T lhs, T rhs, String msg) {
+ if (lhs == null || rhs == null) {
+ fail(lhs, rhs, msg + ": values must be non-null:", ",");
+ }
+ return lhs.compareTo(rhs);
+ }
+
+/**
+ * Asserts that two strings are equal.
+ *
+ * If strings are not equals, then exception message
+ * will contain {@code msg} followed by list of mismatched lines.
+ *
+ * @param str1 First string to compare.
+ * @param str2 Second string to compare.
+ * @param msg A description of the assumption.
+ * @throws RuntimeException if strings are not equal.
+ */
+ public static void assertStringsEqual(String str1, String str2,
+ String msg) {
+ String lineSeparator = System.getProperty("line.separator");
+ String str1Lines[] = str1.split(lineSeparator);
+ String str2Lines[] = str2.split(lineSeparator);
+
+ int minLength = Math.min(str1Lines.length, str2Lines.length);
+ String longestStringLines[] = ((str1Lines.length == minLength) ?
+ str2Lines : str1Lines);
+
+ boolean stringsAreDifferent = false;
+
+ StringBuilder messageBuilder = new StringBuilder(msg);
+
+ messageBuilder.append("\n");
+
+ for (int line = 0; line < minLength; line++) {
+ if (!str1Lines[line].equals(str2Lines[line])) {
+ messageBuilder.append(String.
+ format("[line %d] '%s' differs " +
+ "from '%s'\n",
+ line,
+ str1Lines[line],
+ str2Lines[line]));
+ stringsAreDifferent = true;
+ }
+ }
+
+ if (minLength < longestStringLines.length) {
+ String stringName = ((longestStringLines == str1Lines) ?
+ "first" : "second");
+ messageBuilder.append(String.format("Only %s string contains " +
+ "following lines:\n",
+ stringName));
+ stringsAreDifferent = true;
+ for(int line = minLength; line < longestStringLines.length; line++) {
+ messageBuilder.append(String.
+ format("[line %d] '%s'", line,
+ longestStringLines[line]));
+ }
+ }
+
+ if (stringsAreDifferent) {
+ fail(messageBuilder.toString());
+ }
+ }
+
+ /**
+ * Returns a string formatted with a message and expected and actual values.
+ * @param lhs the actual value
+ * @param rhs the expected value
+ * @param message the actual value
+ * @param relation the asserted relationship between lhs and rhs
+ * @return a formatted string
+ */
+ public static String format(Object lhs, Object rhs, String message, String relation) {
+ StringBuilder sb = new StringBuilder(80);
+ if (message != null) {
+ sb.append(message);
+ sb.append(' ');
+ }
+ sb.append("<");
+ sb.append(Objects.toString(lhs));
+ sb.append("> ");
+ sb.append(Objects.toString(relation, ","));
+ sb.append(" <");
+ sb.append(Objects.toString(rhs));
+ sb.append(">");
+ return sb.toString();
+ }
+
+ /**
+ * Fail reports a failure with message fail.
+ *
+ * @throws RuntimeException always
+ */
+ public static void fail() {
+ fail("fail");
+ }
+
+ /**
+ * Fail reports a failure with a message.
+ * @param message for the failure
+ * @throws RuntimeException always
+ */
+ public static void fail(String message) {
+ throw new RuntimeException(message);
+ }
+
+ /**
+ * Fail reports a failure with a formatted message.
+ *
+ * @param lhs the actual value
+ * @param rhs the expected value
+ * @param message to be format before the expected and actual values
+ * @param relation the asserted relationship between lhs and rhs
+ * @throws RuntimeException always
+ */
+ public static void fail(Object lhs, Object rhs, String message, String relation) {
+ throw new RuntimeException(format(lhs, rhs, message, relation));
+ }
+
+ /**
+ * Fail reports a failure with a message and a cause.
+ * @param message to be format before the expected and actual values
+ * @param cause the exception that caused this failure
+ * @throws RuntimeException always
+ */
+ public static void fail(String message, Throwable cause) {
+ throw new RuntimeException(message, cause);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/BuildHelper.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib;
+
+import java.io.File;
+import java.io.FileReader;
+import java.util.Properties;
+
+public class BuildHelper {
+
+ /**
+ * Commercial builds should have the BUILD_TYPE set to commercial
+ * within the release file, found at the root of the JDK.
+ */
+ public static boolean isCommercialBuild() throws Exception {
+ String buildType = getReleaseProperty("BUILD_TYPE","notFound");
+ return buildType.equals("commercial");
+ }
+
+
+ /**
+ * Return the value for property key, or defaultValue if no property not found.
+ * If present, double quotes are trimmed.
+ */
+ public static String getReleaseProperty(String key, String defaultValue) throws Exception {
+ Properties properties = getReleaseProperties();
+ String value = properties.getProperty(key, defaultValue);
+ return trimDoubleQuotes(value);
+ }
+
+ /**
+ * Return the value for property key, or null if no property not found.
+ * If present, double quotes are trimmed.
+ */
+ public static String getReleaseProperty(String key) throws Exception {
+ return getReleaseProperty(key, null);
+ }
+
+ /**
+ * Get properties from the release file
+ */
+ public static Properties getReleaseProperties() throws Exception {
+ Properties properties = new Properties();
+ properties.load(new FileReader(getReleaseFile()));
+ return properties;
+ }
+
+ /**
+ * Every JDK has a release file in its root.
+ * @return A handler to the release file.
+ */
+ public static File getReleaseFile() throws Exception {
+ String jdkPath = getJDKRoot();
+ File releaseFile = new File(jdkPath,"release");
+ if ( ! releaseFile.canRead() ) {
+ throw new Exception("Release file is not readable, or it is absent: " +
+ releaseFile.getCanonicalPath());
+ }
+ return releaseFile;
+ }
+
+ /**
+ * Returns path to the JDK under test.
+ * This path is obtained through the test.jdk property, usually set by JTREG.
+ */
+ public static String getJDKRoot() {
+ String jdkPath = System.getProperty("test.jdk");
+ if (jdkPath == null) {
+ throw new RuntimeException("System property 'test.jdk' not set. This property is normally set by jtreg. "
+ + "When running test separately, set this property using '-Dtest.jdk=/path/to/jdk'.");
+ }
+ return jdkPath;
+ }
+
+ /**
+ * Trim double quotes from the beginning and the end of the given string.
+ * @param original string to trim.
+ * @return a new trimmed string.
+ */
+ public static String trimDoubleQuotes(String original) {
+ if (original == null) { return null; }
+ String trimmed = original.replaceAll("^\"+|\"+$", "");
+ return trimmed;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/ByteCodeLoader.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib;
+
+import java.security.SecureClassLoader;
+
+/**
+ * {@code ByteCodeLoader} can be used for easy loading of byte code already
+ * present in memory.
+ *
+ * {@code InMemoryCompiler} can be used for compiling source code in a string
+ * into byte code, which then can be loaded with {@code ByteCodeLoader}.
+ *
+ * @see InMemoryCompiler
+ */
+public class ByteCodeLoader extends SecureClassLoader {
+ private final String className;
+ private final byte[] byteCode;
+ private volatile Class<?> holder;
+
+ /**
+ * Creates a new {@code ByteCodeLoader} ready to load a class with the
+ * given name and the given byte code.
+ *
+ * @param className The name of the class
+ * @param byteCode The byte code of the class
+ */
+ public ByteCodeLoader(String className, byte[] byteCode) {
+ this.className = className;
+ this.byteCode = byteCode;
+ }
+
+ @Override
+ public Class<?> loadClass(String name) throws ClassNotFoundException {
+ if (!name.equals(className)) {
+ return super.loadClass(name);
+ }
+ if (holder == null) {
+ synchronized(this) {
+ if (holder == null) {
+ holder = findClass(name);
+ }
+ }
+ }
+ return holder;
+ }
+
+ @Override
+ protected Class<?> findClass(String name) throws ClassNotFoundException {
+ if (!name.equals(className)) {
+ throw new ClassNotFoundException(name);
+ }
+
+ return defineClass(name, byteCode, 0, byteCode.length);
+ }
+
+ /**
+ * Utility method for creating a new {@code ByteCodeLoader} and then
+ * directly load the given byte code.
+ *
+ * @param className The name of the class
+ * @param byteCode The byte code for the class
+ * @throws ClassNotFoundException if the class can't be loaded
+ * @return A {@see Class} object representing the class
+ */
+ public static Class<?> load(String className, byte[] byteCode) throws ClassNotFoundException {
+ return new ByteCodeLoader(className, byteCode).loadClass(className);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/DynamicVMOption.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib;
+
+import com.sun.management.HotSpotDiagnosticMXBean;
+import java.lang.management.ManagementFactory;
+
+/**
+ * A utility class to work with VM options which could be altered during
+ * execution.
+ *
+ * This class is a wrapper around {@code com.sun.management.VMOption}.
+ * It provides more convenient interface to read/write the values.
+ *
+ */
+public class DynamicVMOption {
+
+ private final HotSpotDiagnosticMXBean mxBean;
+
+ /**
+ * VM option name, like "MinHeapFreeRatio".
+ */
+ public final String name;
+
+ /**
+ * Creates an instance of DynamicVMOption.
+ *
+ * @param name the VM option name
+ */
+ public DynamicVMOption(String name) {
+ this.name = name;
+ mxBean = ManagementFactory.getPlatformMXBean(HotSpotDiagnosticMXBean.class);
+ }
+
+ /**
+ * Sets a new value for the option.
+ * Trying to set not applicable value will cause IllegalArgumentException.
+ * Behavior with null is undefined, most likely NPE will be thrown.
+ *
+ * @param newValue the value to be set
+ * @see #getValue()
+ * @throws IllegalArgumentException if newValue is not applicable to the option
+ */
+ public final void setValue(String newValue) {
+ mxBean.setVMOption(name, newValue);
+ }
+
+ /**
+ * Returns the value of option.
+ *
+ * @return the current option value
+ * @see #setValue(java.lang.String)
+ */
+ public final String getValue() {
+ return mxBean.getVMOption(name).getValue();
+ }
+
+ /**
+ * Returns true, if option is writable, false otherwise.
+ *
+ * @return true, if option is writable, false otherwise
+ */
+ public final boolean isWriteable() {
+ return mxBean.getVMOption(name).isWriteable();
+ }
+
+ /**
+ * Checks if the given value is applicable for the option.
+ *
+ * This method tries to set the option to the new value. If no exception
+ * has been thrown the value is treated as valid.
+ *
+ * Calling this method will not change the option value. After an attempt
+ * to set a new value, the option will be restored to its previous value.
+ *
+ * @param value the value to verify
+ * @return true if option could be set to the given value
+ */
+ public boolean isValidValue(String value) {
+ boolean isValid = true;
+ String oldValue = getValue();
+ try {
+ setValue(value);
+ } catch (NullPointerException e) {
+ if (value == null) {
+ isValid = false;
+ }
+ } catch (IllegalArgumentException e) {
+ isValid = false;
+ } finally {
+ setValue(oldValue);
+ }
+ return isValid;
+ }
+
+ /**
+ * Returns the value of the given VM option as String.
+ *
+ * This is a simple shortcut for {@code new DynamicVMOption(name).getValue()}
+ *
+ * @param name the name of VM option
+ * @return value as a string
+ * @see #getValue()
+ */
+ public static String getString(String name) {
+ return new DynamicVMOption(name).getValue();
+ }
+
+ /**
+ * Returns the value of the given option as int.
+ *
+ * @param name the name of VM option
+ * @return value parsed as integer
+ * @see #getString(java.lang.String)
+ *
+ */
+ public static int getInt(String name) {
+ return Integer.parseInt(getString(name));
+ }
+
+ /**
+ * Sets the VM option to a new value.
+ *
+ * This is a simple shortcut for {@code new DynamicVMOption(name).setValue(value)}
+ *
+ * @param name the name of VM option
+ * @param value the value to be set
+ * @see #setValue(java.lang.String)
+ */
+ public static void setString(String name, String value) {
+ new DynamicVMOption(name).setValue(value);
+ }
+
+ /**
+ * Sets the VM option value to a new integer value.
+ *
+ * @param name the name of VM option
+ * @param value the integer value to be set
+ * @see #setString(java.lang.String, java.lang.String)
+ */
+ public static void setInt(String name, int value) {
+ new DynamicVMOption(name).setValue(Integer.toString(value));
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/FileInstaller.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib;
+
+import java.io.IOException;
+import java.nio.file.FileVisitResult;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.SimpleFileVisitor;
+import java.nio.file.StandardCopyOption;
+import java.nio.file.attribute.BasicFileAttributes;
+
+/**
+ * Copy a resource: file or directory recursively, using relative path(src and dst)
+ * which are applied to test source directory(src) and current directory(dst)
+ */
+public class FileInstaller {
+ /**
+ * @param args source and destination
+ * @throws IOException if an I/O error occurs
+ */
+ public static void main(String[] args) throws IOException {
+ if (args.length != 2) {
+ throw new IllegalArgumentException("Unexpected number of arguments for file copy");
+ }
+ Path src = Paths.get(Utils.TEST_SRC, args[0]).toAbsolutePath();
+ Path dst = Paths.get(args[1]).toAbsolutePath();
+ if (src.toFile().exists()) {
+ if (src.toFile().isDirectory()) {
+ Files.walkFileTree(src, new CopyFileVisitor(src, dst));
+ } else {
+ Path dstDir = dst.getParent();
+ if (!dstDir.toFile().exists()) {
+ Files.createDirectories(dstDir);
+ }
+ Files.copy(src, dst, StandardCopyOption.REPLACE_EXISTING);
+ }
+ } else {
+ throw new IOException("Can't find source " + src);
+ }
+ }
+
+ private static class CopyFileVisitor extends SimpleFileVisitor<Path> {
+ private final Path copyFrom;
+ private final Path copyTo;
+
+ public CopyFileVisitor(Path copyFrom, Path copyTo) {
+ this.copyFrom = copyFrom;
+ this.copyTo = copyTo;
+ }
+
+ @Override
+ public FileVisitResult preVisitDirectory(Path file,
+ BasicFileAttributes attrs) throws IOException {
+ Path relativePath = file.relativize(copyFrom);
+ Path destination = copyTo.resolve(relativePath);
+ if (!destination.toFile().exists()) {
+ Files.createDirectories(destination);
+ }
+ return FileVisitResult.CONTINUE;
+ }
+
+ @Override
+ public FileVisitResult visitFile(Path file,
+ BasicFileAttributes attrs) throws IOException {
+ if (!file.toFile().isFile()) {
+ return FileVisitResult.CONTINUE;
+ }
+ Path relativePath = copyFrom.relativize(file);
+ Path destination = copyTo.resolve(relativePath);
+ Files.copy(file, destination, StandardCopyOption.COPY_ATTRIBUTES);
+ return FileVisitResult.CONTINUE;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/InMemoryJavaCompiler.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import java.net.URI;
+import java.util.Arrays;
+
+import javax.tools.ForwardingJavaFileManager;
+import javax.tools.FileObject;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileObject;
+import javax.tools.JavaFileObject.Kind;
+import javax.tools.SimpleJavaFileObject;
+import javax.tools.ToolProvider;
+
+/**
+ * {@code InMemoryJavaCompiler} can be used for compiling a {@link
+ * CharSequence} to a {@code byte[]}.
+ *
+ * The compiler will not use the file system at all, instead using a {@link
+ * ByteArrayOutputStream} for storing the byte code. For the source code, any
+ * kind of {@link CharSequence} can be used, e.g. {@link String}, {@link
+ * StringBuffer} or {@link StringBuilder}.
+ *
+ * The {@code InMemoryCompiler} can easily be used together with a {@code
+ * ByteClassLoader} to easily compile and load source code in a {@link String}:
+ *
+ * <pre>
+ * {@code
+ * import jdk.test.lib.InMemoryJavaCompiler;
+ * import jdk.test.lib.ByteClassLoader;
+ *
+ * class Example {
+ * public static void main(String[] args) {
+ * String className = "Foo";
+ * String sourceCode = "public class " + className + " {" +
+ * " public void bar() {" +
+ * " System.out.println("Hello from bar!");" +
+ * " }" +
+ * "}";
+ * byte[] byteCode = InMemoryJavaCompiler.compile(className, sourceCode);
+ * Class fooClass = ByteClassLoader.load(className, byteCode);
+ * }
+ * }
+ * }
+ * </pre>
+ */
+public class InMemoryJavaCompiler {
+ private static class MemoryJavaFileObject extends SimpleJavaFileObject {
+ private final String className;
+ private final CharSequence sourceCode;
+ private final ByteArrayOutputStream byteCode;
+
+ public MemoryJavaFileObject(String className, CharSequence sourceCode) {
+ super(URI.create("string:///" + className.replace('.','/') + Kind.SOURCE.extension), Kind.SOURCE);
+ this.className = className;
+ this.sourceCode = sourceCode;
+ this.byteCode = new ByteArrayOutputStream();
+ }
+
+ @Override
+ public CharSequence getCharContent(boolean ignoreEncodingErrors) {
+ return sourceCode;
+ }
+
+ @Override
+ public OutputStream openOutputStream() throws IOException {
+ return byteCode;
+ }
+
+ public byte[] getByteCode() {
+ return byteCode.toByteArray();
+ }
+
+ public String getClassName() {
+ return className;
+ }
+ }
+
+ private static class FileManagerWrapper extends ForwardingJavaFileManager {
+ private MemoryJavaFileObject file;
+
+ public FileManagerWrapper(MemoryJavaFileObject file) {
+ super(getCompiler().getStandardFileManager(null, null, null));
+ this.file = file;
+ }
+
+ @Override
+ public JavaFileObject getJavaFileForOutput(Location location, String className,
+ Kind kind, FileObject sibling)
+ throws IOException {
+ if (!file.getClassName().equals(className)) {
+ throw new IOException("Expected class with name " + file.getClassName() +
+ ", but got " + className);
+ }
+ return file;
+ }
+ }
+
+ /**
+ * Compiles the class with the given name and source code.
+ *
+ * @param className The name of the class
+ * @param sourceCode The source code for the class with name {@code className}
+ * @param options additional command line options
+ * @throws RuntimeException if the compilation did not succeed
+ * @return The resulting byte code from the compilation
+ */
+ public static byte[] compile(String className, CharSequence sourceCode, String... options) {
+ MemoryJavaFileObject file = new MemoryJavaFileObject(className, sourceCode);
+ CompilationTask task = getCompilationTask(file, options);
+
+ if(!task.call()) {
+ throw new RuntimeException("Could not compile " + className + " with source code " + sourceCode);
+ }
+
+ return file.getByteCode();
+ }
+
+ private static JavaCompiler getCompiler() {
+ return ToolProvider.getSystemJavaCompiler();
+ }
+
+ private static CompilationTask getCompilationTask(MemoryJavaFileObject file, String... options) {
+ return getCompiler().getTask(null, new FileManagerWrapper(file), null, Arrays.asList(options), null, Arrays.asList(file));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/JDKToolFinder.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,106 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib;
+
+import java.io.FileNotFoundException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public final class JDKToolFinder {
+
+ private JDKToolFinder() {
+ }
+
+ /**
+ * Returns the full path to an executable in jdk/bin based on System
+ * property {@code test.jdk} or {@code compile.jdk} (both are set by the jtreg test suite)
+ *
+ * @return Full path to an executable in jdk/bin
+ */
+ public static String getJDKTool(String tool) {
+
+ // First try to find the executable in test.jdk
+ try {
+ return getTool(tool, "test.jdk");
+ } catch (FileNotFoundException e) {
+
+ }
+
+ // Now see if it's available in compile.jdk
+ try {
+ return getTool(tool, "compile.jdk");
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException("Failed to find " + tool +
+ ", looked in test.jdk (" + System.getProperty("test.jdk") +
+ ") and compile.jdk (" + System.getProperty("compile.jdk") + ")");
+ }
+ }
+
+ /**
+ * Returns the full path to an executable in jdk/bin based on System
+ * property {@code compile.jdk}
+ *
+ * @return Full path to an executable in jdk/bin
+ */
+ public static String getCompileJDKTool(String tool) {
+ try {
+ return getTool(tool, "compile.jdk");
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * Returns the full path to an executable in jdk/bin based on System
+ * property {@code test.jdk}
+ *
+ * @return Full path to an executable in jdk/bin
+ */
+ public static String getTestJDKTool(String tool) {
+ try {
+ return getTool(tool, "test.jdk");
+ } catch (FileNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private static String getTool(String tool, String property) throws FileNotFoundException {
+ String jdkPath = System.getProperty(property);
+
+ if (jdkPath == null) {
+ throw new RuntimeException(
+ "System property '" + property + "' not set. This property is normally set by jtreg. "
+ + "When running test separately, set this property using '-D" + property + "=/path/to/jdk'.");
+ }
+
+ Path toolName = Paths.get("bin", tool + (Platform.isWindows() ? ".exe" : ""));
+
+ Path jdkTool = Paths.get(jdkPath, toolName.toString());
+ if (!jdkTool.toFile().exists()) {
+ throw new FileNotFoundException("Could not find file " + jdkTool.toAbsolutePath());
+ }
+
+ return jdkTool.toAbsolutePath().toString();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/JDKToolLauncher.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,135 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import jdk.test.lib.process.ProcessTools;
+
+/**
+ * A utility for constructing command lines for starting JDK tool processes.
+ *
+ * The JDKToolLauncher can in particular be combined with a
+ * java.lang.ProcessBuilder to easily run a JDK tool. For example, the following
+ * code run {@code jmap -heap} against a process with GC logging turned on for
+ * the {@code jmap} process:
+ *
+ * <pre>
+ * {@code
+ * JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
+ * .addVMArg("-XX:+PrintGC");
+ * .addVMArg("-XX:+PrintGCDetails")
+ * .addToolArg("-heap")
+ * .addToolArg(pid);
+ * ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
+ * Process p = pb.start();
+ * }
+ * </pre>
+ */
+public class JDKToolLauncher {
+ private final String executable;
+ private final List<String> vmArgs = new ArrayList<String>();
+ private final List<String> toolArgs = new ArrayList<String>();
+
+ private JDKToolLauncher(String tool, boolean useCompilerJDK) {
+ if (useCompilerJDK) {
+ executable = JDKToolFinder.getJDKTool(tool);
+ } else {
+ executable = JDKToolFinder.getTestJDKTool(tool);
+ }
+ vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
+ }
+
+ /**
+ * Creates a new JDKToolLauncher for the specified tool. Using tools path
+ * from the compiler JDK.
+ *
+ * @param tool
+ * The name of the tool
+ * @return A new JDKToolLauncher
+ */
+ public static JDKToolLauncher create(String tool) {
+ return new JDKToolLauncher(tool, true);
+ }
+
+ /**
+ * Creates a new JDKToolLauncher for the specified tool in the Tested JDK.
+ *
+ * @param tool
+ * The name of the tool
+ *
+ * @return A new JDKToolLauncher
+ */
+ public static JDKToolLauncher createUsingTestJDK(String tool) {
+ return new JDKToolLauncher(tool, false);
+ }
+
+ /**
+ * Adds an argument to the JVM running the tool.
+ *
+ * The JVM arguments are passed to the underlying JVM running the tool.
+ * Arguments will automatically be prepended with "-J".
+ *
+ * Any platform specific arguments required for running the tool are
+ * automatically added.
+ *
+ *
+ * @param arg
+ * The argument to VM running the tool
+ * @return The JDKToolLauncher instance
+ */
+ public JDKToolLauncher addVMArg(String arg) {
+ vmArgs.add(arg);
+ return this;
+ }
+
+ /**
+ * Adds an argument to the tool.
+ *
+ * @param arg
+ * The argument to the tool
+ * @return The JDKToolLauncher instance
+ */
+ public JDKToolLauncher addToolArg(String arg) {
+ toolArgs.add(arg);
+ return this;
+ }
+
+ /**
+ * Returns the command that can be used for running the tool.
+ *
+ * @return An array whose elements are the arguments of the command.
+ */
+ public String[] getCommand() {
+ List<String> command = new ArrayList<String>();
+ command.add(executable);
+ // Add -J in front of all vmArgs
+ for (String arg : vmArgs) {
+ command.add("-J" + arg);
+ }
+ command.addAll(toolArgs);
+ return command.toArray(new String[command.size()]);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/Platform.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib;
+
+import java.util.regex.Pattern;
+
+public class Platform {
+ public static final String vmName = System.getProperty("java.vm.name");
+ public static final String vmInfo = System.getProperty("java.vm.info");
+ private static final String osName = System.getProperty("os.name");
+ private static final String dataModel = System.getProperty("sun.arch.data.model");
+ private static final String vmVersion = System.getProperty("java.vm.version");
+ private static final String jdkDebug = System.getProperty("jdk.debug");
+ private static final String osArch = System.getProperty("os.arch");
+ private static final String userName = System.getProperty("user.name");
+ private static final String compiler = System.getProperty("sun.management.compiler");
+
+ public static boolean isClient() {
+ return vmName.endsWith(" Client VM");
+ }
+
+ public static boolean isServer() {
+ return vmName.endsWith(" Server VM");
+ }
+
+ public static boolean isGraal() {
+ return vmName.endsWith(" Graal VM");
+ }
+
+ public static boolean isZero() {
+ return vmName.endsWith(" Zero VM");
+ }
+
+ public static boolean isMinimal() {
+ return vmName.endsWith(" Minimal VM");
+ }
+
+ public static boolean isEmbedded() {
+ return vmName.contains("Embedded");
+ }
+
+ public static boolean isTieredSupported() {
+ return compiler.contains("Tiered Compilers");
+ }
+
+ public static boolean isInt() {
+ return vmInfo.contains("interpreted");
+ }
+
+ public static boolean isMixed() {
+ return vmInfo.contains("mixed");
+ }
+
+ public static boolean isComp() {
+ return vmInfo.contains("compiled");
+ }
+
+ public static boolean is32bit() {
+ return dataModel.equals("32");
+ }
+
+ public static boolean is64bit() {
+ return dataModel.equals("64");
+ }
+
+ public static boolean isAix() {
+ return isOs("aix");
+ }
+
+ public static boolean isLinux() {
+ return isOs("linux");
+ }
+
+ public static boolean isOSX() {
+ return isOs("mac");
+ }
+
+ public static boolean isSolaris() {
+ return isOs("sunos");
+ }
+
+ public static boolean isWindows() {
+ return isOs("win");
+ }
+
+ private static boolean isOs(String osname) {
+ return osName.toLowerCase().startsWith(osname.toLowerCase());
+ }
+
+ public static String getOsName() {
+ return osName;
+ }
+
+ public static boolean isDebugBuild() {
+ return (jdkDebug.toLowerCase().contains("debug"));
+ }
+
+ public static String getVMVersion() {
+ return vmVersion;
+ }
+
+ // Returns true for sparc and sparcv9.
+ public static boolean isSparc() {
+ return isArch("sparc.*");
+ }
+
+ public static boolean isARM() {
+ return isArch("arm.*");
+ }
+
+ public static boolean isPPC() {
+ return isArch("ppc.*");
+ }
+
+ public static boolean isX86() {
+ // On Linux it's 'i386', Windows 'x86' without '_64' suffix.
+ return isArch("(i386)|(x86(?!_64))");
+ }
+
+ public static boolean isX64() {
+ // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64'
+ return isArch("(amd64)|(x86_64)");
+ }
+
+ public static boolean isAArch64() {
+ return isArch("aarch64");
+ }
+
+ public static String getOsArch() {
+ return osArch;
+ }
+
+ /**
+ * Return a boolean for whether we expect to be able to attach
+ * the SA to our own processes on this system.
+ */
+ public static boolean shouldSAAttach() throws Exception {
+
+ if (isAix()) {
+ return false; // SA not implemented.
+ } else if (isLinux()) {
+ return canPtraceAttachLinux();
+ } else if (isOSX()) {
+ return canAttachOSX();
+ } else {
+ // Other platforms expected to work:
+ return true;
+ }
+ }
+
+ /**
+ * On Linux, first check the SELinux boolean "deny_ptrace" and return false
+ * as we expect to be denied if that is "1". Then expect permission to attach
+ * if we are root, so return true. Then return false for an expected denial
+ * if "ptrace_scope" is 1, and true otherwise.
+ */
+ public static boolean canPtraceAttachLinux() throws Exception {
+
+ // SELinux deny_ptrace:
+ String deny_ptrace = Utils.fileAsString("/sys/fs/selinux/booleans/deny_ptrace");
+ if (deny_ptrace != null && deny_ptrace.contains("1")) {
+ // ptrace will be denied:
+ return false;
+ }
+
+ // YAMA enhanced security ptrace_scope:
+ // 0 - a process can PTRACE_ATTACH to any other process running under the same uid
+ // 1 - restricted ptrace: a process must be a children of the inferior or user is root
+ // 2 - only processes with CAP_SYS_PTRACE may use ptrace or user is root
+ // 3 - no attach: no processes may use ptrace with PTRACE_ATTACH
+ String ptrace_scope = Utils.fileAsString("/proc/sys/kernel/yama/ptrace_scope");
+ if (ptrace_scope != null) {
+ if (ptrace_scope.startsWith("3")) {
+ return false;
+ }
+ if (!userName.equals("root") && !ptrace_scope.startsWith("0")) {
+ // ptrace will be denied:
+ return false;
+ }
+ }
+ // Otherwise expect to be permitted:
+ return true;
+ }
+
+ /**
+ * On OSX, expect permission to attach only if we are root.
+ */
+ public static boolean canAttachOSX() throws Exception {
+ return userName.equals("root");
+ }
+
+ private static boolean isArch(String archnameRE) {
+ return Pattern.compile(archnameRE, Pattern.CASE_INSENSITIVE)
+ .matcher(osArch)
+ .matches();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/Utils.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,694 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Field;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.ServerSocket;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.net.UnknownHostException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Objects;
+import java.util.Random;
+import java.util.function.BooleanSupplier;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import jdk.internal.misc.Unsafe;
+
+import static jdk.test.lib.Asserts.assertTrue;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+
+/**
+ * Common library for various test helper functions.
+ */
+public final class Utils {
+
+ /**
+ * Returns the value of 'test.class.path' system property.
+ */
+ public static final String TEST_CLASS_PATH = System.getProperty("test.class.path", ".");
+
+ /**
+ * Returns the sequence used by operating system to separate lines.
+ */
+ public static final String NEW_LINE = System.getProperty("line.separator");
+
+ /**
+ * Returns the value of 'test.vm.opts' system property.
+ */
+ public static final String VM_OPTIONS = System.getProperty("test.vm.opts", "").trim();
+
+ /**
+ * Returns the value of 'test.java.opts' system property.
+ */
+ public static final String JAVA_OPTIONS = System.getProperty("test.java.opts", "").trim();
+
+ /**
+ * Returns the value of 'test.src' system property.
+ */
+ public static final String TEST_SRC = System.getProperty("test.src", "").trim();
+
+ private static Unsafe unsafe = null;
+
+ /**
+ * Defines property name for seed value.
+ */
+ public static final String SEED_PROPERTY_NAME = "jdk.test.lib.random.seed";
+
+ /* (non-javadoc)
+ * Random generator with (or without) predefined seed. Depends on
+ * "jdk.test.lib.random.seed" property value.
+ */
+ private static volatile Random RANDOM_GENERATOR;
+
+ /**
+ * Contains the seed value used for {@link java.util.Random} creation.
+ */
+ public static final long SEED = Long.getLong(SEED_PROPERTY_NAME, new Random().nextLong());
+ /**
+ * Returns the value of 'test.timeout.factor' system property
+ * converted to {@code double}.
+ */
+ public static final double TIMEOUT_FACTOR;
+ static {
+ String toFactor = System.getProperty("test.timeout.factor", "1.0");
+ TIMEOUT_FACTOR = Double.parseDouble(toFactor);
+ }
+
+ /**
+ * Returns the value of JTREG default test timeout in milliseconds
+ * converted to {@code long}.
+ */
+ public static final long DEFAULT_TEST_TIMEOUT = TimeUnit.SECONDS.toMillis(120);
+
+ private Utils() {
+ // Private constructor to prevent class instantiation
+ }
+
+ /**
+ * Returns the list of VM options.
+ *
+ * @return List of VM options
+ */
+ public static List<String> getVmOptions() {
+ return Arrays.asList(safeSplitString(VM_OPTIONS));
+ }
+
+ /**
+ * Returns the list of VM options with -J prefix.
+ *
+ * @return The list of VM options with -J prefix
+ */
+ public static List<String> getForwardVmOptions() {
+ String[] opts = safeSplitString(VM_OPTIONS);
+ for (int i = 0; i < opts.length; i++) {
+ opts[i] = "-J" + opts[i];
+ }
+ return Arrays.asList(opts);
+ }
+
+ /**
+ * Returns the default JTReg arguments for a jvm running a test.
+ * This is the combination of JTReg arguments test.vm.opts and test.java.opts.
+ * @return An array of options, or an empty array if no options.
+ */
+ public static String[] getTestJavaOpts() {
+ List<String> opts = new ArrayList<String>();
+ Collections.addAll(opts, safeSplitString(VM_OPTIONS));
+ Collections.addAll(opts, safeSplitString(JAVA_OPTIONS));
+ return opts.toArray(new String[0]);
+ }
+
+ /**
+ * Combines given arguments with default JTReg arguments for a jvm running a test.
+ * This is the combination of JTReg arguments test.vm.opts and test.java.opts
+ * @return The combination of JTReg test java options and user args.
+ */
+ public static String[] addTestJavaOpts(String... userArgs) {
+ List<String> opts = new ArrayList<String>();
+ Collections.addAll(opts, getTestJavaOpts());
+ Collections.addAll(opts, userArgs);
+ return opts.toArray(new String[0]);
+ }
+
+ /**
+ * Removes any options specifying which GC to use, for example "-XX:+UseG1GC".
+ * Removes any options matching: -XX:(+/-)Use*GC
+ * Used when a test need to set its own GC version. Then any
+ * GC specified by the framework must first be removed.
+ * @return A copy of given opts with all GC options removed.
+ */
+ private static final Pattern useGcPattern = Pattern.compile(
+ "(?:\\-XX\\:[\\+\\-]Use.+GC)"
+ + "|(?:\\-Xconcgc)");
+ public static List<String> removeGcOpts(List<String> opts) {
+ List<String> optsWithoutGC = new ArrayList<String>();
+ for (String opt : opts) {
+ if (useGcPattern.matcher(opt).matches()) {
+ System.out.println("removeGcOpts: removed " + opt);
+ } else {
+ optsWithoutGC.add(opt);
+ }
+ }
+ return optsWithoutGC;
+ }
+
+ /**
+ * Returns the default JTReg arguments for a jvm running a test without
+ * options that matches regular expressions in {@code filters}.
+ * This is the combination of JTReg arguments test.vm.opts and test.java.opts.
+ * @param filters Regular expressions used to filter out options.
+ * @return An array of options, or an empty array if no options.
+ */
+ public static String[] getFilteredTestJavaOpts(String... filters) {
+ String options[] = getTestJavaOpts();
+
+ if (filters.length == 0) {
+ return options;
+ }
+
+ List<String> filteredOptions = new ArrayList<String>(options.length);
+ Pattern patterns[] = new Pattern[filters.length];
+ for (int i = 0; i < filters.length; i++) {
+ patterns[i] = Pattern.compile(filters[i]);
+ }
+
+ for (String option : options) {
+ boolean matched = false;
+ for (int i = 0; i < patterns.length && !matched; i++) {
+ Matcher matcher = patterns[i].matcher(option);
+ matched = matcher.find();
+ }
+ if (!matched) {
+ filteredOptions.add(option);
+ }
+ }
+
+ return filteredOptions.toArray(new String[filteredOptions.size()]);
+ }
+
+ /**
+ * Splits a string by white space.
+ * Works like String.split(), but returns an empty array
+ * if the string is null or empty.
+ */
+ private static String[] safeSplitString(String s) {
+ if (s == null || s.trim().isEmpty()) {
+ return new String[] {};
+ }
+ return s.trim().split("\\s+");
+ }
+
+ /**
+ * @return The full command line for the ProcessBuilder.
+ */
+ public static String getCommandLine(ProcessBuilder pb) {
+ StringBuilder cmd = new StringBuilder();
+ for (String s : pb.command()) {
+ cmd.append(s).append(" ");
+ }
+ return cmd.toString();
+ }
+
+ /**
+ * Returns the free port on the local host.
+ * The function will spin until a valid port number is found.
+ *
+ * @return The port number
+ * @throws InterruptedException if any thread has interrupted the current thread
+ * @throws IOException if an I/O error occurs when opening the socket
+ */
+ public static int getFreePort() throws InterruptedException, IOException {
+ int port = -1;
+
+ while (port <= 0) {
+ Thread.sleep(100);
+
+ ServerSocket serverSocket = null;
+ try {
+ serverSocket = new ServerSocket(0);
+ port = serverSocket.getLocalPort();
+ } finally {
+ serverSocket.close();
+ }
+ }
+
+ return port;
+ }
+
+ /**
+ * Returns the name of the local host.
+ *
+ * @return The host name
+ * @throws UnknownHostException if IP address of a host could not be determined
+ */
+ public static String getHostname() throws UnknownHostException {
+ InetAddress inetAddress = InetAddress.getLocalHost();
+ String hostName = inetAddress.getHostName();
+
+ assertTrue((hostName != null && !hostName.isEmpty()),
+ "Cannot get hostname");
+
+ return hostName;
+ }
+
+ /**
+ * Uses "jcmd -l" to search for a jvm pid. This function will wait
+ * forever (until jtreg timeout) for the pid to be found.
+ * @param key Regular expression to search for
+ * @return The found pid.
+ */
+ public static int waitForJvmPid(String key) throws Throwable {
+ final long iterationSleepMillis = 250;
+ System.out.println("waitForJvmPid: Waiting for key '" + key + "'");
+ System.out.flush();
+ while (true) {
+ int pid = tryFindJvmPid(key);
+ if (pid >= 0) {
+ return pid;
+ }
+ Thread.sleep(iterationSleepMillis);
+ }
+ }
+
+ /**
+ * Searches for a jvm pid in the output from "jcmd -l".
+ *
+ * Example output from jcmd is:
+ * 12498 sun.tools.jcmd.JCmd -l
+ * 12254 /tmp/jdk8/tl/jdk/JTwork/classes/com/sun/tools/attach/Application.jar
+ *
+ * @param key A regular expression to search for.
+ * @return The found pid, or -1 if not found.
+ * @throws Exception If multiple matching jvms are found.
+ */
+ public static int tryFindJvmPid(String key) throws Throwable {
+ OutputAnalyzer output = null;
+ try {
+ JDKToolLauncher jcmdLauncher = JDKToolLauncher.create("jcmd");
+ jcmdLauncher.addToolArg("-l");
+ output = ProcessTools.executeProcess(jcmdLauncher.getCommand());
+ output.shouldHaveExitValue(0);
+
+ // Search for a line starting with numbers (pid), follwed by the key.
+ Pattern pattern = Pattern.compile("([0-9]+)\\s.*(" + key + ").*\\r?\\n");
+ Matcher matcher = pattern.matcher(output.getStdout());
+
+ int pid = -1;
+ if (matcher.find()) {
+ pid = Integer.parseInt(matcher.group(1));
+ System.out.println("findJvmPid.pid: " + pid);
+ if (matcher.find()) {
+ throw new Exception("Found multiple JVM pids for key: " + key);
+ }
+ }
+ return pid;
+ } catch (Throwable t) {
+ System.out.println(String.format("Utils.findJvmPid(%s) failed: %s", key, t));
+ throw t;
+ }
+ }
+
+ /**
+ * Adjusts the provided timeout value for the TIMEOUT_FACTOR
+ * @param tOut the timeout value to be adjusted
+ * @return The timeout value adjusted for the value of "test.timeout.factor"
+ * system property
+ */
+ public static long adjustTimeout(long tOut) {
+ return Math.round(tOut * Utils.TIMEOUT_FACTOR);
+ }
+
+ /**
+ * Return the contents of the named file as a single String,
+ * or null if not found.
+ * @param filename name of the file to read
+ * @return String contents of file, or null if file not found.
+ * @throws IOException
+ * if an I/O error occurs reading from the file or a malformed or
+ * unmappable byte sequence is read
+ */
+ public static String fileAsString(String filename) throws IOException {
+ Path filePath = Paths.get(filename);
+ if (!Files.exists(filePath)) return null;
+ return new String(Files.readAllBytes(filePath));
+ }
+
+ /**
+ * @return Unsafe instance.
+ */
+ public static synchronized Unsafe getUnsafe() {
+ if (unsafe == null) {
+ try {
+ Field f = Unsafe.class.getDeclaredField("theUnsafe");
+ f.setAccessible(true);
+ unsafe = (Unsafe) f.get(null);
+ } catch (NoSuchFieldException | IllegalAccessException e) {
+ throw new RuntimeException("Unable to get Unsafe instance.", e);
+ }
+ }
+ return unsafe;
+ }
+ private static final char[] hexArray = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
+
+ /**
+ * Returns hex view of byte array
+ *
+ * @param bytes byte array to process
+ * @return Space separated hexadecimal string representation of bytes
+ */
+
+ public static String toHexString(byte[] bytes) {
+ char[] hexView = new char[bytes.length * 3];
+ int i = 0;
+ for (byte b : bytes) {
+ hexView[i++] = hexArray[(b >> 4) & 0x0F];
+ hexView[i++] = hexArray[b & 0x0F];
+ hexView[i++] = ' ';
+ }
+ return new String(hexView);
+ }
+
+ /**
+ * Returns {@link java.util.Random} generator initialized with particular seed.
+ * The seed could be provided via system property {@link Utils#SEED_PROPERTY_NAME}
+ * In case no seed is provided, the method uses a random number.
+ * The used seed printed to stdout.
+ * @return {@link java.util.Random} generator with particular seed.
+ */
+ public static Random getRandomInstance() {
+ if (RANDOM_GENERATOR == null) {
+ synchronized (Utils.class) {
+ if (RANDOM_GENERATOR == null) {
+ RANDOM_GENERATOR = new Random(SEED);
+ System.out.printf("For random generator using seed: %d%n", SEED);
+ System.out.printf("To re-run test with same seed value please add \"-D%s=%d\" to command line.%n", SEED_PROPERTY_NAME, SEED);
+ }
+ }
+ }
+ return RANDOM_GENERATOR;
+ }
+
+ /**
+ * Returns random element of non empty collection
+ *
+ * @param <T> a type of collection element
+ * @param collection collection of elements
+ * @return random element of collection
+ * @throws IllegalArgumentException if collection is empty
+ */
+ public static <T> T getRandomElement(Collection<T> collection)
+ throws IllegalArgumentException {
+ if (collection.isEmpty()) {
+ throw new IllegalArgumentException("Empty collection");
+ }
+ Random random = getRandomInstance();
+ int elementIndex = 1 + random.nextInt(collection.size() - 1);
+ Iterator<T> iterator = collection.iterator();
+ while (--elementIndex != 0) {
+ iterator.next();
+ }
+ return iterator.next();
+ }
+
+ /**
+ * Returns random element of non empty array
+ *
+ * @param <T> a type of array element
+ * @param array array of elements
+ * @return random element of array
+ * @throws IllegalArgumentException if array is empty
+ */
+ public static <T> T getRandomElement(T[] array)
+ throws IllegalArgumentException {
+ if (array == null || array.length == 0) {
+ throw new IllegalArgumentException("Empty or null array");
+ }
+ Random random = getRandomInstance();
+ return array[random.nextInt(array.length)];
+ }
+
+ /**
+ * Wait for condition to be true
+ *
+ * @param condition, a condition to wait for
+ */
+ public static final void waitForCondition(BooleanSupplier condition) {
+ waitForCondition(condition, -1L, 100L);
+ }
+
+ /**
+ * Wait until timeout for condition to be true
+ *
+ * @param condition, a condition to wait for
+ * @param timeout a time in milliseconds to wait for condition to be true
+ * specifying -1 will wait forever
+ * @return condition value, to determine if wait was successful
+ */
+ public static final boolean waitForCondition(BooleanSupplier condition,
+ long timeout) {
+ return waitForCondition(condition, timeout, 100L);
+ }
+
+ /**
+ * Wait until timeout for condition to be true for specified time
+ *
+ * @param condition, a condition to wait for
+ * @param timeout a time in milliseconds to wait for condition to be true,
+ * specifying -1 will wait forever
+ * @param sleepTime a time to sleep value in milliseconds
+ * @return condition value, to determine if wait was successful
+ */
+ public static final boolean waitForCondition(BooleanSupplier condition,
+ long timeout, long sleepTime) {
+ long startTime = System.currentTimeMillis();
+ while (!(condition.getAsBoolean() || (timeout != -1L
+ && ((System.currentTimeMillis() - startTime) > timeout)))) {
+ try {
+ Thread.sleep(sleepTime);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new Error(e);
+ }
+ }
+ return condition.getAsBoolean();
+ }
+
+ /**
+ * Interface same as java.lang.Runnable but with
+ * method {@code run()} able to throw any Throwable.
+ */
+ public static interface ThrowingRunnable {
+ void run() throws Throwable;
+ }
+
+ /**
+ * Filters out an exception that may be thrown by the given
+ * test according to the given filter.
+ *
+ * @param test - method that is invoked and checked for exception.
+ * @param filter - function that checks if the thrown exception matches
+ * criteria given in the filter's implementation.
+ * @return - exception that matches the filter if it has been thrown or
+ * {@code null} otherwise.
+ * @throws Throwable - if test has thrown an exception that does not
+ * match the filter.
+ */
+ public static Throwable filterException(ThrowingRunnable test,
+ Function<Throwable, Boolean> filter) throws Throwable {
+ try {
+ test.run();
+ } catch (Throwable t) {
+ if (filter.apply(t)) {
+ return t;
+ } else {
+ throw t;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Ensures a requested class is loaded
+ * @param aClass class to load
+ */
+ public static void ensureClassIsLoaded(Class<?> aClass) {
+ if (aClass == null) {
+ throw new Error("Requested null class");
+ }
+ try {
+ Class.forName(aClass.getName(), /* initialize = */ true,
+ ClassLoader.getSystemClassLoader());
+ } catch (ClassNotFoundException e) {
+ throw new Error("Class not found", e);
+ }
+ }
+ /**
+ * @param parent a class loader to be the parent for the returned one
+ * @return an UrlClassLoader with urls made of the 'test.class.path' jtreg
+ * property and with the given parent
+ */
+ public static URLClassLoader getTestClassPathURLClassLoader(ClassLoader parent) {
+ URL[] urls = Arrays.stream(TEST_CLASS_PATH.split(File.pathSeparator))
+ .map(Paths::get)
+ .map(Path::toUri)
+ .map(x -> {
+ try {
+ return x.toURL();
+ } catch (MalformedURLException ex) {
+ throw new Error("Test issue. JTREG property"
+ + " 'test.class.path'"
+ + " is not defined correctly", ex);
+ }
+ }).toArray(URL[]::new);
+ return new URLClassLoader(urls, parent);
+ }
+
+ /**
+ * Runs runnable and checks that it throws expected exception. If exceptionException is null it means
+ * that we expect no exception to be thrown.
+ * @param runnable what we run
+ * @param expectedException expected exception
+ */
+ public static void runAndCheckException(Runnable runnable, Class<? extends Throwable> expectedException) {
+ runAndCheckException(runnable, t -> {
+ if (t == null) {
+ if (expectedException != null) {
+ throw new AssertionError("Didn't get expected exception " + expectedException.getSimpleName());
+ }
+ } else {
+ String message = "Got unexpected exception " + t.getClass().getSimpleName();
+ if (expectedException == null) {
+ throw new AssertionError(message, t);
+ } else if (!expectedException.isAssignableFrom(t.getClass())) {
+ message += " instead of " + expectedException.getSimpleName();
+ throw new AssertionError(message, t);
+ }
+ }
+ });
+ }
+
+ /**
+ * Runs runnable and makes some checks to ensure that it throws expected exception.
+ * @param runnable what we run
+ * @param checkException a consumer which checks that we got expected exception and raises a new exception otherwise
+ */
+ public static void runAndCheckException(Runnable runnable, Consumer<Throwable> checkException) {
+ try {
+ runnable.run();
+ checkException.accept(null);
+ } catch (Throwable t) {
+ checkException.accept(t);
+ }
+ }
+
+ /**
+ * Converts to VM type signature
+ *
+ * @param type Java type to convert
+ * @return string representation of VM type
+ */
+ public static String toJVMTypeSignature(Class<?> type) {
+ if (type.isPrimitive()) {
+ if (type == boolean.class) {
+ return "Z";
+ } else if (type == byte.class) {
+ return "B";
+ } else if (type == char.class) {
+ return "C";
+ } else if (type == double.class) {
+ return "D";
+ } else if (type == float.class) {
+ return "F";
+ } else if (type == int.class) {
+ return "I";
+ } else if (type == long.class) {
+ return "J";
+ } else if (type == short.class) {
+ return "S";
+ } else if (type == void.class) {
+ return "V";
+ } else {
+ throw new Error("Unsupported type: " + type);
+ }
+ }
+ String result = type.getName().replaceAll("\\.", "/");
+ if (!type.isArray()) {
+ return "L" + result + ";";
+ }
+ return result;
+ }
+
+ public static Object[] getNullValues(Class<?>... types) {
+ Object[] result = new Object[types.length];
+ int i = 0;
+ for (Class<?> type : types) {
+ result[i++] = NULL_VALUES.get(type);
+ }
+ return result;
+ }
+ private static Map<Class<?>, Object> NULL_VALUES = new HashMap<>();
+ static {
+ NULL_VALUES.put(boolean.class, false);
+ NULL_VALUES.put(byte.class, (byte) 0);
+ NULL_VALUES.put(short.class, (short) 0);
+ NULL_VALUES.put(char.class, '\0');
+ NULL_VALUES.put(int.class, 0);
+ NULL_VALUES.put(long.class, 0L);
+ NULL_VALUES.put(float.class, 0.0f);
+ NULL_VALUES.put(double.class, 0.0d);
+ }
+
+ /**
+ * Returns mandatory property value
+ * @param propName is a name of property to request
+ * @return a String with requested property value
+ */
+ public static String getMandatoryProperty(String propName) {
+ Objects.requireNonNull(propName, "Requested null property");
+ String prop = System.getProperty(propName);
+ Objects.requireNonNull(prop,
+ String.format("A mandatory property '%s' isn't set", propName));
+ return prop;
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/apps/LingeredApp.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,466 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.apps;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.file.Files;
+import java.nio.file.NoSuchFileException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.attribute.FileTime;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * This is a framework to launch an app that could be synchronized with caller
+ * to make further attach actions reliable across supported platforms
+
+ * Caller example:
+ * SmartTestApp a = SmartTestApp.startApp(cmd);
+ * // do something
+ * a.stopApp();
+ *
+ * or fine grained control
+ *
+ * a = new SmartTestApp("MyLock.lck");
+ * a.createLock();
+ * a.runApp();
+ * a.waitAppReady();
+ * // do something
+ * a.deleteLock();
+ * a.waitAppTerminate();
+ *
+ * Then you can work with app output and process object
+ *
+ * output = a.getAppOutput();
+ * process = a.getProcess();
+ *
+ */
+public class LingeredApp {
+
+ private static final long spinDelay = 1000;
+ private static final int appWaitTime = 100;
+
+ private final String lockFileName;
+ private long lockCreationTime;
+ private Process appProcess;
+ private final ArrayList<String> storedAppOutput;
+
+ /*
+ * Drain child process output, store it into string array
+ */
+ class InputGobbler extends Thread {
+
+ InputStream is;
+ List<String> astr;
+
+ InputGobbler(InputStream is, List<String> astr) {
+ this.is = is;
+ this.astr = astr;
+ }
+
+ public void run() {
+ try {
+ InputStreamReader isr = new InputStreamReader(is);
+ BufferedReader br = new BufferedReader(isr);
+ String line = null;
+ while ((line = br.readLine()) != null) {
+ astr.add(line);
+ }
+ } catch (IOException ex) {
+ // pass
+ }
+ }
+ }
+
+ /**
+ * Create LingeredApp object on caller side. Lock file have be a valid filename
+ * at writable location
+ *
+ * @param lockFileName - the name of lock file
+ */
+ public LingeredApp(String lockFileName) {
+ this.lockFileName = lockFileName;
+ this.storedAppOutput = new ArrayList<String>();
+ }
+
+ public LingeredApp() {
+ final String lockName = UUID.randomUUID().toString() + ".lck";
+ this.lockFileName = lockName;
+ this.storedAppOutput = new ArrayList<String>();
+ }
+
+ /**
+ *
+ * @return name of lock file
+ */
+ public String getLockFileName() {
+ return this.lockFileName;
+ }
+
+ /**
+ *
+ * @return name of testapp
+ */
+ public String getAppName() {
+ return this.getClass().getName();
+ }
+
+ /**
+ *
+ * @return pid of java process running testapp
+ */
+ public long getPid() {
+ if (appProcess == null) {
+ throw new RuntimeException("Process is not alive");
+ }
+ return appProcess.getPid();
+ }
+
+ /**
+ *
+ * @return process object
+ */
+ public Process getProcess() {
+ return appProcess;
+ }
+
+ /**
+ *
+ * @return application output as string array. Empty array if application produced no output
+ */
+ public List<String> getAppOutput() {
+ if (appProcess.isAlive()) {
+ throw new RuntimeException("Process is still alive. Can't get its output.");
+ }
+ return storedAppOutput;
+ }
+
+ /* Make sure all part of the app use the same method to get dates,
+ as different methods could produce different results
+ */
+ private static long epoch() {
+ return new Date().getTime();
+ }
+
+ private static long lastModified(String fileName) throws IOException {
+ Path path = Paths.get(fileName);
+ BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
+ return attr.lastModifiedTime().toMillis();
+ }
+
+ private static void setLastModified(String fileName, long newTime) throws IOException {
+ Path path = Paths.get(fileName);
+ FileTime fileTime = FileTime.fromMillis(newTime);
+ Files.setLastModifiedTime(path, fileTime);
+ }
+
+ /**
+ * create lock
+ *
+ * @throws IOException
+ */
+ public void createLock() throws IOException {
+ Path path = Paths.get(lockFileName);
+ // Files.deleteIfExists(path);
+ Files.createFile(path);
+ lockCreationTime = lastModified(lockFileName);
+ }
+
+ /**
+ * Delete lock
+ *
+ * @throws IOException
+ */
+ public void deleteLock() throws IOException {
+ try {
+ Path path = Paths.get(lockFileName);
+ Files.delete(path);
+ } catch (NoSuchFileException ex) {
+ // Lock already deleted. Ignore error
+ }
+ }
+
+ public void waitAppTerminate() {
+ while (true) {
+ try {
+ appProcess.waitFor();
+ break;
+ } catch (InterruptedException ex) {
+ // pass
+ }
+ }
+ }
+
+ /**
+ * The app touches the lock file when it's started
+ * wait while it happens. Caller have to delete lock on wait error.
+ *
+ * @param timeout
+ * @throws java.io.IOException
+ */
+ public void waitAppReady(long timeout) throws IOException {
+ long here = epoch();
+ while (true) {
+ long epoch = epoch();
+ if (epoch - here > (timeout * 1000)) {
+ throw new IOException("App waiting timeout");
+ }
+
+ // Live process should touch lock file every second
+ long lm = lastModified(lockFileName);
+ if (lm > lockCreationTime) {
+ break;
+ }
+
+ // Make sure process didn't already exit
+ if (!appProcess.isAlive()) {
+ throw new IOException("App exited unexpectedly with " + appProcess.exitValue());
+ }
+
+ try {
+ Thread.sleep(spinDelay);
+ } catch (InterruptedException ex) {
+ // pass
+ }
+ }
+ }
+
+ /**
+ * Run the app
+ *
+ * @param vmArguments
+ * @throws IOException
+ */
+ public void runApp(List<String> vmArguments)
+ throws IOException {
+
+ // We should always use testjava or throw an exception,
+ // so we can't use JDKToolFinder.getJDKTool("java");
+ // that falls back to compile java on error
+ String jdkPath = System.getProperty("test.jdk");
+ if (jdkPath == null) {
+ // we are not under jtreg, try env
+ Map<String, String> env = System.getenv();
+ jdkPath = env.get("TESTJAVA");
+ }
+
+ if (jdkPath == null) {
+ throw new RuntimeException("Can't determine jdk path neither test.jdk property no TESTJAVA env are set");
+ }
+
+ String osname = System.getProperty("os.name");
+ String javapath = jdkPath + ((osname.startsWith("window")) ? "/bin/java.exe" : "/bin/java");
+
+ List<String> cmd = new ArrayList<String>();
+ cmd.add(javapath);
+
+
+ if (vmArguments == null) {
+ // Propagate test.vm.options to LingeredApp, filter out possible empty options
+ String testVmOpts[] = System.getProperty("test.vm.opts","").split("\\s+");
+ for (String s : testVmOpts) {
+ if (!s.equals("")) {
+ cmd.add(s);
+ }
+ }
+ }
+ else{
+ // Lets user manage LingeredApp options
+ cmd.addAll(vmArguments);
+ }
+
+ // Make sure we set correct classpath to run the app
+ cmd.add("-cp");
+ String classpath = System.getProperty("test.class.path");
+ cmd.add((classpath == null) ? "." : classpath);
+
+ cmd.add(this.getAppName());
+ cmd.add(lockFileName);
+
+ // Reporting
+ StringBuilder cmdLine = new StringBuilder();
+ for (String strCmd : cmd) {
+ cmdLine.append("'").append(strCmd).append("' ");
+ }
+
+ // A bit of verbosity
+ System.out.println("Command line: [" + cmdLine.toString() + "]");
+
+ ProcessBuilder pb = new ProcessBuilder(cmd);
+ // we don't expect any error output but make sure we are not stuck on pipe
+ // pb.redirectErrorStream(false);
+ pb.redirectError(ProcessBuilder.Redirect.INHERIT);
+
+ appProcess = pb.start();
+
+ // Create pipe reader for process, and read stdin and stderr to array of strings
+ InputGobbler gb = new InputGobbler(appProcess.getInputStream(), storedAppOutput);
+ gb.start();
+ }
+
+ /**
+ * Delete lock file that signals app to terminate, then
+ * wait until app is actually terminated.
+ * @throws IOException
+ */
+ public void stopApp() throws IOException {
+ deleteLock();
+ waitAppTerminate();
+ int exitcode = appProcess.exitValue();
+ if (exitcode != 0) {
+ throw new IOException("LingeredApp terminated with non-zero exit code " + exitcode);
+ }
+ }
+
+ /**
+ * High level interface for test writers
+ */
+ /**
+ * Factory method that creates LingeredApp object with ready to use application
+ * lock name is autogenerated
+ * @param cmd - vm options, could be null to auto add testvm.options
+ * @return LingeredApp object
+ * @throws IOException
+ */
+ public static LingeredApp startApp(List<String> cmd) throws IOException {
+ LingeredApp a = new LingeredApp();
+ a.createLock();
+ try {
+ a.runApp(cmd);
+ a.waitAppReady(appWaitTime);
+ } catch (Exception ex) {
+ a.deleteLock();
+ throw ex;
+ }
+
+ return a;
+ }
+
+ /**
+ * Factory method that starts pre-created LingeredApp
+ * lock name is autogenerated
+ * @param cmd - vm options, could be null to auto add testvm.options
+ * @param theApp - app to start
+ * @return LingeredApp object
+ * @throws IOException
+ */
+
+ public static void startApp(List<String> cmd, LingeredApp theApp) throws IOException {
+ theApp.createLock();
+ try {
+ theApp.runApp(cmd);
+ theApp.waitAppReady(appWaitTime);
+ } catch (Exception ex) {
+ theApp.deleteLock();
+ throw ex;
+ }
+ }
+
+ public static LingeredApp startApp() throws IOException {
+ return startApp(null);
+ }
+
+ public static void stopApp(LingeredApp app) throws IOException {
+ if (app != null) {
+ // LingeredApp can throw an exception during the intialization,
+ // make sure we don't have cascade NPE
+ app.stopApp();
+ }
+ }
+
+ /**
+ * LastModified time might not work correctly in some cases it might
+ * cause later failures
+ */
+
+ public static boolean isLastModifiedWorking() {
+ boolean sane = true;
+ try {
+ long lm = lastModified(".");
+ if (lm == 0) {
+ System.err.println("SANITY Warning! The lastModifiedTime() doesn't work on this system, it returns 0");
+ sane = false;
+ }
+
+ long now = epoch();
+ if (lm > now) {
+ System.err.println("SANITY Warning! The Clock is wrong on this system lastModifiedTime() > getTime()");
+ sane = false;
+ }
+
+ setLastModified(".", epoch());
+ long lm1 = lastModified(".");
+ if (lm1 <= lm) {
+ System.err.println("SANITY Warning! The setLastModified doesn't work on this system");
+ sane = false;
+ }
+ }
+ catch(IOException e) {
+ System.err.println("SANITY Warning! IOException during sanity check " + e);
+ sane = false;
+ }
+
+ return sane;
+ }
+
+ /**
+ * This part is the application it self
+ */
+ public static void main(String args[]) {
+
+ if (args.length != 1) {
+ System.err.println("Lock file name is not specified");
+ System.exit(7);
+ }
+
+ String theLockFileName = args[0];
+
+ try {
+ Path path = Paths.get(theLockFileName);
+
+ while (Files.exists(path)) {
+ // Touch the lock to indicate our readiness
+ setLastModified(theLockFileName, epoch());
+ Thread.sleep(spinDelay);
+ }
+ } catch (NoSuchFileException ex) {
+ // Lock deleted while we are setting last modified time.
+ // Ignore error and lets the app exits
+ } catch (Exception ex) {
+ System.err.println("LingeredApp ERROR: " + ex);
+ // Leave exit_code = 1 to Java launcher
+ System.exit(3);
+ }
+
+ System.exit(0);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/apps/LingeredAppWithDeadlock.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2005, 2016, 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 jdk.test.lib.apps;
+
+import java.util.concurrent.Phaser;
+
+public class LingeredAppWithDeadlock extends LingeredApp {
+
+ private static final Object Lock1 = new Object();
+ private static final Object Lock2 = new Object();
+
+ private static volatile int reachCount = 0;
+
+ private static final Phaser p = new Phaser(2);
+
+ private static class ThreadOne extends Thread {
+ public void run() {
+ // wait Lock2 is locked
+ p.arriveAndAwaitAdvance();
+ synchronized (Lock1) {
+ // signal Lock1 is locked
+ p.arriveAndAwaitAdvance();
+ synchronized (Lock2) {
+ reachCount += 1;
+ }
+ }
+ }
+ }
+
+ private static class ThreadTwo extends Thread {
+ public void run() {
+ synchronized (Lock2) {
+ // signal Lock2 is locked
+ p.arriveAndAwaitAdvance();
+ // wait Lock1 is locked
+ p.arriveAndAwaitAdvance();
+ synchronized (Lock1) {
+ reachCount += 1;
+ }
+ }
+ }
+ }
+
+ public static void main(String args[]) {
+ if (args.length != 1) {
+ System.err.println("Lock file name is not specified");
+ System.exit(7);
+ }
+
+ // Run two theads that should come to deadlock
+ new ThreadOne().start();
+ new ThreadTwo().start();
+
+ if (reachCount > 0) {
+ // Not able to deadlock, exiting
+ System.exit(3);
+ }
+
+ LingeredApp.main(args);
+ }
+ }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/cli/CPUSpecificCommandLineOptionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib.cli;
+
+import jdk.test.lib.cli.predicate.CPUSpecificPredicate;
+
+/**
+ * Base class for command line options tests that
+ * requires specific CPU arch or specific CPU features.
+ */
+public abstract class CPUSpecificCommandLineOptionTest
+ extends CommandLineOptionTest {
+ /**
+ * Creates new CPU specific test instance that does not
+ * require any CPU features.
+ *
+ * @param cpuArchPattern Regular expression that should
+ * match os.arch.
+ */
+ public CPUSpecificCommandLineOptionTest(String cpuArchPattern) {
+ this(cpuArchPattern, null, null);
+ }
+
+ /**
+ * Creates new CPU specific test instance that does not
+ * require from CPU support of {@code supportedCPUFeatures} features
+ * and no support of {@code unsupportedCPUFeatures}.
+ *
+ * @param cpuArchPattern Regular expression that should
+ * match os.arch.
+ * @param supportedCPUFeatures Array with names of features that
+ * should be supported by CPU. If {@code null},
+ * then no features have to be supported.
+ * @param unsupportedCPUFeatures Array with names of features that
+ * should not be supported by CPU.
+ * If {@code null}, then CPU may support any
+ * features.
+ */
+ public CPUSpecificCommandLineOptionTest(String cpuArchPattern,
+ String supportedCPUFeatures[], String unsupportedCPUFeatures[]) {
+ super(new CPUSpecificPredicate(cpuArchPattern, supportedCPUFeatures,
+ unsupportedCPUFeatures));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/cli/CommandLineOptionTest.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,524 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib.cli;
+
+import java.util.List;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.function.BooleanSupplier;
+
+import jdk.test.lib.process.ExitCode;
+import jdk.test.lib.process.ProcessTools;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.Platform;
+import jdk.test.lib.Utils;
+
+/**
+ * Base class for command line option tests.
+ */
+public abstract class CommandLineOptionTest {
+ public static final String UNLOCK_DIAGNOSTIC_VM_OPTIONS
+ = "-XX:+UnlockDiagnosticVMOptions";
+ public static final String UNLOCK_EXPERIMENTAL_VM_OPTIONS
+ = "-XX:+UnlockExperimentalVMOptions";
+ protected static final String UNRECOGNIZED_OPTION_ERROR_FORMAT
+ = "Unrecognized VM option '[+-]?%s(=.*)?'";
+ protected static final String EXPERIMENTAL_OPTION_ERROR_FORMAT
+ = "VM option '%s' is experimental and must be enabled via "
+ + "-XX:\\+UnlockExperimentalVMOptions.";
+ protected static final String DIAGNOSTIC_OPTION_ERROR_FORMAT
+ = " VM option '%s' is diagnostic and must be enabled via "
+ + "-XX:\\+UnlockDiagnosticVMOptions.";
+ private static final String PRINT_FLAGS_FINAL_FORMAT = "%s\\s*:?=\\s*%s";
+
+ /**
+ * Verifies that JVM startup behavior matches our expectations.
+ *
+ * @param option an option that should be passed to JVM
+ * @param expectedMessages an array of patterns that should occur
+ * in JVM output. If {@code null} then
+ * JVM output could be empty.
+ * @param unexpectedMessages an array of patterns that should not
+ * occur in JVM output. If {@code null} then
+ * JVM output could be empty.
+ * @param exitErrorMessage message that will be shown if exit code is not
+ * as expected.
+ * @param wrongWarningMessage message that will be shown if warning
+ * messages are not as expected.
+ * @param exitCode expected exit code.
+ * @throws Throwable if verification fails or some other issues occur.
+ */
+ public static void verifyJVMStartup(String option,
+ String expectedMessages[], String unexpectedMessages[],
+ String exitErrorMessage, String wrongWarningMessage,
+ ExitCode exitCode) throws Throwable {
+ CommandLineOptionTest.verifyJVMStartup(expectedMessages,
+ unexpectedMessages, exitErrorMessage,
+ wrongWarningMessage, exitCode, false, option);
+ }
+
+ /**
+ * Verifies that JVM startup behavior matches our expectations.
+ *
+ * @param expectedMessages an array of patterns that should occur
+ * in JVM output. If {@code null} then
+ * JVM output could be empty.
+ * @param unexpectedMessages an array of patterns that should not
+ * occur in JVM output. If {@code null} then
+ * JVM output could be empty.
+ * @param exitErrorMessage message that will be shown if exit code is not
+ * as expected.
+ * @param wrongWarningMessage message that will be shown if warning
+ * messages are not as expected.
+ * @param exitCode expected exit code.
+ * @param addTestVMOptions if {@code true} then test VM options will be
+ * passed to VM.
+ * @param options options that should be passed to VM in addition to mode
+ * flag.
+ * @throws Throwable if verification fails or some other issues occur.
+ */
+ public static void verifyJVMStartup(String expectedMessages[],
+ String unexpectedMessages[], String exitErrorMessage,
+ String wrongWarningMessage, ExitCode exitCode,
+ boolean addTestVMOptions, String... options)
+ throws Throwable {
+ List<String> finalOptions = new ArrayList<>();
+ if (addTestVMOptions) {
+ Collections.addAll(finalOptions, ProcessTools.getVmInputArgs());
+ Collections.addAll(finalOptions, Utils.getTestJavaOpts());
+ }
+ Collections.addAll(finalOptions, options);
+ finalOptions.add("-version");
+
+ ProcessBuilder processBuilder
+ = ProcessTools.createJavaProcessBuilder(finalOptions.toArray(
+ new String[finalOptions.size()]));
+ OutputAnalyzer outputAnalyzer
+ = new OutputAnalyzer(processBuilder.start());
+
+ try {
+ outputAnalyzer.shouldHaveExitValue(exitCode.value);
+ } catch (RuntimeException e) {
+ String errorMessage = String.format(
+ "JVM process should have exit value '%d'.%n%s",
+ exitCode.value, exitErrorMessage);
+ throw new AssertionError(errorMessage, e);
+ }
+
+ verifyOutput(expectedMessages, unexpectedMessages,
+ wrongWarningMessage, outputAnalyzer);
+ }
+
+ /**
+ * Verifies that JVM startup behavior matches our expectations.
+ *
+ * @param expectedMessages an array of patterns that should occur in JVM
+ * output. If {@code null} then
+ * JVM output could be empty.
+ * @param unexpectedMessages an array of patterns that should not occur
+ * in JVM output. If {@code null} then
+ * JVM output could be empty.
+ * @param wrongWarningMessage message that will be shown if messages are
+ * not as expected.
+ * @param outputAnalyzer OutputAnalyzer instance
+ * @throws AssertionError if verification fails.
+ */
+ public static void verifyOutput(String[] expectedMessages,
+ String[] unexpectedMessages, String wrongWarningMessage,
+ OutputAnalyzer outputAnalyzer) {
+ if (expectedMessages != null) {
+ for (String expectedMessage : expectedMessages) {
+ try {
+ outputAnalyzer.shouldMatch(expectedMessage);
+ } catch (RuntimeException e) {
+ String errorMessage = String.format(
+ "Expected message not found: '%s'.%n%s",
+ expectedMessage, wrongWarningMessage);
+ throw new AssertionError(errorMessage, e);
+ }
+ }
+ }
+
+ if (unexpectedMessages != null) {
+ for (String unexpectedMessage : unexpectedMessages) {
+ try {
+ outputAnalyzer.shouldNotMatch(unexpectedMessage);
+ } catch (RuntimeException e) {
+ String errorMessage = String.format(
+ "Unexpected message found: '%s'.%n%s",
+ unexpectedMessage, wrongWarningMessage);
+ throw new AssertionError(errorMessage, e);
+ }
+ }
+ }
+ }
+
+ /**
+ * Verifies that JVM startup behavior matches our expectations when type
+ * of newly started VM is the same as the type of current.
+ *
+ * @param expectedMessages an array of patterns that should occur
+ * in JVM output. If {@code null} then
+ * JVM output could be empty.
+ * @param unexpectedMessages an array of patterns that should not
+ * occur in JVM output. If {@code null} then
+ * JVM output could be empty.
+ * @param exitErrorMessage Message that will be shown if exit value is not
+ * as expected.
+ * @param wrongWarningMessage message that will be shown if warning
+ * messages are not as expected.
+ * @param exitCode expected exit code.
+ * @param options options that should be passed to VM in addition to mode
+ * flag.
+ * @throws Throwable if verification fails or some other issues occur.
+ */
+ public static void verifySameJVMStartup(String expectedMessages[],
+ String unexpectedMessages[], String exitErrorMessage,
+ String wrongWarningMessage, ExitCode exitCode, String... options)
+ throws Throwable {
+ List<String> finalOptions = new ArrayList<>();
+ finalOptions.add(CommandLineOptionTest.getVMTypeOption());
+ Collections.addAll(finalOptions, options);
+
+ CommandLineOptionTest.verifyJVMStartup(expectedMessages,
+ unexpectedMessages, exitErrorMessage,
+ wrongWarningMessage, exitCode, false,
+ finalOptions.toArray(new String[finalOptions.size()]));
+ }
+
+ /**
+ * Verifies that value of specified JVM option is the same as
+ * expected value.
+ * This method filter out option with {@code optionName}
+ * name from test java options.
+ *
+ * @param optionName a name of tested option.
+ * @param expectedValue expected value of tested option.
+ * @param optionErrorString message will be shown if option value is not as
+ * expected.
+ * @param additionalVMOpts additional options that should be
+ * passed to JVM.
+ * @throws Throwable if verification fails or some other issues occur.
+ */
+ public static void verifyOptionValue(String optionName,
+ String expectedValue, String optionErrorString,
+ String... additionalVMOpts) throws Throwable {
+ verifyOptionValue(optionName, expectedValue, optionErrorString,
+ true, additionalVMOpts);
+ }
+
+ /**
+ * Verifies that value of specified JVM option is the same as
+ * expected value.
+ * This method filter out option with {@code optionName}
+ * name from test java options.
+ *
+ * @param optionName a name of tested option.
+ * @param expectedValue expected value of tested option.
+ * @param addTestVmOptions if {@code true}, then test VM options
+ * will be used.
+ * @param optionErrorString message will be shown if option value is not as
+ * expected.
+ * @param additionalVMOpts additional options that should be
+ * passed to JVM.
+ * @throws Throwable if verification fails or some other issues
+ * occur.
+ */
+ public static void verifyOptionValue(String optionName,
+ String expectedValue, String optionErrorString,
+ boolean addTestVmOptions, String... additionalVMOpts)
+ throws Throwable {
+ List<String> vmOpts = new ArrayList<>();
+
+ if (addTestVmOptions) {
+ Collections.addAll(vmOpts,
+ Utils.getFilteredTestJavaOpts(optionName));
+ }
+ Collections.addAll(vmOpts, additionalVMOpts);
+ Collections.addAll(vmOpts, "-XX:+PrintFlagsFinal", "-version");
+
+ ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(
+ vmOpts.toArray(new String[vmOpts.size()]));
+
+ OutputAnalyzer outputAnalyzer
+ = new OutputAnalyzer(processBuilder.start());
+
+ try {
+ outputAnalyzer.shouldHaveExitValue(0);
+ } catch (RuntimeException e) {
+ String errorMessage = String.format(
+ "JVM should start with option '%s' without errors.",
+ optionName);
+ throw new AssertionError(errorMessage, e);
+ }
+ verifyOptionValue(optionName, expectedValue, optionErrorString,
+ outputAnalyzer);
+ }
+
+ /**
+ * Verifies that value of specified JVM option is the same as
+ * expected value.
+ *
+ * @param optionName a name of tested option.
+ * @param expectedValue expected value of tested option.
+ * @param optionErrorString message will be shown if option value is not
+ * as expected.
+ * @param outputAnalyzer OutputAnalyzer instance
+ * @throws AssertionError if verification fails
+ */
+ public static void verifyOptionValue(String optionName,
+ String expectedValue, String optionErrorString,
+ OutputAnalyzer outputAnalyzer) {
+ try {
+ outputAnalyzer.shouldMatch(String.format(
+ CommandLineOptionTest.PRINT_FLAGS_FINAL_FORMAT,
+ optionName, expectedValue));
+ } catch (RuntimeException e) {
+ String errorMessage = String.format(
+ "Option '%s' is expected to have '%s' value%n%s",
+ optionName, expectedValue,
+ optionErrorString);
+ throw new AssertionError(errorMessage, e);
+ }
+ }
+
+ /**
+ * Start VM with given options and values.
+ * Generates command line option flags from
+ * {@code optionNames} and {@code optionValues}.
+ *
+ * @param optionNames names of options to pass in
+ * @param optionValues values of option
+ * @param additionalVMOpts additional options that should be
+ * passed to JVM.
+ * @return output from vm process
+ */
+ public static OutputAnalyzer startVMWithOptions(String[] optionNames,
+ String[] optionValues,
+ String... additionalVMOpts) throws Throwable {
+ List<String> vmOpts = new ArrayList<>();
+ if (optionNames == null || optionValues == null || optionNames.length != optionValues.length) {
+ throw new IllegalArgumentException("optionNames and/or optionValues");
+ }
+
+ for (int i = 0; i < optionNames.length; i++) {
+ vmOpts.add(prepareFlag(optionNames[i], optionValues[i]));
+ }
+ Collections.addAll(vmOpts, additionalVMOpts);
+ Collections.addAll(vmOpts, "-version");
+
+ ProcessBuilder processBuilder = ProcessTools.createJavaProcessBuilder(
+ vmOpts.toArray(new String[vmOpts.size()]));
+
+ return new OutputAnalyzer(processBuilder.start());
+ }
+
+ /**
+ * Verifies from the output that values of specified JVM options were the same as
+ * expected values.
+ *
+ * @param outputAnalyzer search output for expect options and values.
+ * @param optionNames names of tested options.
+ * @param expectedValues expected values of tested options.
+ * @throws Throwable if verification fails or some other issues occur.
+ */
+ public static void verifyOptionValuesFromOutput(OutputAnalyzer outputAnalyzer,
+ String[] optionNames,
+ String[] expectedValues) throws Throwable {
+ outputAnalyzer.shouldHaveExitValue(0);
+ for (int i = 0; i < optionNames.length; i++) {
+ outputAnalyzer.shouldMatch(String.format(
+ CommandLineOptionTest.PRINT_FLAGS_FINAL_FORMAT,
+ optionNames[i], expectedValues[i]));
+ }
+ }
+
+ /**
+ * Verifies that value of specified JVM options are the same as
+ * expected values.
+ * Generates command line option flags from
+ * {@code optionNames} and {@code expectedValues}.
+ *
+ * @param optionNames names of tested options.
+ * @param expectedValues expected values of tested options.
+ * @throws Throwable if verification fails or some other issues occur.
+ */
+ public static void verifyOptionValues(String[] optionNames,
+ String[] expectedValues) throws Throwable {
+ OutputAnalyzer outputAnalyzer = startVMWithOptions(optionNames, expectedValues, "-XX:+PrintFlagsFinal");
+ verifyOptionValuesFromOutput(outputAnalyzer, optionNames, expectedValues);
+ }
+
+ /**
+ * Verifies that value of specified JVM when type of newly started VM
+ * is the same as the type of current.
+ * This method filter out option with {@code optionName}
+ * name from test java options.
+ * Only mode flag will be passed to VM in addition to
+ * {@code additionalVMOpts}
+ *
+ * @param optionName name of tested option.
+ * @param expectedValue expected value of tested option.
+ * @param optionErrorString message to show if option has another value
+ * @param additionalVMOpts additional options that should be
+ * passed to JVM.
+ * @throws Throwable if verification fails or some other issues occur.
+ */
+ public static void verifyOptionValueForSameVM(String optionName,
+ String expectedValue, String optionErrorString,
+ String... additionalVMOpts) throws Throwable {
+ List<String> finalOptions = new ArrayList<>();
+ finalOptions.add(CommandLineOptionTest.getVMTypeOption());
+ Collections.addAll(finalOptions, additionalVMOpts);
+
+ CommandLineOptionTest.verifyOptionValue(optionName, expectedValue,
+ optionErrorString, false,
+ finalOptions.toArray(new String[finalOptions.size()]));
+ }
+
+ /**
+ * Prepares boolean command line flag with name {@code name} according
+ * to it's {@code value}.
+ *
+ * @param name the name of option to be prepared
+ * @param value the value of option
+ * @return prepared command line flag
+ */
+ public static String prepareBooleanFlag(String name, boolean value) {
+ return String.format("-XX:%c%s", (value ? '+' : '-'), name);
+ }
+
+ /**
+ * Prepares numeric command line flag with name {@code name} by setting
+ * it's value to {@code value}.
+ *
+ * @param name the name of option to be prepared
+ * @param value the value of option
+ * @return prepared command line flag
+ */
+ public static String prepareNumericFlag(String name, Number value) {
+ return String.format("-XX:%s=%s", name, value.toString());
+ }
+
+ /**
+ * Prepares generic command line flag with name {@code name} by setting
+ * it's value to {@code value}.
+ *
+ * @param name the name of option to be prepared
+ * @param value the value of option ("+" or "-" can be used instead of "true" or "false")
+ * @return prepared command line flag
+ */
+ public static String prepareFlag(String name, String value) {
+ if (value.equals("+") || value.equalsIgnoreCase("true")) {
+ return "-XX:+" + name;
+ } else if (value.equals("-") || value.equalsIgnoreCase("false")) {
+ return "-XX:-" + name;
+ } else {
+ return "-XX:" + name + "=" + value;
+ }
+ }
+
+ /**
+ * Returns message that should occur in VM output if option
+ * {@code optionName} if unrecognized.
+ *
+ * @param optionName the name of option for which message should be returned
+ * @return message saying that option {@code optionName} is unrecognized
+ */
+ public static String getUnrecognizedOptionErrorMessage(String optionName) {
+ return String.format(
+ CommandLineOptionTest.UNRECOGNIZED_OPTION_ERROR_FORMAT,
+ optionName);
+ }
+
+ /**
+ * Returns message that should occur in VM output if option
+ * {@code optionName} is experimental and
+ * -XX:+UnlockExperimentalVMOptions was not passed to VM.
+ *
+ * @param optionName the name of option for which message should be returned
+ * @return message saying that option {@code optionName} is experimental
+ */
+ public static String getExperimentalOptionErrorMessage(String optionName) {
+ return String.format(
+ CommandLineOptionTest.EXPERIMENTAL_OPTION_ERROR_FORMAT,
+ optionName);
+ }
+
+ /**
+ * Returns message that should occur in VM output if option
+ * {@code optionName} is diagnostic and -XX:+UnlockDiagnosticVMOptions
+ * was not passed to VM.
+ *
+ * @param optionName the name of option for which message should be returned
+ * @return message saying that option {@code optionName} is diganostic
+ */
+ public static String getDiagnosticOptionErrorMessage(String optionName) {
+ return String.format(
+ CommandLineOptionTest.DIAGNOSTIC_OPTION_ERROR_FORMAT,
+ optionName);
+ }
+
+ /**
+ * @return option required to start a new VM with the same type as current.
+ * @throws RuntimeException when VM type is unknown.
+ */
+ private static String getVMTypeOption() {
+ if (Platform.isServer()) {
+ return "-server";
+ } else if (Platform.isClient()) {
+ return "-client";
+ } else if (Platform.isMinimal()) {
+ return "-minimal";
+ } else if (Platform.isGraal()) {
+ return "-graal";
+ }
+ throw new RuntimeException("Unknown VM mode.");
+ }
+
+ private final BooleanSupplier predicate;
+
+ /**
+ * Constructs new CommandLineOptionTest that will be executed only if
+ * predicate {@code predicate} return {@code true}.
+ * @param predicate a predicate responsible for test's preconditions check.
+ */
+ public CommandLineOptionTest(BooleanSupplier predicate) {
+ this.predicate = predicate;
+ }
+
+ /**
+ * Runs command line option test.
+ */
+ public final void test() throws Throwable {
+ if (predicate.getAsBoolean()) {
+ runTestCases();
+ }
+ }
+
+ /**
+ * @throws Throwable if some issue happened during test cases execution.
+ */
+ protected abstract void runTestCases() throws Throwable;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/cli/predicate/AndPredicate.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib.cli.predicate;
+
+import java.util.function.BooleanSupplier;
+
+public class AndPredicate implements BooleanSupplier {
+ private final BooleanSupplier a;
+ private final BooleanSupplier b;
+
+ public AndPredicate(BooleanSupplier a, BooleanSupplier b) {
+ this.a = a;
+ this.b = b;
+ }
+
+ @Override
+ public boolean getAsBoolean() {
+ return a.getAsBoolean() && b.getAsBoolean();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/cli/predicate/CPUSpecificPredicate.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib.cli.predicate;
+
+import jdk.test.lib.Platform;
+import sun.hotspot.cpuinfo.CPUInfo;
+
+import java.util.function.BooleanSupplier;
+
+public class CPUSpecificPredicate implements BooleanSupplier {
+ private final String cpuArchPattern;
+ private final String supportedCPUFeatures[];
+ private final String unsupportedCPUFeatures[];
+
+ public CPUSpecificPredicate(String cpuArchPattern,
+ String supportedCPUFeatures[],
+ String unsupportedCPUFeatures[]) {
+ this.cpuArchPattern = cpuArchPattern;
+ this.supportedCPUFeatures = supportedCPUFeatures;
+ this.unsupportedCPUFeatures = unsupportedCPUFeatures;
+ }
+
+ @Override
+ public boolean getAsBoolean() {
+ if (!Platform.getOsArch().matches(cpuArchPattern)) {
+ System.out.println("CPU arch " + Platform.getOsArch() + " does not match " + cpuArchPattern);
+ return false;
+ }
+
+ if (supportedCPUFeatures != null) {
+ for (String feature : supportedCPUFeatures) {
+ if (!CPUInfo.hasFeature(feature)) {
+ System.out.println("CPU does not support " + feature
+ + " feature");
+ return false;
+ }
+ }
+ }
+
+ if (unsupportedCPUFeatures != null) {
+ for (String feature : unsupportedCPUFeatures) {
+ if (CPUInfo.hasFeature(feature)) {
+ System.out.println("CPU support " + feature + " feature");
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/cli/predicate/NotPredicate.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib.cli.predicate;
+
+import java.util.function.BooleanSupplier;
+
+public class NotPredicate implements BooleanSupplier {
+ private final BooleanSupplier s;
+
+ public NotPredicate(BooleanSupplier s) {
+ this.s = s;
+ }
+
+ @Override
+ public boolean getAsBoolean() {
+ return !s.getAsBoolean();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/cli/predicate/OrPredicate.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib.cli.predicate;
+
+import java.util.function.BooleanSupplier;
+
+public class OrPredicate implements BooleanSupplier {
+ private final BooleanSupplier a;
+ private final BooleanSupplier b;
+
+ public OrPredicate(BooleanSupplier a, BooleanSupplier b) {
+ this.a = a;
+ this.b = b;
+ }
+
+ @Override
+ public boolean getAsBoolean() {
+ return a.getAsBoolean() || b.getAsBoolean();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/dcmd/CommandExecutor.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.dcmd;
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+/**
+ * Abstract base class for Diagnostic Command executors
+ */
+public abstract class CommandExecutor {
+
+ /**
+ * Execute a diagnostic command
+ *
+ * @param cmd The diagnostic command to execute
+ * @return an {@link jdk.testlibrary.OutputAnalyzer} encapsulating the output of the command
+ * @throws CommandExecutorException if there is an exception on the "calling side" while trying to execute the
+ * Diagnostic Command. Exceptions thrown on the remote side are available as textual representations in
+ * stderr, regardless of the specific executor used.
+ */
+ public final OutputAnalyzer execute(String cmd) throws CommandExecutorException {
+ return execute(cmd, false);
+ }
+
+ /**
+ * Execute a diagnostic command
+ *
+ * @param cmd The diagnostic command to execute
+ * @param silent Do not print the command output
+ * @return an {@link jdk.testlibrary.OutputAnalyzer} encapsulating the output of the command
+ * @throws CommandExecutorException if there is an exception on the "calling side" while trying to execute the
+ * Diagnostic Command. Exceptions thrown on the remote side are available as textual representations in
+ * stderr, regardless of the specific executor used.
+ */
+ public final OutputAnalyzer execute(String cmd, boolean silent) throws CommandExecutorException {
+ if (!silent) {
+ System.out.printf("Running DCMD '%s' through '%s'%n", cmd, this.getClass().getSimpleName());
+ }
+
+ OutputAnalyzer oa = executeImpl(cmd);
+
+ if (!silent) {
+ System.out.println("---------------- stdout ----------------");
+ System.out.println(oa.getStdout());
+ System.out.println("---------------- stderr ----------------");
+ System.out.println(oa.getStderr());
+ System.out.println("----------------------------------------");
+ System.out.println();
+ }
+ return oa;
+ }
+
+ protected abstract OutputAnalyzer executeImpl(String cmd) throws CommandExecutorException;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/dcmd/CommandExecutorException.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.dcmd;
+
+/**
+ * CommandExecutorException encapsulates exceptions thrown (on the "calling side") from the execution of Diagnostic
+ * Commands
+ */
+public class CommandExecutorException extends RuntimeException {
+ private static final long serialVersionUID = -7039597746579144280L;
+
+ public CommandExecutorException(String message, Throwable e) {
+ super(message, e);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/dcmd/FileJcmdExecutor.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.dcmd;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Executes Diagnostic Commands on the target VM (specified by pid) using the jcmd tool and its ability to read
+ * Diagnostic Commands from a file.
+ */
+public class FileJcmdExecutor extends PidJcmdExecutor {
+
+ /**
+ * Instantiates a new FileJcmdExecutor targeting the current VM
+ */
+ public FileJcmdExecutor() {
+ super();
+ }
+
+ /**
+ * Instantiates a new FileJcmdExecutor targeting the VM indicated by the given pid
+ *
+ * @param target Pid of the target VM
+ */
+ public FileJcmdExecutor(String target) {
+ super(target);
+ }
+
+ protected List<String> createCommandLine(String cmd) throws CommandExecutorException {
+ File cmdFile = createTempFile();
+ writeCommandToTemporaryFile(cmd, cmdFile);
+
+ return Arrays.asList(jcmdBinary, Long.toString(pid),
+ "-f", cmdFile.getAbsolutePath());
+ }
+
+ private void writeCommandToTemporaryFile(String cmd, File cmdFile) {
+ try (PrintWriter pw = new PrintWriter(cmdFile)) {
+ pw.println(cmd);
+ } catch (IOException e) {
+ String message = "Could not write to file: " + cmdFile.getAbsolutePath();
+ throw new CommandExecutorException(message, e);
+ }
+ }
+
+ private File createTempFile() {
+ try {
+ File cmdFile = File.createTempFile("input", "jcmd");
+ cmdFile.deleteOnExit();
+ return cmdFile;
+ } catch (IOException e) {
+ throw new CommandExecutorException("Could not create temporary file", e);
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/dcmd/JMXExecutor.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.dcmd;
+
+import jdk.test.lib.process.OutputAnalyzer;
+
+import javax.management.*;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import java.lang.management.ManagementFactory;
+
+import java.util.HashMap;
+
+/**
+ * Executes Diagnostic Commands on the target VM (specified by a host/port combination or a full JMX Service URL) using
+ * the JMX interface. If the target is not the current VM, the JMX Remote interface must be enabled beforehand.
+ */
+public class JMXExecutor extends CommandExecutor {
+
+ private final MBeanServerConnection mbs;
+
+ /**
+ * Instantiates a new JMXExecutor targeting the current VM
+ */
+ public JMXExecutor() {
+ super();
+ mbs = ManagementFactory.getPlatformMBeanServer();
+ }
+
+ /**
+ * Instantiates a new JMXExecutor targeting the VM indicated by the given host/port combination or a full JMX
+ * Service URL
+ *
+ * @param target a host/port combination on the format "host:port" or a full JMX Service URL of the target VM
+ */
+ public JMXExecutor(String target) {
+ String urlStr;
+
+ if (target.matches("^\\w[\\w\\-]*(\\.[\\w\\-]+)*:\\d+$")) {
+ /* Matches "hostname:port" */
+ urlStr = String.format("service:jmx:rmi:///jndi/rmi://%s/jmxrmi", target);
+ } else if (target.startsWith("service:")) {
+ urlStr = target;
+ } else {
+ throw new IllegalArgumentException("Could not recognize target string: " + target);
+ }
+
+ try {
+ JMXServiceURL url = new JMXServiceURL(urlStr);
+ JMXConnector c = JMXConnectorFactory.connect(url, new HashMap<>());
+ mbs = c.getMBeanServerConnection();
+ } catch (IOException e) {
+ throw new CommandExecutorException("Could not initiate connection to target: " + target, e);
+ }
+ }
+
+ protected OutputAnalyzer executeImpl(String cmd) throws CommandExecutorException {
+ String stdout = "";
+ String stderr = "";
+
+ String[] cmdParts = cmd.split(" ", 2);
+ String operation = commandToMethodName(cmdParts[0]);
+ Object[] dcmdArgs = produceArguments(cmdParts);
+ String[] signature = {String[].class.getName()};
+
+ ObjectName beanName = getMBeanName();
+
+ try {
+ stdout = (String) mbs.invoke(beanName, operation, dcmdArgs, signature);
+ }
+
+ /* Failures on the "local" side, the one invoking the command. */
+ catch (ReflectionException e) {
+ Throwable cause = e.getCause();
+ if (cause instanceof NoSuchMethodException) {
+ /* We want JMXExecutor to match the behavior of the other CommandExecutors */
+ String message = "Unknown diagnostic command: " + operation;
+ stderr = exceptionTraceAsString(new IllegalArgumentException(message, e));
+ } else {
+ rethrowExecutorException(operation, dcmdArgs, e);
+ }
+ }
+
+ /* Failures on the "local" side, the one invoking the command. */
+ catch (InstanceNotFoundException | IOException e) {
+ rethrowExecutorException(operation, dcmdArgs, e);
+ }
+
+ /* Failures on the remote side, the one executing the invoked command. */
+ catch (MBeanException e) {
+ stdout = exceptionTraceAsString(e);
+ }
+
+ return new OutputAnalyzer(stdout, stderr);
+ }
+
+ private void rethrowExecutorException(String operation, Object[] dcmdArgs,
+ Exception e) throws CommandExecutorException {
+ String message = String.format("Could not invoke: %s %s", operation,
+ String.join(" ", (String[]) dcmdArgs[0]));
+ throw new CommandExecutorException(message, e);
+ }
+
+ private ObjectName getMBeanName() throws CommandExecutorException {
+ String MBeanName = "com.sun.management:type=DiagnosticCommand";
+
+ try {
+ return new ObjectName(MBeanName);
+ } catch (MalformedObjectNameException e) {
+ String message = "MBean not found: " + MBeanName;
+ throw new CommandExecutorException(message, e);
+ }
+ }
+
+ private Object[] produceArguments(String[] cmdParts) {
+ Object[] dcmdArgs = {new String[0]}; /* Default: No arguments */
+
+ if (cmdParts.length == 2) {
+ dcmdArgs[0] = cmdParts[1].split(" ");
+ }
+ return dcmdArgs;
+ }
+
+ /**
+ * Convert from diagnostic command to MBean method name
+ *
+ * Examples:
+ * help --> help
+ * VM.version --> vmVersion
+ * VM.command_line --> vmCommandLine
+ */
+ private static String commandToMethodName(String cmd) {
+ String operation = "";
+ boolean up = false; /* First letter is to be lower case */
+
+ /*
+ * If a '.' or '_' is encountered it is not copied,
+ * instead the next character will be converted to upper case
+ */
+ for (char c : cmd.toCharArray()) {
+ if (('.' == c) || ('_' == c)) {
+ up = true;
+ } else if (up) {
+ operation = operation.concat(Character.toString(c).toUpperCase());
+ up = false;
+ } else {
+ operation = operation.concat(Character.toString(c).toLowerCase());
+ }
+ }
+
+ return operation;
+ }
+
+ private static String exceptionTraceAsString(Throwable cause) {
+ StringWriter sw = new StringWriter();
+ cause.printStackTrace(new PrintWriter(sw));
+ return sw.toString();
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/dcmd/JcmdExecutor.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.dcmd;
+
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.process.OutputAnalyzer;
+import jdk.test.lib.process.ProcessTools;
+
+import java.util.List;
+
+/**
+ * Base class for Diagnostic Command Executors using the jcmd tool
+ */
+public abstract class JcmdExecutor extends CommandExecutor {
+ protected String jcmdBinary;
+
+ protected abstract List<String> createCommandLine(String cmd) throws CommandExecutorException;
+
+ protected JcmdExecutor() {
+ jcmdBinary = JDKToolFinder.getJDKTool("jcmd");
+ }
+
+ protected OutputAnalyzer executeImpl(String cmd) throws CommandExecutorException {
+ List<String> commandLine = createCommandLine(cmd);
+
+ try {
+ System.out.printf("Executing command '%s'%n", commandLine);
+ OutputAnalyzer output = ProcessTools.executeProcess(new ProcessBuilder(commandLine));
+ System.out.printf("Command returned with exit code %d%n", output.getExitValue());
+
+ return output;
+ } catch (Exception e) {
+ String message = String.format("Caught exception while executing '%s'", commandLine);
+ throw new CommandExecutorException(message, e);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/dcmd/MainClassJcmdExecutor.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.dcmd;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Executes Diagnostic Commands on the target VM (specified by main class) using the jcmd tool
+ */
+public class MainClassJcmdExecutor extends JcmdExecutor {
+ private final String mainClass;
+
+ /**
+ * Instantiates a new MainClassJcmdExecutor targeting the current VM
+ */
+ public MainClassJcmdExecutor() {
+ super();
+ mainClass = System.getProperty("sun.java.command").split(" ")[0];
+ }
+
+ /**
+ * Instantiates a new MainClassJcmdExecutor targeting the VM indicated by the given main class
+ *
+ * @param target Main class of the target VM
+ */
+ public MainClassJcmdExecutor(String target) {
+ super();
+ mainClass = target;
+ }
+
+ protected List<String> createCommandLine(String cmd) throws CommandExecutorException {
+ return Arrays.asList(jcmdBinary, mainClass, cmd);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/dcmd/PidJcmdExecutor.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.dcmd;
+
+import jdk.test.lib.process.ProcessTools;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Executes Diagnostic Commands on the target VM (specified by pid) using the jcmd tool
+ */
+public class PidJcmdExecutor extends JcmdExecutor {
+ protected final long pid;
+
+ /**
+ * Instantiates a new PidJcmdExecutor targeting the current VM
+ */
+ public PidJcmdExecutor() {
+ super();
+ try {
+ pid = ProcessTools.getProcessId();
+ } catch (Exception e) {
+ throw new CommandExecutorException("Could not determine own pid", e);
+ }
+ }
+
+ /**
+ * Instantiates a new PidJcmdExecutor targeting the VM indicated by the given pid
+ *
+ * @param target Pid of the target VM
+ */
+ public PidJcmdExecutor(String target) {
+ super();
+ pid = Long.valueOf(target);
+ }
+
+ protected List<String> createCommandLine(String cmd) throws CommandExecutorException {
+ return Arrays.asList(jcmdBinary, Long.toString(pid), cmd);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/HprofParser.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.hprof;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
+
+import jdk.test.lib.hprof.model.Snapshot;
+import jdk.test.lib.hprof.parser.Reader;
+
+/**
+ * Helper class to parse a java heap dump file.
+ */
+public class HprofParser {
+
+ public static void main(String[] args) throws Exception {
+ if (args.length < 1) {
+ System.out.println("No arguments supplied");
+ }
+ File dump = new File(args[0]);
+ if (!dump.exists() || !dump.isFile()) {
+ throw new RuntimeException("The dump file does not exist or not a file");
+ }
+ parse(dump);
+ }
+
+ /**
+ * @see #parse(File, boolean, boolean, boolean)
+ */
+ public static File parse(File dump) throws Exception {
+ return parse(dump, false, true, true);
+ }
+
+ /**
+ * @see #parse(File, boolean, boolean, boolean)
+ */
+ public static File parseWithDebugInfo(File dump) throws Exception {
+ return parse(dump, true, true, true);
+ }
+
+ /**
+ * Parse a java heap dump file
+ *
+ * @param dump Heap dump file to parse
+ * @param debug Turn on/off debug file parsing
+ * @param callStack Turn on/off tracking of object allocation call stack
+ * @param calculateRefs Turn on/off tracking object allocation call stack
+ * @throws Exception
+ * @return File containing output from the parser
+ */
+ public static File parse(File dump, boolean debug, boolean callStack, boolean calculateRefs) throws Exception {
+ File out = new File("hprof." + System.currentTimeMillis() + ".out");
+ if (out.exists()) {
+ out.delete();
+ }
+
+ PrintStream psSystemOut = System.out;
+ try (PrintStream psHprof = new PrintStream(new BufferedOutputStream(new FileOutputStream(out.getAbsolutePath())))) {
+ System.setOut(psHprof);
+
+ int debugLevel = debug ? 2 : 0;
+ try (Snapshot snapshot = Reader.readFile(dump.getAbsolutePath(), callStack, debugLevel)) {
+ System.out.println("Snapshot read, resolving...");
+ snapshot.resolve(calculateRefs);
+ System.out.println("Snapshot resolved.");
+ }
+ } finally {
+ System.setOut(psSystemOut);
+ }
+
+ return out;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/README Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,13 @@
+The jhat tool has been removed. jhat hprof file parser/validator
+are needed for tests. The old packages for jhat were moved here:
+com.sun.tools.hat.internal.model -> jdk.test.lib.hprof.model
+com.sun.tools.hat.internal.parser -> jdk.test.lib.hprof.parser
+com.sun.tools.hat.internal.util -> jdk.test.lib.hprof.util
+
+jhat was added in JDK 6 and its original implementation was from
+java.net HAT project [1]. jhat is an experimental, unsupported tool.
+There hasn't been much update to jhat tool in the JDK. In addition,
+there are several better heap dump visualizer/analyzer emerged since
+JDK 5/6 serviceability support.
+
+[1] https://java.net/projects/hat
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/AbstractJavaHeapObjectVisitor.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * A visitor for a JavaThing. @see JavaObject#visitReferencedObjects()
+ *
+ */
+
+
+abstract public class AbstractJavaHeapObjectVisitor
+ implements JavaHeapObjectVisitor {
+ abstract public void visit(JavaHeapObject other);
+
+ /**
+ * Should the given field be excluded from the set of things visited?
+ * @return true if it should.
+ */
+ public boolean exclude(JavaClass clazz, JavaField f) {
+ return false;
+ }
+
+ /**
+ * @return true iff exclude might ever return true
+ */
+ public boolean mightExclude() {
+ return false;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/ArrayTypeCodes.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Primitive array type codes as defined by VM specification.
+ *
+ */
+public interface ArrayTypeCodes {
+ // Typecodes for array elements.
+ // Refer to newarray instruction in VM Spec.
+ public static final int T_BOOLEAN = 4;
+ public static final int T_CHAR = 5;
+ public static final int T_FLOAT = 6;
+ public static final int T_DOUBLE = 7;
+ public static final int T_BYTE = 8;
+ public static final int T_SHORT = 9;
+ public static final int T_INT = 10;
+ public static final int T_LONG = 11;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/HackJavaValue.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * This is used to represent values that the program doesn't really understand.
+ * This includes the null vlaue, and unresolved references (which shouldn't
+ * happen in well-formed hprof files).
+ *
+ *
+ * @author Bill Foote
+ */
+
+
+
+
+public class HackJavaValue extends JavaValue {
+
+ private String value;
+ private int size;
+
+ public HackJavaValue(String value, int size) {
+ this.value = value;
+ this.size = size;
+ }
+
+ public String toString() {
+ return value;
+ }
+
+ public int getSize() {
+ return size;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaBoolean.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Represents a boolean (i.e. a boolean field in an instance).
+ *
+ * @author Bill Foote
+ */
+
+
+public class JavaBoolean extends JavaValue {
+
+ boolean value;
+
+ public JavaBoolean(boolean value) {
+ this.value = value;
+ }
+
+ public String toString() {
+ return "" + value;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaByte.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Represents an byte (i.e. a byte field in an instance).
+ *
+ * @author Bill Foote
+ */
+
+
+public class JavaByte extends JavaValue {
+
+ byte value;
+
+ public JavaByte(byte value) {
+ this.value = value;
+ }
+
+ public String toString() {
+ return "0x" + Integer.toString(((int) value) & 0xff, 16);
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaChar.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Represents a char (i.e. a char field in an instance).
+ *
+ * @author Bill Foote
+ */
+
+
+public class JavaChar extends JavaValue {
+
+ char value;
+
+ public JavaChar(char value) {
+ this.value = value;
+ }
+
+ public String toString() {
+ return "" + value;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaClass.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,503 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import java.util.Vector;
+import java.util.Enumeration;
+import jdk.test.lib.hprof.util.CompositeEnumeration;
+import jdk.test.lib.hprof.parser.ReadBuffer;
+
+/**
+ *
+ * @author Bill Foote
+ */
+
+
+public class JavaClass extends JavaHeapObject {
+ // my id
+ private long id;
+ // my name
+ private String name;
+
+ // These are JavaObjectRef before resolve
+ private JavaThing superclass;
+ private JavaThing loader;
+ private JavaThing signers;
+ private JavaThing protectionDomain;
+
+ // non-static fields
+ private JavaField[] fields;
+ // static fields
+ private JavaStatic[] statics;
+
+ private static final JavaClass[] EMPTY_CLASS_ARRAY = new JavaClass[0];
+ // my subclasses
+ private JavaClass[] subclasses = EMPTY_CLASS_ARRAY;
+
+ // my instances
+ private Vector<JavaHeapObject> instances = new Vector<JavaHeapObject>();
+
+ // Who I belong to. Set on resolve.
+ private Snapshot mySnapshot;
+
+ // Size of an instance, including VM overhead
+ private int instanceSize;
+ // Total number of fields including inherited ones
+ private int totalNumFields;
+
+
+ public JavaClass(long id, String name, long superclassId, long loaderId,
+ long signersId, long protDomainId,
+ JavaField[] fields, JavaStatic[] statics,
+ int instanceSize) {
+ this.id = id;
+ this.name = name;
+ this.superclass = new JavaObjectRef(superclassId);
+ this.loader = new JavaObjectRef(loaderId);
+ this.signers = new JavaObjectRef(signersId);
+ this.protectionDomain = new JavaObjectRef(protDomainId);
+ this.fields = fields;
+ this.statics = statics;
+ this.instanceSize = instanceSize;
+ }
+
+ public JavaClass(String name, long superclassId, long loaderId,
+ long signersId, long protDomainId,
+ JavaField[] fields, JavaStatic[] statics,
+ int instanceSize) {
+ this(-1L, name, superclassId, loaderId, signersId,
+ protDomainId, fields, statics, instanceSize);
+ }
+
+ public final JavaClass getClazz() {
+ return mySnapshot.getJavaLangClass();
+ }
+
+ public final int getIdentifierSize() {
+ return mySnapshot.getIdentifierSize();
+ }
+
+ public final int getMinimumObjectSize() {
+ return mySnapshot.getMinimumObjectSize();
+ }
+
+ public void resolve(Snapshot snapshot) {
+ if (mySnapshot != null) {
+ return;
+ }
+ mySnapshot = snapshot;
+ resolveSuperclass(snapshot);
+ if (superclass != null) {
+ ((JavaClass) superclass).addSubclass(this);
+ }
+
+ loader = loader.dereference(snapshot, null);
+ signers = signers.dereference(snapshot, null);
+ protectionDomain = protectionDomain.dereference(snapshot, null);
+
+ for (int i = 0; i < statics.length; i++) {
+ statics[i].resolve(this, snapshot);
+ }
+ snapshot.getJavaLangClass().addInstance(this);
+ super.resolve(snapshot);
+ return;
+ }
+
+ /**
+ * Resolve our superclass. This might be called well before
+ * all instances are available (like when reading deferred
+ * instances in a 1.2 dump file :-) Calling this is sufficient
+ * to be able to explore this class' fields.
+ */
+ public void resolveSuperclass(Snapshot snapshot) {
+ if (superclass == null) {
+ // We must be java.lang.Object, so we have no superclass.
+ } else {
+ totalNumFields = fields.length;
+ superclass = superclass.dereference(snapshot, null);
+ if (superclass == snapshot.getNullThing()) {
+ superclass = null;
+ } else {
+ try {
+ JavaClass sc = (JavaClass) superclass;
+ sc.resolveSuperclass(snapshot);
+ totalNumFields += sc.totalNumFields;
+ } catch (ClassCastException ex) {
+ System.out.println("Warning! Superclass of " + name + " is " + superclass);
+ superclass = null;
+ }
+ }
+ }
+ }
+
+ public boolean isString() {
+ return mySnapshot.getJavaLangString() == this;
+ }
+
+ public boolean isClassLoader() {
+ return mySnapshot.getJavaLangClassLoader().isAssignableFrom(this);
+ }
+
+ /**
+ * Get a numbered field from this class
+ */
+ public JavaField getField(int i) {
+ if (i < 0 || i >= fields.length) {
+ throw new Error("No field " + i + " for " + name);
+ }
+ return fields[i];
+ }
+
+ /**
+ * Get the total number of fields that are part of an instance of
+ * this class. That is, include superclasses.
+ */
+ public int getNumFieldsForInstance() {
+ return totalNumFields;
+ }
+
+ /**
+ * Get a numbered field from all the fields that are part of instance
+ * of this class. That is, include superclasses.
+ */
+ public JavaField getFieldForInstance(int i) {
+ if (superclass != null) {
+ JavaClass sc = (JavaClass) superclass;
+ if (i < sc.totalNumFields) {
+ return sc.getFieldForInstance(i);
+ }
+ i -= sc.totalNumFields;
+ }
+ return getField(i);
+ }
+
+ /**
+ * Get the class responsible for field i, where i is a field number that
+ * could be passed into getFieldForInstance.
+ *
+ * @see JavaClass.getFieldForInstance()
+ */
+ public JavaClass getClassForField(int i) {
+ if (superclass != null) {
+ JavaClass sc = (JavaClass) superclass;
+ if (i < sc.totalNumFields) {
+ return sc.getClassForField(i);
+ }
+ }
+ return this;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public boolean isArray() {
+ return name.indexOf('[') != -1;
+ }
+
+ public Enumeration<JavaHeapObject> getInstances(boolean includeSubclasses) {
+ if (includeSubclasses) {
+ Enumeration<JavaHeapObject> res = instances.elements();
+ for (int i = 0; i < subclasses.length; i++) {
+ res = new CompositeEnumeration(res,
+ subclasses[i].getInstances(true));
+ }
+ return res;
+ } else {
+ return instances.elements();
+ }
+ }
+
+ /**
+ * @return a count of the instances of this class
+ */
+ public int getInstancesCount(boolean includeSubclasses) {
+ int result = instances.size();
+ if (includeSubclasses) {
+ for (int i = 0; i < subclasses.length; i++) {
+ result += subclasses[i].getInstancesCount(includeSubclasses);
+ }
+ }
+ return result;
+ }
+
+ public JavaClass[] getSubclasses() {
+ return subclasses;
+ }
+
+ /**
+ * This can only safely be called after resolve()
+ */
+ public JavaClass getSuperclass() {
+ return (JavaClass) superclass;
+ }
+
+ /**
+ * This can only safely be called after resolve()
+ */
+ public JavaThing getLoader() {
+ return loader;
+ }
+
+ /**
+ * This can only safely be called after resolve()
+ */
+ public boolean isBootstrap() {
+ return loader == mySnapshot.getNullThing();
+ }
+
+ /**
+ * This can only safely be called after resolve()
+ */
+ public JavaThing getSigners() {
+ return signers;
+ }
+
+ /**
+ * This can only safely be called after resolve()
+ */
+ public JavaThing getProtectionDomain() {
+ return protectionDomain;
+ }
+
+ public JavaField[] getFields() {
+ return fields;
+ }
+
+ /**
+ * Includes superclass fields
+ */
+ public JavaField[] getFieldsForInstance() {
+ Vector<JavaField> v = new Vector<JavaField>();
+ addFields(v);
+ JavaField[] result = new JavaField[v.size()];
+ for (int i = 0; i < v.size(); i++) {
+ result[i] = v.elementAt(i);
+ }
+ return result;
+ }
+
+
+ public JavaStatic[] getStatics() {
+ return statics;
+ }
+
+ // returns value of static field of given name
+ public JavaThing getStaticField(String name) {
+ for (int i = 0; i < statics.length; i++) {
+ JavaStatic s = statics[i];
+ if (s.getField().getName().equals(name)) {
+ return s.getValue();
+ }
+ }
+ return null;
+ }
+
+ public String toString() {
+ return "class " + name;
+ }
+
+ public int compareTo(JavaThing other) {
+ if (other instanceof JavaClass) {
+ return name.compareTo(((JavaClass) other).name);
+ }
+ return super.compareTo(other);
+ }
+
+
+ /**
+ * @return true iff a variable of type this is assignable from an instance
+ * of other
+ */
+ public boolean isAssignableFrom(JavaClass other) {
+ if (this == other) {
+ return true;
+ } else if (other == null) {
+ return false;
+ } else {
+ return isAssignableFrom((JavaClass) other.superclass);
+ // Trivial tail recursion: I have faith in javac.
+ }
+ }
+
+ /**
+ * Describe the reference that this thing has to target. This will only
+ * be called if target is in the array returned by getChildrenForRootset.
+ */
+ public String describeReferenceTo(JavaThing target, Snapshot ss) {
+ for (int i = 0; i < statics.length; i++) {
+ JavaField f = statics[i].getField();
+ if (f.hasId()) {
+ JavaThing other = statics[i].getValue();
+ if (other == target) {
+ return "static field " + f.getName();
+ }
+ }
+ }
+ return super.describeReferenceTo(target, ss);
+ }
+
+ /**
+ * @return the size of an instance of this class. Gives 0 for an array
+ * type.
+ */
+ public int getInstanceSize() {
+ return instanceSize + mySnapshot.getMinimumObjectSize();
+ }
+
+
+ /**
+ * @return The size of all instances of this class. Correctly handles
+ * arrays.
+ */
+ public long getTotalInstanceSize() {
+ int count = instances.size();
+ if (count == 0 || !isArray()) {
+ return count * instanceSize;
+ }
+
+ // array class and non-zero count, we have to
+ // get the size of each instance and sum it
+ long result = 0;
+ for (int i = 0; i < count; i++) {
+ JavaThing t = (JavaThing) instances.elementAt(i);
+ result += t.getSize();
+ }
+ return result;
+ }
+
+ /**
+ * @return the size of this object
+ */
+ public int getSize() {
+ JavaClass cl = mySnapshot.getJavaLangClass();
+ if (cl == null) {
+ return 0;
+ } else {
+ return cl.getInstanceSize();
+ }
+ }
+
+ public void visitReferencedObjects(JavaHeapObjectVisitor v) {
+ super.visitReferencedObjects(v);
+ JavaHeapObject sc = getSuperclass();
+ if (sc != null) v.visit(getSuperclass());
+
+ JavaThing other;
+ other = getLoader();
+ if (other instanceof JavaHeapObject) {
+ v.visit((JavaHeapObject)other);
+ }
+ other = getSigners();
+ if (other instanceof JavaHeapObject) {
+ v.visit((JavaHeapObject)other);
+ }
+ other = getProtectionDomain();
+ if (other instanceof JavaHeapObject) {
+ v.visit((JavaHeapObject)other);
+ }
+
+ for (int i = 0; i < statics.length; i++) {
+ JavaField f = statics[i].getField();
+ if (!v.exclude(this, f) && f.hasId()) {
+ other = statics[i].getValue();
+ if (other instanceof JavaHeapObject) {
+ v.visit((JavaHeapObject) other);
+ }
+ }
+ }
+ }
+
+ // package-privates below this point
+ final ReadBuffer getReadBuffer() {
+ return mySnapshot.getReadBuffer();
+ }
+
+ final void setNew(JavaHeapObject obj, boolean flag) {
+ mySnapshot.setNew(obj, flag);
+ }
+
+ final boolean isNew(JavaHeapObject obj) {
+ return mySnapshot.isNew(obj);
+ }
+
+ final StackTrace getSiteTrace(JavaHeapObject obj) {
+ return mySnapshot.getSiteTrace(obj);
+ }
+
+ final void addReferenceFromRoot(Root root, JavaHeapObject obj) {
+ mySnapshot.addReferenceFromRoot(root, obj);
+ }
+
+ final Root getRoot(JavaHeapObject obj) {
+ return mySnapshot.getRoot(obj);
+ }
+
+ final Snapshot getSnapshot() {
+ return mySnapshot;
+ }
+
+ void addInstance(JavaHeapObject inst) {
+ instances.addElement(inst);
+ }
+
+ // Internals only below this point
+ private void addFields(Vector<JavaField> v) {
+ if (superclass != null) {
+ ((JavaClass) superclass).addFields(v);
+ }
+ for (int i = 0; i < fields.length; i++) {
+ v.addElement(fields[i]);
+ }
+ }
+
+ private void addSubclassInstances(Vector<JavaHeapObject> v) {
+ for (int i = 0; i < subclasses.length; i++) {
+ subclasses[i].addSubclassInstances(v);
+ }
+ for (int i = 0; i < instances.size(); i++) {
+ v.addElement(instances.elementAt(i));
+ }
+ }
+
+ private void addSubclass(JavaClass sub) {
+ JavaClass newValue[] = new JavaClass[subclasses.length + 1];
+ System.arraycopy(subclasses, 0, newValue, 0, subclasses.length);
+ newValue[subclasses.length] = sub;
+ subclasses = newValue;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaDouble.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Represents a double (i.e. a double field in an instance).
+ *
+ * @author Bill Foote
+ */
+
+
+public class JavaDouble extends JavaValue {
+
+ double value;
+
+ public JavaDouble(double value) {
+ this.value = value;
+ }
+
+ public String toString() {
+ return Double.toString(value);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaField.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+
+/**
+ *
+ * @author Bill Foote
+ */
+
+public class JavaField {
+
+ private String name;
+ private String signature;
+
+ public JavaField(String name, String signature) {
+ this.name = name;
+ this.signature = signature;
+ }
+
+
+ /**
+ * @return true if the type of this field is something that has an ID.
+ * int fields, for exampe, don't.
+ */
+ public boolean hasId() {
+ char ch = signature.charAt(0);
+ return (ch == '[' || ch == 'L');
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public String getSignature() {
+ return signature;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaFloat.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Represents a float (i.e. a float field in an instance).
+ *
+ * @author Bill Foote
+ */
+
+
+public class JavaFloat extends JavaValue {
+
+ float value;
+
+ public JavaFloat(float value) {
+ this.value = value;
+ }
+
+ public String toString() {
+ return Float.toString(value);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaHeapObject.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import jdk.test.lib.hprof.util.Misc;
+
+
+/**
+ *
+ * @author Bill Foote
+ */
+
+/**
+ * Represents an object that's allocated out of the Java heap. It occupies
+ * memory in the VM, and is the sort of thing that in a JDK 1.1 VM had
+ * a handle. It can be a
+ * JavaClass, a JavaObjectArray, a JavaValueArray or a JavaObject.
+ */
+
+public abstract class JavaHeapObject extends JavaThing {
+
+ //
+ // Who we refer to. This is heavily optimized for space, because it's
+ // well worth trading a bit of speed for less swapping.
+ // referers and referersLen go through two phases: Building and
+ // resolved. When building, referers might have duplicates, but can
+ // be appended to. When resolved, referers has no duplicates or
+ // empty slots.
+ //
+ private JavaThing[] referers = null;
+ private int referersLen = 0; // -1 when resolved
+
+ public abstract JavaClass getClazz();
+ public abstract int getSize();
+ public abstract long getId();
+
+ /**
+ * Do any initialization this thing needs after its data is read in.
+ * Subclasses that override this should call super.resolve().
+ */
+ public void resolve(Snapshot snapshot) {
+ StackTrace trace = snapshot.getSiteTrace(this);
+ if (trace != null) {
+ trace.resolve(snapshot);
+ }
+ }
+
+ //
+ // Eliminate duplicates from referers, and size the array exactly.
+ // This sets us up to answer queries. See the comments around the
+ // referers data member for details.
+ //
+ void setupReferers() {
+ if (referersLen > 1) {
+ // Copy referers to map, screening out duplicates
+ Map<JavaThing, JavaThing> map = new HashMap<JavaThing, JavaThing>();
+ for (int i = 0; i < referersLen; i++) {
+ if (map.get(referers[i]) == null) {
+ map.put(referers[i], referers[i]);
+ }
+ }
+
+ // Now copy into the array
+ referers = new JavaThing[map.size()];
+ map.keySet().toArray(referers);
+ }
+ referersLen = -1;
+ }
+
+
+ /**
+ * @return the id of this thing as hex string
+ */
+ public String getIdString() {
+ return Misc.toHex(getId());
+ }
+
+ public String toString() {
+ return getClazz().getName() + "@" + getIdString();
+ }
+
+ /**
+ * @return the StackTrace of the point of allocation of this object,
+ * or null if unknown
+ */
+ public StackTrace getAllocatedFrom() {
+ return getClazz().getSiteTrace(this);
+ }
+
+ public boolean isNew() {
+ return getClazz().isNew(this);
+ }
+
+ void setNew(boolean flag) {
+ getClazz().setNew(this, flag);
+ }
+
+ /**
+ * Tell the visitor about all of the objects we refer to
+ */
+ public void visitReferencedObjects(JavaHeapObjectVisitor v) {
+ v.visit(getClazz());
+ }
+
+ void addReferenceFrom(JavaHeapObject other) {
+ if (referersLen == 0) {
+ referers = new JavaThing[1]; // It was null
+ } else if (referersLen == referers.length) {
+ JavaThing[] copy = new JavaThing[(3 * (referersLen + 1)) / 2];
+ System.arraycopy(referers, 0, copy, 0, referersLen);
+ referers = copy;
+ }
+ referers[referersLen++] = other;
+ // We just append to referers here. Measurements have shown that
+ // around 10% to 30% are duplicates, so it's better to just append
+ // blindly and screen out all the duplicates at once.
+ }
+
+ void addReferenceFromRoot(Root r) {
+ getClazz().addReferenceFromRoot(r, this);
+ }
+
+ /**
+ * If the rootset includes this object, return a Root describing one
+ * of the reasons why.
+ */
+ public Root getRoot() {
+ return getClazz().getRoot(this);
+ }
+
+ /**
+ * Tell who refers to us.
+ *
+ * @return an Enumeration of JavaHeapObject instances
+ */
+ public Enumeration<JavaThing> getReferers() {
+ if (referersLen != -1) {
+ throw new RuntimeException("not resolved: " + getIdString());
+ }
+ return new Enumeration<JavaThing>() {
+
+ private int num = 0;
+
+ public boolean hasMoreElements() {
+ return referers != null && num < referers.length;
+ }
+
+ public JavaThing nextElement() {
+ return referers[num++];
+ }
+ };
+ }
+
+ /**
+ * Given other, which the caller promises is in referers, determines if
+ * the reference is only a weak reference.
+ */
+ public boolean refersOnlyWeaklyTo(Snapshot ss, JavaThing other) {
+ return false;
+ }
+
+ /**
+ * Describe the reference that this thing has to target. This will only
+ * be called if target is in the array returned by getChildrenForRootset.
+ */
+ public String describeReferenceTo(JavaThing target, Snapshot ss) {
+ return "??";
+ }
+
+ public boolean isHeapAllocated() {
+ return true;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaHeapObjectVisitor.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * A visitor for a JavaThing. @see JavaObject#visitReferencedObjects()
+ *
+ * @author Bill Foote
+ */
+
+
+public interface JavaHeapObjectVisitor {
+ public void visit(JavaHeapObject other);
+
+ /**
+ * Should the given field be excluded from the set of things visited?
+ * @return true if it should.
+ */
+ public boolean exclude(JavaClass clazz, JavaField f);
+
+ /**
+ * @return true iff exclude might ever return true
+ */
+ public boolean mightExclude();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaInt.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Represents an integer (i.e. an int field in an instance).
+ *
+ * @author Bill Foote
+ */
+
+
+public class JavaInt extends JavaValue {
+
+ int value;
+
+ public JavaInt(int value) {
+ this.value = value;
+ }
+
+ public String toString() {
+ return "" + value;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaLazyReadObject.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import java.io.IOException;
+import jdk.test.lib.hprof.parser.ReadBuffer;
+
+/*
+ * Base class for lazily read Java heap objects.
+ */
+public abstract class JavaLazyReadObject extends JavaHeapObject {
+
+ // file offset from which this object data starts
+ private final long offset;
+
+ protected JavaLazyReadObject(long offset) {
+ this.offset = offset;
+ }
+
+ public final int getSize() {
+ return getValueLength() + getClazz().getMinimumObjectSize();
+ }
+
+ protected final long getOffset() {
+ return offset;
+ }
+
+ // return the length of the data for this object
+ protected final int getValueLength() {
+ try {
+ return readValueLength();
+ } catch (IOException exp) {
+ System.err.println("lazy read failed at offset " + offset);
+ exp.printStackTrace();
+ return 0;
+ }
+ }
+
+ // get this object's content as byte array
+ protected final byte[] getValue() {
+ try {
+ return readValue();
+ } catch (IOException exp) {
+ System.err.println("lazy read failed at offset " + offset);
+ exp.printStackTrace();
+ return Snapshot.EMPTY_BYTE_ARRAY;
+ }
+ }
+
+ // get ID of this object
+ public final long getId() {
+ try {
+ ReadBuffer buf = getClazz().getReadBuffer();
+ int idSize = getClazz().getIdentifierSize();
+ if (idSize == 4) {
+ return ((long)buf.getInt(offset)) & Snapshot.SMALL_ID_MASK;
+ } else {
+ return buf.getLong(offset);
+ }
+ } catch (IOException exp) {
+ System.err.println("lazy read failed at offset " + offset);
+ exp.printStackTrace();
+ return -1;
+ }
+ }
+
+ protected abstract int readValueLength() throws IOException;
+ protected abstract byte[] readValue() throws IOException;
+
+ // make Integer or Long for given object ID
+ protected static Number makeId(long id) {
+ if ((id & ~Snapshot.SMALL_ID_MASK) == 0) {
+ return (int)id;
+ } else {
+ return id;
+ }
+ }
+
+ // get ID as long value from Number
+ protected static long getIdValue(Number num) {
+ long id = num.longValue();
+ if (num instanceof Integer) {
+ id &= Snapshot.SMALL_ID_MASK;
+ }
+ return id;
+ }
+
+ // read object ID from given index from given byte array
+ protected final long objectIdAt(int index, byte[] data) {
+ int idSize = getClazz().getIdentifierSize();
+ if (idSize == 4) {
+ return ((long)intAt(index, data)) & Snapshot.SMALL_ID_MASK;
+ } else {
+ return longAt(index, data);
+ }
+ }
+
+ // utility methods to read primitive types from byte array
+ protected static byte byteAt(int index, byte[] value) {
+ return value[index];
+ }
+
+ protected static boolean booleanAt(int index, byte[] value) {
+ return (value[index] & 0xff) == 0? false: true;
+ }
+
+ protected static char charAt(int index, byte[] value) {
+ int b1 = ((int) value[index++] & 0xff);
+ int b2 = ((int) value[index++] & 0xff);
+ return (char) ((b1 << 8) + b2);
+ }
+
+ protected static short shortAt(int index, byte[] value) {
+ int b1 = ((int) value[index++] & 0xff);
+ int b2 = ((int) value[index++] & 0xff);
+ return (short) ((b1 << 8) + b2);
+ }
+
+ protected static int intAt(int index, byte[] value) {
+ int b1 = ((int) value[index++] & 0xff);
+ int b2 = ((int) value[index++] & 0xff);
+ int b3 = ((int) value[index++] & 0xff);
+ int b4 = ((int) value[index++] & 0xff);
+ return ((b1 << 24) + (b2 << 16) + (b3 << 8) + b4);
+ }
+
+ protected static long longAt(int index, byte[] value) {
+ long val = 0;
+ for (int j = 0; j < 8; j++) {
+ val = val << 8;
+ int b = ((int)value[index++]) & 0xff;
+ val |= b;
+ }
+ return val;
+ }
+
+ protected static float floatAt(int index, byte[] value) {
+ int val = intAt(index, value);
+ return Float.intBitsToFloat(val);
+ }
+
+ protected static double doubleAt(int index, byte[] value) {
+ long val = longAt(index, value);
+ return Double.longBitsToDouble(val);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaLong.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Represents a long (i.e. a long field in an instance).
+ *
+ * @author Bill Foote
+ */
+
+
+public class JavaLong extends JavaValue {
+
+ long value;
+
+ public JavaLong(long value) {
+ this.value = value;
+ }
+
+ public String toString() {
+ return Long.toString(value);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaObject.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,334 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import java.io.IOException;
+import jdk.test.lib.hprof.parser.ReadBuffer;
+
+/**
+ * Represents Java instance
+ *
+ * @author Bill Foote
+ */
+public class JavaObject extends JavaLazyReadObject {
+
+ private Object clazz; // Number before resolve
+ // JavaClass after resolve
+ /**
+ * Construct a new JavaObject.
+ *
+ * @param classID id of the class object
+ * @param offset The offset of field data
+ */
+ public JavaObject(long classID, long offset) {
+ super(offset);
+ this.clazz = makeId(classID);
+ }
+
+ public void resolve(Snapshot snapshot) {
+ if (clazz instanceof JavaClass) {
+ return;
+ }
+ if (clazz instanceof Number) {
+ long classID = getIdValue((Number)clazz);
+ clazz = snapshot.findThing(classID);
+ if (! (clazz instanceof JavaClass)) {
+ warn("Class " + Long.toHexString(classID) + " not found, " +
+ "adding fake class!");
+ int length;
+ ReadBuffer buf = snapshot.getReadBuffer();
+ int idSize = snapshot.getIdentifierSize();
+ long lenOffset = getOffset() + 2*idSize + 4;
+ try {
+ length = buf.getInt(lenOffset);
+ } catch (IOException exp) {
+ throw new RuntimeException(exp);
+ }
+ clazz = snapshot.addFakeInstanceClass(classID, length);
+ }
+ } else {
+ throw new InternalError("should not reach here");
+ }
+
+ JavaClass cl = (JavaClass) clazz;
+ cl.resolve(snapshot);
+
+ // while resolving, parse fields in verbose mode.
+ // but, getFields calls parseFields in non-verbose mode
+ // to avoid printing warnings repeatedly.
+ parseFields(getValue(), true);
+
+ cl.addInstance(this);
+ super.resolve(snapshot);
+ }
+
+ /**
+ * Are we the same type as other? We are iff our clazz is the
+ * same type as other's.
+ */
+ public boolean isSameTypeAs(JavaThing other) {
+ if (!(other instanceof JavaObject)) {
+ return false;
+ }
+ JavaObject oo = (JavaObject) other;
+ return getClazz().equals(oo.getClazz());
+ }
+
+ /**
+ * Return our JavaClass object. This may only be called after resolve.
+ */
+ public JavaClass getClazz() {
+ return (JavaClass) clazz;
+ }
+
+ public JavaThing[] getFields() {
+ // pass false to verbose mode so that dereference
+ // warnings are not printed.
+ return parseFields(getValue(), false);
+ }
+
+ // returns the value of field of given name
+ public JavaThing getField(String name) {
+ JavaThing[] flds = getFields();
+ JavaField[] instFields = getClazz().getFieldsForInstance();
+ for (int i = 0; i < instFields.length; i++) {
+ if (instFields[i].getName().equals(name)) {
+ return flds[i];
+ }
+ }
+ return null;
+ }
+
+ public int compareTo(JavaThing other) {
+ if (other instanceof JavaObject) {
+ JavaObject oo = (JavaObject) other;
+ return getClazz().getName().compareTo(oo.getClazz().getName());
+ }
+ return super.compareTo(other);
+ }
+
+ public void visitReferencedObjects(JavaHeapObjectVisitor v) {
+ super.visitReferencedObjects(v);
+ JavaThing[] flds = getFields();
+ for (int i = 0; i < flds.length; i++) {
+ if (flds[i] != null) {
+ if (v.mightExclude()
+ && v.exclude(getClazz().getClassForField(i),
+ getClazz().getFieldForInstance(i)))
+ {
+ // skip it
+ } else if (flds[i] instanceof JavaHeapObject) {
+ v.visit((JavaHeapObject) flds[i]);
+ }
+ }
+ }
+ }
+
+ public boolean refersOnlyWeaklyTo(Snapshot ss, JavaThing other) {
+ if (ss.getWeakReferenceClass() != null) {
+ final int referentFieldIndex = ss.getReferentFieldIndex();
+ if (ss.getWeakReferenceClass().isAssignableFrom(getClazz())) {
+ //
+ // REMIND: This introduces a dependency on the JDK
+ // implementation that is undesirable.
+ JavaThing[] flds = getFields();
+ for (int i = 0; i < flds.length; i++) {
+ if (i != referentFieldIndex && flds[i] == other) {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Describe the reference that this thing has to target. This will only
+ * be called if target is in the array returned by getChildrenForRootset.
+ */
+ public String describeReferenceTo(JavaThing target, Snapshot ss) {
+ JavaThing[] flds = getFields();
+ for (int i = 0; i < flds.length; i++) {
+ if (flds[i] == target) {
+ JavaField f = getClazz().getFieldForInstance(i);
+ return "field " + f.getName();
+ }
+ }
+ return super.describeReferenceTo(target, ss);
+ }
+
+ public String toString() {
+ if (getClazz().isString()) {
+ JavaThing value = getField("value");
+ if (value instanceof JavaValueArray) {
+ return ((JavaValueArray)value).valueString();
+ } else {
+ return "null";
+ }
+ } else {
+ return super.toString();
+ }
+ }
+
+ // Internals only below this point
+
+ /*
+ * Java instance record (HPROF_GC_INSTANCE_DUMP) looks as below:
+ *
+ * object ID
+ * stack trace serial number (int)
+ * class ID
+ * data length (int)
+ * byte[length]
+ */
+ protected final int readValueLength() throws IOException {
+ JavaClass cl = getClazz();
+ int idSize = cl.getIdentifierSize();
+ long lengthOffset = getOffset() + 2*idSize + 4;
+ return cl.getReadBuffer().getInt(lengthOffset);
+ }
+
+ protected final byte[] readValue() throws IOException {
+ JavaClass cl = getClazz();
+ int idSize = cl.getIdentifierSize();
+ ReadBuffer buf = cl.getReadBuffer();
+ long offset = getOffset() + 2*idSize + 4;
+ int length = buf.getInt(offset);
+ if (length == 0) {
+ return Snapshot.EMPTY_BYTE_ARRAY;
+ } else {
+ byte[] res = new byte[length];
+ buf.get(offset + 4, res);
+ return res;
+ }
+ }
+
+ private JavaThing[] parseFields(byte[] data, boolean verbose) {
+ JavaClass cl = getClazz();
+ int target = cl.getNumFieldsForInstance();
+ JavaField[] fields = cl.getFields();
+ JavaThing[] fieldValues = new JavaThing[target];
+ Snapshot snapshot = cl.getSnapshot();
+ int idSize = snapshot.getIdentifierSize();
+ int fieldNo = 0;
+ // In the dump file, the fields are stored in this order:
+ // fields of most derived class (immediate class) are stored
+ // first and then the super class and so on. In this object,
+ // fields are stored in the reverse ("natural") order. i.e.,
+ // fields of most super class are stored first.
+
+ // target variable is used to compensate for the fact that
+ // the dump file starts field values from the leaf working
+ // upwards in the inheritance hierarchy, whereas JavaObject
+ // starts with the top of the inheritance hierarchy and works down.
+ target -= fields.length;
+ JavaClass currClass = cl;
+ int index = 0;
+ for (int i = 0; i < fieldValues.length; i++, fieldNo++) {
+ while (fieldNo >= fields.length) {
+ currClass = currClass.getSuperclass();
+ fields = currClass.getFields();
+ fieldNo = 0;
+ target -= fields.length;
+ }
+ JavaField f = fields[fieldNo];
+ char sig = f.getSignature().charAt(0);
+ switch (sig) {
+ case 'L':
+ case '[': {
+ long id = objectIdAt(index, data);
+ index += idSize;
+ JavaObjectRef ref = new JavaObjectRef(id);
+ fieldValues[target+fieldNo] = ref.dereference(snapshot, f, verbose);
+ break;
+ }
+ case 'Z': {
+ byte value = byteAt(index, data);
+ index++;
+ fieldValues[target+fieldNo] = new JavaBoolean(value != 0);
+ break;
+ }
+ case 'B': {
+ byte value = byteAt(index, data);
+ index++;
+ fieldValues[target+fieldNo] = new JavaByte(value);
+ break;
+ }
+ case 'S': {
+ short value = shortAt(index, data);
+ index += 2;
+ fieldValues[target+fieldNo] = new JavaShort(value);
+ break;
+ }
+ case 'C': {
+ char value = charAt(index, data);
+ index += 2;
+ fieldValues[target+fieldNo] = new JavaChar(value);
+ break;
+ }
+ case 'I': {
+ int value = intAt(index, data);
+ index += 4;
+ fieldValues[target+fieldNo] = new JavaInt(value);
+ break;
+ }
+ case 'J': {
+ long value = longAt(index, data);
+ index += 8;
+ fieldValues[target+fieldNo] = new JavaLong(value);
+ break;
+ }
+ case 'F': {
+ float value = floatAt(index, data);
+ index += 4;
+ fieldValues[target+fieldNo] = new JavaFloat(value);
+ break;
+ }
+ case 'D': {
+ double value = doubleAt(index, data);
+ index += 8;
+ fieldValues[target+fieldNo] = new JavaDouble(value);
+ break;
+ }
+ default:
+ throw new RuntimeException("invalid signature: " + sig);
+ }
+ }
+ return fieldValues;
+ }
+
+ private void warn(String msg) {
+ System.out.println("WARNING: " + msg);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaObjectArray.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import java.io.IOException;
+import jdk.test.lib.hprof.parser.ReadBuffer;
+
+/**
+ * @author Bill Foote
+ */
+public class JavaObjectArray extends JavaLazyReadObject {
+
+ private Object clazz; // Long before resolve, the class after resolve
+
+ public JavaObjectArray(long classID, long offset) {
+ super(offset);
+ this.clazz = makeId(classID);
+ }
+
+ public JavaClass getClazz() {
+ return (JavaClass) clazz;
+ }
+
+ public void resolve(Snapshot snapshot) {
+ if (clazz instanceof JavaClass) {
+ return;
+ }
+ long classID = getIdValue((Number)clazz);
+ if (snapshot.isNewStyleArrayClass()) {
+ // Modern heap dumps do this
+ JavaThing t = snapshot.findThing(classID);
+ if (t instanceof JavaClass) {
+ clazz = (JavaClass) t;
+ }
+ }
+ if (!(clazz instanceof JavaClass)) {
+ JavaThing t = snapshot.findThing(classID);
+ if (t != null && t instanceof JavaClass) {
+ JavaClass el = (JavaClass) t;
+ String nm = el.getName();
+ if (!nm.startsWith("[")) {
+ nm = "L" + el.getName() + ";";
+ }
+ clazz = snapshot.getArrayClass(nm);
+ }
+ }
+
+ if (!(clazz instanceof JavaClass)) {
+ clazz = snapshot.getOtherArrayType();
+ }
+ ((JavaClass)clazz).addInstance(this);
+ super.resolve(snapshot);
+ }
+
+ public JavaThing[] getValues() {
+ return getElements();
+ }
+
+ public JavaThing[] getElements() {
+ Snapshot snapshot = getClazz().getSnapshot();
+ byte[] data = getValue();
+ final int idSize = snapshot.getIdentifierSize();
+ final int numElements = data.length / idSize;
+ JavaThing[] elements = new JavaThing[numElements];
+ int index = 0;
+ for (int i = 0; i < elements.length; i++) {
+ long id = objectIdAt(index, data);
+ index += idSize;
+ elements[i] = snapshot.findThing(id);
+ }
+ return elements;
+ }
+
+ public int compareTo(JavaThing other) {
+ if (other instanceof JavaObjectArray) {
+ return 0;
+ }
+ return super.compareTo(other);
+ }
+
+ public int getLength() {
+ return getValueLength() / getClazz().getIdentifierSize();
+ }
+
+ public void visitReferencedObjects(JavaHeapObjectVisitor v) {
+ super.visitReferencedObjects(v);
+ JavaThing[] elements = getElements();
+ for (int i = 0; i < elements.length; i++) {
+ if (elements[i] != null && elements[i] instanceof JavaHeapObject) {
+ v.visit((JavaHeapObject) elements[i]);
+ }
+ }
+ }
+
+ /**
+ * Describe the reference that this thing has to target. This will only
+ * be called if target is in the array returned by getChildrenForRootset.
+ */
+ public String describeReferenceTo(JavaThing target, Snapshot ss) {
+ JavaThing[] elements = getElements();
+ for (int i = 0; i < elements.length; i++) {
+ if (elements[i] == target) {
+ return "Element " + i + " of " + this;
+ }
+ }
+ return super.describeReferenceTo(target, ss);
+ }
+
+ /*
+ * Java object array record (HPROF_GC_OBJ_ARRAY_DUMP)
+ * looks as below:
+ *
+ * object ID
+ * stack trace serial number (int)
+ * array length (int)
+ * array class ID
+ * array element IDs
+ */
+ protected final int readValueLength() throws IOException {
+ JavaClass cl = getClazz();
+ ReadBuffer buf = cl.getReadBuffer();
+ int idSize = cl.getIdentifierSize();
+ long offset = getOffset() + idSize + 4;
+ int len = buf.getInt(offset);
+ return len * cl.getIdentifierSize();
+ }
+
+ protected final byte[] readValue() throws IOException {
+ JavaClass cl = getClazz();
+ ReadBuffer buf = cl.getReadBuffer();
+ int idSize = cl.getIdentifierSize();
+ long offset = getOffset() + idSize + 4;
+ int len = buf.getInt(offset);
+ if (len == 0) {
+ return Snapshot.EMPTY_BYTE_ARRAY;
+ } else {
+ byte[] res = new byte[len * idSize];
+ buf.get(offset + 4 + idSize, res);
+ return res;
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaObjectRef.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import jdk.test.lib.hprof.util.Misc;
+
+/**
+ * A forward reference to an object. This is an intermediate representation
+ * for a JavaThing, when we have the thing's ID, but we might not have read
+ * the thing yet.
+ *
+ * @author Bill Foote
+ */
+public class JavaObjectRef extends JavaThing {
+ private long id;
+
+ public JavaObjectRef(long id) {
+ this.id = id;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public boolean isHeapAllocated() {
+ return true;
+ }
+
+ public JavaThing dereference(Snapshot snapshot, JavaField field) {
+ return dereference(snapshot, field, true);
+ }
+
+ public JavaThing dereference(Snapshot snapshot, JavaField field, boolean verbose) {
+ if (field != null && !field.hasId()) {
+ // If this happens, we must be a field that represents an int.
+ // (This only happens with .bod-style files)
+ return new JavaLong(id);
+ }
+ if (id == 0) {
+ return snapshot.getNullThing();
+ }
+ JavaThing result = snapshot.findThing(id);
+ if (result == null) {
+ if (!snapshot.getUnresolvedObjectsOK() && verbose) {
+ String msg = "WARNING: Failed to resolve object id "
+ + Misc.toHex(id);
+ if (field != null) {
+ msg += " for field " + field.getName()
+ + " (signature " + field.getSignature() + ")";
+ }
+ System.out.println(msg);
+ // Thread.dumpStack();
+ }
+ result = new HackJavaValue("Unresolved object "
+ + Misc.toHex(id), 0);
+ }
+ return result;
+ }
+
+ public int getSize() {
+ return 0;
+ }
+
+ public String toString() {
+ return "Unresolved object " + Misc.toHex(id);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaShort.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Represents a short (i.e. a short field in an instance).
+ *
+ * @author Bill Foote
+ */
+
+
+public class JavaShort extends JavaValue {
+
+ short value;
+
+ public JavaShort(short value) {
+ this.value = value;
+ }
+
+ public String toString() {
+ return "" + value;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaStatic.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ *
+ * @author Bill Foote
+ */
+
+/**
+ * Represents the value of a static field of a JavaClass
+ */
+
+public class JavaStatic {
+
+ private JavaField field;
+ private JavaThing value;
+
+ public JavaStatic(JavaField field, JavaThing value) {
+ this.field = field;
+ this.value = value;
+ }
+
+ public void resolve(JavaClass clazz, Snapshot snapshot) {
+ long id = -1;
+ if (value instanceof JavaObjectRef) {
+ id = ((JavaObjectRef)value).getId();
+ }
+ value = value.dereference(snapshot, field);
+ if (value.isHeapAllocated() &&
+ clazz.getLoader() == snapshot.getNullThing()) {
+ // static fields are only roots if they are in classes
+ // loaded by the root classloader.
+ JavaHeapObject ho = (JavaHeapObject) value;
+ String s = "Static reference from " + clazz.getName()
+ + "." + field.getName();
+ snapshot.addRoot(new Root(id, clazz.getId(),
+ Root.JAVA_STATIC, s));
+ }
+ }
+
+ public JavaField getField() {
+ return field;
+ }
+
+ public JavaThing getValue() {
+ return value;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaThing.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import java.util.Enumeration;
+import java.util.Hashtable;
+
+
+/**
+ *
+ * @author Bill Foote
+ */
+
+
+/**
+ * Represents a java "Thing". A thing is anything that can be the value of
+ * a field. This includes JavaHeapObject, JavaObjectRef, and JavaValue.
+ */
+
+public abstract class JavaThing {
+
+ protected JavaThing() {
+ }
+
+ /**
+ * If this is a forward reference, figure out what it really
+ * refers to.
+ *
+ * @param snapshot The snapshot this is for
+ * @param field The field this thing represents. If null, it is
+ * assumed this thing is an object (and never a value).
+ */
+ public JavaThing dereference(Snapshot shapshot, JavaField field) {
+ return this;
+ }
+
+
+ /**
+ * Are we the same type as other?
+ *
+ * @see JavaObject.isSameTypeAs()
+ */
+ public boolean isSameTypeAs(JavaThing other) {
+ return getClass() == other.getClass();
+ }
+ /**
+ * @return true iff this represents a heap-allocated object
+ */
+ abstract public boolean isHeapAllocated();
+
+ /**
+ * @return the size of this object, in bytes, including VM overhead
+ */
+ abstract public int getSize();
+
+ /**
+ * @return a human-readable string representation of this thing
+ */
+ abstract public String toString();
+
+ /**
+ * Compare our string representation to other's
+ * @see java.lang.String.compareTo()
+ */
+ public int compareTo(JavaThing other) {
+ return toString().compareTo(other.toString());
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaValue.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Abstract base class for all value types (ints, longs, floats, etc.)
+ *
+ * @author Bill Foote
+ */
+
+
+
+
+public abstract class JavaValue extends JavaThing {
+
+ protected JavaValue() {
+ }
+
+ public boolean isHeapAllocated() {
+ return false;
+ }
+
+ abstract public String toString();
+
+ public int getSize() {
+ // The size of a value is already accounted for in the class
+ // that has the data member.
+ return 0;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/JavaValueArray.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,433 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import jdk.test.lib.hprof.parser.ReadBuffer;
+import java.io.IOException;
+
+/**
+ * An array of values, that is, an array of ints, boolean, floats or the like.
+ *
+ * @author Bill Foote
+ */
+public class JavaValueArray extends JavaLazyReadObject
+ /*imports*/ implements ArrayTypeCodes {
+
+ private static String arrayTypeName(byte sig) {
+ switch (sig) {
+ case 'B':
+ return "byte[]";
+ case 'Z':
+ return "boolean[]";
+ case 'C':
+ return "char[]";
+ case 'S':
+ return "short[]";
+ case 'I':
+ return "int[]";
+ case 'F':
+ return "float[]";
+ case 'J':
+ return "long[]";
+ case 'D':
+ return "double[]";
+ default:
+ throw new RuntimeException("invalid array element sig: " + sig);
+ }
+ }
+
+ private static int elementSize(byte type) {
+ switch (type) {
+ case T_BYTE:
+ case T_BOOLEAN:
+ return 1;
+ case T_CHAR:
+ case T_SHORT:
+ return 2;
+ case T_INT:
+ case T_FLOAT:
+ return 4;
+ case T_LONG:
+ case T_DOUBLE:
+ return 8;
+ default:
+ throw new RuntimeException("invalid array element type: " + type);
+ }
+ }
+
+ /*
+ * Java primitive array record (HPROF_GC_PRIM_ARRAY_DUMP) looks
+ * as below:
+ *
+ * object ID
+ * stack trace serial number (int)
+ * length of the instance data (int)
+ * element type (byte)
+ * array data
+ */
+ protected final int readValueLength() throws IOException {
+ JavaClass cl = getClazz();
+ ReadBuffer buf = cl.getReadBuffer();
+ int idSize = cl.getIdentifierSize();
+ long offset = getOffset() + idSize + 4;
+ // length of the array
+ int len = buf.getInt(offset);
+ // typecode of array element type
+ byte type = buf.getByte(offset + 4);
+ return len * elementSize(type);
+ }
+
+ protected final byte[] readValue() throws IOException {
+ JavaClass cl = getClazz();
+ ReadBuffer buf = cl.getReadBuffer();
+ int idSize = cl.getIdentifierSize();
+ long offset = getOffset() + idSize + 4;
+ // length of the array
+ int length = buf.getInt(offset);
+ // typecode of array element type
+ byte type = buf.getByte(offset + 4);
+ if (length == 0) {
+ return Snapshot.EMPTY_BYTE_ARRAY;
+ } else {
+ length *= elementSize(type);
+ byte[] res = new byte[length];
+ buf.get(offset + 5, res);
+ return res;
+ }
+ }
+
+ // JavaClass set only after resolve.
+ private JavaClass clazz;
+
+ // This field contains elementSignature byte and
+ // divider to be used to calculate length. Note that
+ // length of content byte[] is not same as array length.
+ // Actual array length is (byte[].length / divider)
+ private int data;
+
+ // First 8 bits of data is used for element signature
+ private static final int SIGNATURE_MASK = 0x0FF;
+
+ // Next 8 bits of data is used for length divider
+ private static final int LENGTH_DIVIDER_MASK = 0x0FF00;
+
+ // Number of bits to shift to get length divider
+ private static final int LENGTH_DIVIDER_SHIFT = 8;
+
+ public JavaValueArray(byte elementSignature, long offset) {
+ super(offset);
+ this.data = (elementSignature & SIGNATURE_MASK);
+ }
+
+ public JavaClass getClazz() {
+ return clazz;
+ }
+
+ public void visitReferencedObjects(JavaHeapObjectVisitor v) {
+ super.visitReferencedObjects(v);
+ }
+
+ public void resolve(Snapshot snapshot) {
+ if (clazz instanceof JavaClass) {
+ return;
+ }
+ byte elementSig = getElementType();
+ clazz = snapshot.findClass(arrayTypeName(elementSig));
+ if (clazz == null) {
+ clazz = snapshot.getArrayClass("" + ((char) elementSig));
+ }
+ getClazz().addInstance(this);
+ super.resolve(snapshot);
+ }
+
+ public int getLength() {
+ int divider = (data & LENGTH_DIVIDER_MASK) >>> LENGTH_DIVIDER_SHIFT;
+ if (divider == 0) {
+ byte elementSignature = getElementType();
+ switch (elementSignature) {
+ case 'B':
+ case 'Z':
+ divider = 1;
+ break;
+ case 'C':
+ case 'S':
+ divider = 2;
+ break;
+ case 'I':
+ case 'F':
+ divider = 4;
+ break;
+ case 'J':
+ case 'D':
+ divider = 8;
+ break;
+ default:
+ throw new RuntimeException("unknown primitive type: " +
+ elementSignature);
+ }
+ data |= (divider << LENGTH_DIVIDER_SHIFT);
+ }
+ return (getValueLength() / divider);
+ }
+
+ public Object getElements() {
+ final int len = getLength();
+ final byte et = getElementType();
+ byte[] data = getValue();
+ int index = 0;
+ switch (et) {
+ case 'Z': {
+ boolean[] res = new boolean[len];
+ for (int i = 0; i < len; i++) {
+ res[i] = booleanAt(index, data);
+ index++;
+ }
+ return res;
+ }
+ case 'B': {
+ byte[] res = new byte[len];
+ for (int i = 0; i < len; i++) {
+ res[i] = byteAt(index, data);
+ index++;
+ }
+ return res;
+ }
+ case 'C': {
+ char[] res = new char[len];
+ for (int i = 0; i < len; i++) {
+ res[i] = charAt(index, data);
+ index += 2;
+ }
+ return res;
+ }
+ case 'S': {
+ short[] res = new short[len];
+ for (int i = 0; i < len; i++) {
+ res[i] = shortAt(index, data);
+ index += 2;
+ }
+ return res;
+ }
+ case 'I': {
+ int[] res = new int[len];
+ for (int i = 0; i < len; i++) {
+ res[i] = intAt(index, data);
+ index += 4;
+ }
+ return res;
+ }
+ case 'J': {
+ long[] res = new long[len];
+ for (int i = 0; i < len; i++) {
+ res[i] = longAt(index, data);
+ index += 8;
+ }
+ return res;
+ }
+ case 'F': {
+ float[] res = new float[len];
+ for (int i = 0; i < len; i++) {
+ res[i] = floatAt(index, data);
+ index += 4;
+ }
+ return res;
+ }
+ case 'D': {
+ double[] res = new double[len];
+ for (int i = 0; i < len; i++) {
+ res[i] = doubleAt(index, data);
+ index += 8;
+ }
+ return res;
+ }
+ default: {
+ throw new RuntimeException("unknown primitive type?");
+ }
+ }
+ }
+
+ public byte getElementType() {
+ return (byte) (data & SIGNATURE_MASK);
+ }
+
+ private void checkIndex(int index) {
+ if (index < 0 || index >= getLength()) {
+ throw new ArrayIndexOutOfBoundsException(index);
+ }
+ }
+
+ private void requireType(char type) {
+ if (getElementType() != type) {
+ throw new RuntimeException("not of type : " + type);
+ }
+ }
+
+ public boolean getBooleanAt(int index) {
+ checkIndex(index);
+ requireType('Z');
+ return booleanAt(index, getValue());
+ }
+
+ public byte getByteAt(int index) {
+ checkIndex(index);
+ requireType('B');
+ return byteAt(index, getValue());
+ }
+
+ public char getCharAt(int index) {
+ checkIndex(index);
+ requireType('C');
+ return charAt(index << 1, getValue());
+ }
+
+ public short getShortAt(int index) {
+ checkIndex(index);
+ requireType('S');
+ return shortAt(index << 1, getValue());
+ }
+
+ public int getIntAt(int index) {
+ checkIndex(index);
+ requireType('I');
+ return intAt(index << 2, getValue());
+ }
+
+ public long getLongAt(int index) {
+ checkIndex(index);
+ requireType('J');
+ return longAt(index << 3, getValue());
+ }
+
+ public float getFloatAt(int index) {
+ checkIndex(index);
+ requireType('F');
+ return floatAt(index << 2, getValue());
+ }
+
+ public double getDoubleAt(int index) {
+ checkIndex(index);
+ requireType('D');
+ return doubleAt(index << 3, getValue());
+ }
+
+ public String valueString() {
+ return valueString(true);
+ }
+
+ public String valueString(boolean bigLimit) {
+ // Char arrays deserve special treatment
+ StringBuilder result;
+ byte[] value = getValue();
+ int max = value.length;
+ byte elementSignature = getElementType();
+ if (elementSignature == 'C') {
+ result = new StringBuilder();
+ for (int i = 0; i < value.length; ) {
+ char val = charAt(i, value);
+ result.append(val);
+ i += 2;
+ }
+ } else {
+ int limit = 8;
+ if (bigLimit) {
+ limit = 1000;
+ }
+ result = new StringBuilder("{");
+ int num = 0;
+ for (int i = 0; i < value.length; ) {
+ if (num > 0) {
+ result.append(", ");
+ }
+ if (num >= limit) {
+ result.append("... ");
+ break;
+ }
+ num++;
+ switch (elementSignature) {
+ case 'Z': {
+ boolean val = booleanAt(i, value);
+ if (val) {
+ result.append("true");
+ } else {
+ result.append("false");
+ }
+ i++;
+ break;
+ }
+ case 'B': {
+ int val = 0xFF & byteAt(i, value);
+ result.append("0x").append(Integer.toString(val, 16));
+ i++;
+ break;
+ }
+ case 'S': {
+ short val = shortAt(i, value);
+ i += 2;
+ result.append(val);
+ break;
+ }
+ case 'I': {
+ int val = intAt(i, value);
+ i += 4;
+ result.append(val);
+ break;
+ }
+ case 'J': { // long
+ long val = longAt(i, value);
+ result.append(val);
+ i += 8;
+ break;
+ }
+ case 'F': {
+ float val = floatAt(i, value);
+ result.append(val);
+ i += 4;
+ break;
+ }
+ case 'D': { // double
+ double val = doubleAt(i, value);
+ result.append(val);
+ i += 8;
+ break;
+ }
+ default: {
+ throw new RuntimeException("unknown primitive type?");
+ }
+ }
+ }
+ result.append('}');
+ }
+ return result.toString();
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/ReachableExcludes.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+
+/**
+ * This represents a set of data members that should be excluded from the
+ * reachable objects query. This is useful to exclude observers from the
+ * transitive closure of objects reachable from a given object, allowing
+ * some kind of real determination of the "size" of that object.
+ *
+ */
+
+public interface ReachableExcludes {
+ /**
+ * @return true iff the given field is on the hitlist of excluded
+ * fields.
+ */
+ public boolean isExcluded(String fieldName);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/ReachableExcludesImpl.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.BufferedReader;
+import java.io.IOException;
+
+import java.util.Hashtable;
+
+/**
+ * This represents a set of data members that should be excluded from the
+ * reachable objects query.
+ * This is useful to exclude observers from the
+ * transitive closure of objects reachable from a given object, allowing
+ * some kind of real determination of the "size" of that object.
+ *
+ * @author Bill Foote
+ */
+public class ReachableExcludesImpl implements ReachableExcludes {
+
+ private File excludesFile;
+ private long lastModified;
+ private Hashtable<String, String> methods; // Used as a bag
+
+ /**
+ * Create a new ReachableExcludesImpl over the given file. The file will be
+ * re-read whenever the timestamp changes.
+ */
+ public ReachableExcludesImpl(File excludesFile) {
+ this.excludesFile = excludesFile;
+ readFile();
+ }
+
+ private void readFileIfNeeded() {
+ if (excludesFile.lastModified() != lastModified) {
+ synchronized(this) {
+ if (excludesFile.lastModified() != lastModified) {
+ readFile();
+ }
+ }
+ }
+ }
+
+ private void readFile() {
+ long lm = excludesFile.lastModified();
+ Hashtable<String, String> m = new Hashtable<String, String>();
+
+ try (BufferedReader r = new BufferedReader(new InputStreamReader(
+ new FileInputStream(excludesFile)))) {
+ String method;
+ while ((method = r.readLine()) != null) {
+ m.put(method, method);
+ }
+ lastModified = lm;
+ methods = m; // We want this to be atomic
+ } catch (IOException ex) {
+ System.out.println("Error reading " + excludesFile + ": " + ex);
+ }
+ }
+
+ /**
+ * @return true iff the given field is on the histlist of excluded
+ * fields.
+ */
+ public boolean isExcluded(String fieldName) {
+ readFileIfNeeded();
+ return methods.get(fieldName) != null;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/ReachableObjects.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import java.util.Vector;
+import java.util.Hashtable;
+import java.util.Enumeration;
+
+import jdk.test.lib.hprof.util.ArraySorter;
+import jdk.test.lib.hprof.util.Comparer;
+
+/**
+ * @author A. Sundararajan
+ */
+
+public class ReachableObjects {
+ public ReachableObjects(JavaHeapObject root,
+ final ReachableExcludes excludes) {
+ this.root = root;
+
+ final Hashtable<JavaHeapObject, JavaHeapObject> bag = new Hashtable<JavaHeapObject, JavaHeapObject>();
+ final Hashtable<String, String> fieldsExcluded = new Hashtable<String, String>(); //Bag<String>
+ final Hashtable<String, String> fieldsUsed = new Hashtable<String, String>(); // Bag<String>
+ JavaHeapObjectVisitor visitor = new AbstractJavaHeapObjectVisitor() {
+ public void visit(JavaHeapObject t) {
+ // Size is zero for things like integer fields
+ if (t != null && t.getSize() > 0 && bag.get(t) == null) {
+ bag.put(t, t);
+ t.visitReferencedObjects(this);
+ }
+ }
+
+ public boolean mightExclude() {
+ return excludes != null;
+ }
+
+ public boolean exclude(JavaClass clazz, JavaField f) {
+ if (excludes == null) {
+ return false;
+ }
+ String nm = clazz.getName() + "." + f.getName();
+ if (excludes.isExcluded(nm)) {
+ fieldsExcluded.put(nm, nm);
+ return true;
+ } else {
+ fieldsUsed.put(nm, nm);
+ return false;
+ }
+ }
+ };
+ // Put the closure of root and all objects reachable from root into
+ // bag (depth first), but don't include root:
+ visitor.visit(root);
+ bag.remove(root);
+
+ // Now grab the elements into a vector, and sort it in decreasing size
+ JavaThing[] things = new JavaThing[bag.size()];
+ int i = 0;
+ for (Enumeration<JavaHeapObject> e = bag.elements(); e.hasMoreElements(); ) {
+ things[i++] = (JavaThing) e.nextElement();
+ }
+ ArraySorter.sort(things, new Comparer() {
+ public int compare(Object lhs, Object rhs) {
+ JavaThing left = (JavaThing) lhs;
+ JavaThing right = (JavaThing) rhs;
+ int diff = right.getSize() - left.getSize();
+ if (diff != 0) {
+ return diff;
+ }
+ return left.compareTo(right);
+ }
+ });
+ this.reachables = things;
+
+ this.totalSize = root.getSize();
+ for (i = 0; i < things.length; i++) {
+ this.totalSize += things[i].getSize();
+ }
+
+ excludedFields = getElements(fieldsExcluded);
+ usedFields = getElements(fieldsUsed);
+ }
+
+ public JavaHeapObject getRoot() {
+ return root;
+ }
+
+ public JavaThing[] getReachables() {
+ return reachables;
+ }
+
+ public long getTotalSize() {
+ return totalSize;
+ }
+
+ public String[] getExcludedFields() {
+ return excludedFields;
+ }
+
+ public String[] getUsedFields() {
+ return usedFields;
+ }
+
+ private String[] getElements(Hashtable<?, ?> ht) {
+ Object[] keys = ht.keySet().toArray();
+ int len = keys.length;
+ String[] res = new String[len];
+ System.arraycopy(keys, 0, res, 0, len);
+ ArraySorter.sortArrayOfStrings(res);
+ return res;
+ }
+
+ private JavaHeapObject root;
+ private JavaThing[] reachables;
+ private String[] excludedFields;
+ private String[] usedFields;
+ private long totalSize;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/ReferenceChain.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ * Represents a chain of references to some target object
+ *
+ * @author Bill Foote
+ */
+
+public class ReferenceChain {
+
+ JavaHeapObject obj; // Object referred to
+ ReferenceChain next; // Next in chain
+
+ public ReferenceChain(JavaHeapObject obj, ReferenceChain next) {
+ this.obj = obj;
+ this.next = next;
+ }
+
+ public JavaHeapObject getObj() {
+ return obj;
+ }
+
+ public ReferenceChain getNext() {
+ return next;
+ }
+
+ public int getDepth() {
+ int count = 1;
+ ReferenceChain tmp = next;
+ while (tmp != null) {
+ count++;
+ tmp = tmp.next;
+ }
+ return count;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/Root.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,174 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import jdk.test.lib.hprof.util.Misc;
+
+/**
+ *
+ * @author Bill Foote
+ */
+
+
+/**
+ * Represents a member of the rootset, that is, one of the objects that
+ * the GC starts from when marking reachable objects.
+ */
+
+public class Root {
+
+ private long id; // ID of the JavaThing we refer to
+ private long refererId; // Thread or Class responsible for this, or 0
+ private int index = -1; // Index in Snapshot.roots
+ private int type;
+ private String description;
+ private JavaHeapObject referer = null;
+ private StackTrace stackTrace = null;
+
+ // Values for type. Higher values are more interesting -- see getType().
+ // See also getTypeName()
+ public final static int INVALID_TYPE = 0;
+ public final static int UNKNOWN = 1;
+ public final static int SYSTEM_CLASS = 2;
+
+ public final static int NATIVE_LOCAL = 3;
+ public final static int NATIVE_STATIC = 4;
+ public final static int THREAD_BLOCK = 5;
+ public final static int BUSY_MONITOR = 6;
+ public final static int JAVA_LOCAL = 7;
+ public final static int NATIVE_STACK = 8;
+ public final static int JAVA_STATIC = 9;
+
+
+ public Root(long id, long refererId, int type, String description) {
+ this(id, refererId, type, description, null);
+ }
+
+
+ public Root(long id, long refererId, int type, String description,
+ StackTrace stackTrace) {
+ this.id = id;
+ this.refererId = refererId;
+ this.type = type;
+ this.description = description;
+ this.stackTrace = stackTrace;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ public String getIdString() {
+ return Misc.toHex(id);
+ }
+
+ public String getDescription() {
+ if ("".equals(description)) {
+ return getTypeName() + " Reference";
+ } else {
+ return description;
+ }
+ }
+
+ /**
+ * Return type. We guarantee that more interesting roots will have
+ * a type that is numerically higher.
+ */
+ public int getType() {
+ return type;
+ }
+
+ public String getTypeName() {
+ switch(type) {
+ case INVALID_TYPE: return "Invalid (?!?)";
+ case UNKNOWN: return "Unknown";
+ case SYSTEM_CLASS: return "System Class";
+ case NATIVE_LOCAL: return "JNI Local";
+ case NATIVE_STATIC: return "JNI Global";
+ case THREAD_BLOCK: return "Thread Block";
+ case BUSY_MONITOR: return "Busy Monitor";
+ case JAVA_LOCAL: return "Java Local";
+ case NATIVE_STACK: return "Native Stack (possibly Java local)";
+ case JAVA_STATIC: return "Java Static";
+ default: return "??";
+ }
+ }
+
+ /**
+ * Given two Root instances, return the one that is most interesting.
+ */
+ public Root mostInteresting(Root other) {
+ if (other.type > this.type) {
+ return other;
+ } else {
+ return this;
+ }
+ }
+
+ /**
+ * Get the object that's responsible for this root, if there is one.
+ * This will be null, a Thread object, or a Class object.
+ */
+ public JavaHeapObject getReferer() {
+ return referer;
+ }
+
+ /**
+ * @return the stack trace responsible for this root, or null if there
+ * is none.
+ */
+ public StackTrace getStackTrace() {
+ return stackTrace;
+ }
+
+ /**
+ * @return The index of this root in Snapshot.roots
+ */
+ public int getIndex() {
+ return index;
+ }
+
+ void resolve(Snapshot ss) {
+ if (refererId != 0) {
+ referer = ss.findThing(refererId);
+ }
+ if (stackTrace != null) {
+ stackTrace.resolve(ss);
+ }
+ }
+
+ void setIndex(int i) {
+ index = i;
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/Snapshot.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,635 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+import java.lang.ref.SoftReference;
+import java.util.*;
+
+import jdk.test.lib.hprof.parser.ReadBuffer;
+import jdk.test.lib.hprof.util.Misc;
+
+/**
+ *
+ * @author Bill Foote
+ */
+
+/**
+ * Represents a snapshot of the Java objects in the VM at one instant.
+ * This is the top-level "model" object read out of a single .hprof or .bod
+ * file.
+ */
+
+public class Snapshot implements AutoCloseable {
+
+ public static final long SMALL_ID_MASK = 0x0FFFFFFFFL;
+ public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
+
+ private static final JavaField[] EMPTY_FIELD_ARRAY = new JavaField[0];
+ private static final JavaStatic[] EMPTY_STATIC_ARRAY = new JavaStatic[0];
+
+ // all heap objects
+ private Hashtable<Number, JavaHeapObject> heapObjects =
+ new Hashtable<Number, JavaHeapObject>();
+
+ private Hashtable<Number, JavaClass> fakeClasses =
+ new Hashtable<Number, JavaClass>();
+
+ // all Roots in this Snapshot
+ private Vector<Root> roots = new Vector<Root>();
+
+ // name-to-class map
+ private Map<String, JavaClass> classes =
+ new TreeMap<String, JavaClass>();
+
+ // new objects relative to a baseline - lazily initialized
+ private volatile Map<JavaHeapObject, Boolean> newObjects;
+
+ // allocation site traces for all objects - lazily initialized
+ private volatile Map<JavaHeapObject, StackTrace> siteTraces;
+
+ // object-to-Root map for all objects
+ private Map<JavaHeapObject, Root> rootsMap =
+ new HashMap<JavaHeapObject, Root>();
+
+ // soft cache of finalizeable objects - lazily initialized
+ private SoftReference<Vector<?>> finalizablesCache;
+
+ // represents null reference
+ private JavaThing nullThing;
+
+ // java.lang.ref.Reference class
+ private JavaClass weakReferenceClass;
+ // index of 'referent' field in java.lang.ref.Reference class
+ private int referentFieldIndex;
+
+ // java.lang.Class class
+ private JavaClass javaLangClass;
+ // java.lang.String class
+ private JavaClass javaLangString;
+ // java.lang.ClassLoader class
+ private JavaClass javaLangClassLoader;
+
+ // unknown "other" array class
+ private volatile JavaClass otherArrayType;
+ // Stuff to exclude from reachable query
+ private ReachableExcludes reachableExcludes;
+ // the underlying heap dump buffer
+ private ReadBuffer readBuf;
+
+ // True iff some heap objects have isNew set
+ private boolean hasNewSet;
+ private boolean unresolvedObjectsOK;
+
+ // whether object array instances have new style class or
+ // old style (element) class.
+ private boolean newStyleArrayClass;
+
+ // object id size in the heap dump
+ private int identifierSize = 4;
+
+ // minimum object size - accounts for object header in
+ // most Java virtual machines - we assume 2 identifierSize
+ // (which is true for Sun's hotspot JVM).
+ private int minimumObjectSize;
+
+ public Snapshot(ReadBuffer buf) {
+ nullThing = new HackJavaValue("<null>", 0);
+ readBuf = buf;
+ }
+
+ public void setSiteTrace(JavaHeapObject obj, StackTrace trace) {
+ if (trace != null && trace.getFrames().length != 0) {
+ initSiteTraces();
+ siteTraces.put(obj, trace);
+ }
+ }
+
+ public StackTrace getSiteTrace(JavaHeapObject obj) {
+ if (siteTraces != null) {
+ return siteTraces.get(obj);
+ } else {
+ return null;
+ }
+ }
+
+ public void setNewStyleArrayClass(boolean value) {
+ newStyleArrayClass = value;
+ }
+
+ public boolean isNewStyleArrayClass() {
+ return newStyleArrayClass;
+ }
+
+ public void setIdentifierSize(int size) {
+ identifierSize = size;
+ minimumObjectSize = 2 * size;
+ }
+
+ public int getIdentifierSize() {
+ return identifierSize;
+ }
+
+ public int getMinimumObjectSize() {
+ return minimumObjectSize;
+ }
+
+ public void addHeapObject(long id, JavaHeapObject ho) {
+ heapObjects.put(makeId(id), ho);
+ }
+
+ public void addRoot(Root r) {
+ r.setIndex(roots.size());
+ roots.addElement(r);
+ }
+
+ public void addClass(long id, JavaClass c) {
+ addHeapObject(id, c);
+ putInClassesMap(c);
+ }
+
+ JavaClass addFakeInstanceClass(long classID, int instSize) {
+ // Create a fake class name based on ID.
+ String name = "unknown-class<@" + Misc.toHex(classID) + ">";
+
+ // Create fake fields convering the given instance size.
+ // Create as many as int type fields and for the left over
+ // size create byte type fields.
+ int numInts = instSize / 4;
+ int numBytes = instSize % 4;
+ JavaField[] fields = new JavaField[numInts + numBytes];
+ int i;
+ for (i = 0; i < numInts; i++) {
+ fields[i] = new JavaField("unknown-field-" + i, "I");
+ }
+ for (i = 0; i < numBytes; i++) {
+ fields[i + numInts] = new JavaField("unknown-field-" +
+ i + numInts, "B");
+ }
+
+ // Create fake instance class
+ JavaClass c = new JavaClass(name, 0, 0, 0, 0, fields,
+ EMPTY_STATIC_ARRAY, instSize);
+ // Add the class
+ addFakeClass(makeId(classID), c);
+ return c;
+ }
+
+
+ /**
+ * @return true iff it's possible that some JavaThing instances might
+ * isNew set
+ *
+ * @see JavaThing.isNew()
+ */
+ public boolean getHasNewSet() {
+ return hasNewSet;
+ }
+
+ //
+ // Used in the body of resolve()
+ //
+ private static class MyVisitor extends AbstractJavaHeapObjectVisitor {
+ JavaHeapObject t;
+ public void visit(JavaHeapObject other) {
+ other.addReferenceFrom(t);
+ }
+ }
+
+ // To show heap parsing progress, we print a '.' after this limit
+ private static final int DOT_LIMIT = 5000;
+
+ /**
+ * Called after reading complete, to initialize the structure
+ */
+ public void resolve(boolean calculateRefs) {
+ System.out.println("Resolving " + heapObjects.size() + " objects...");
+
+ // First, resolve the classes. All classes must be resolved before
+ // we try any objects, because the objects use classes in their
+ // resolution.
+ javaLangClass = findClass("java.lang.Class");
+ if (javaLangClass == null) {
+ System.out.println("WARNING: hprof file does not include java.lang.Class!");
+ javaLangClass = new JavaClass("java.lang.Class", 0, 0, 0, 0,
+ EMPTY_FIELD_ARRAY, EMPTY_STATIC_ARRAY, 0);
+ addFakeClass(javaLangClass);
+ }
+ javaLangString = findClass("java.lang.String");
+ if (javaLangString == null) {
+ System.out.println("WARNING: hprof file does not include java.lang.String!");
+ javaLangString = new JavaClass("java.lang.String", 0, 0, 0, 0,
+ EMPTY_FIELD_ARRAY, EMPTY_STATIC_ARRAY, 0);
+ addFakeClass(javaLangString);
+ }
+ javaLangClassLoader = findClass("java.lang.ClassLoader");
+ if (javaLangClassLoader == null) {
+ System.out.println("WARNING: hprof file does not include java.lang.ClassLoader!");
+ javaLangClassLoader = new JavaClass("java.lang.ClassLoader", 0, 0, 0, 0,
+ EMPTY_FIELD_ARRAY, EMPTY_STATIC_ARRAY, 0);
+ addFakeClass(javaLangClassLoader);
+ }
+
+ for (JavaHeapObject t : heapObjects.values()) {
+ if (t instanceof JavaClass) {
+ t.resolve(this);
+ }
+ }
+
+ // Now, resolve everything else.
+ for (JavaHeapObject t : heapObjects.values()) {
+ if (!(t instanceof JavaClass)) {
+ t.resolve(this);
+ }
+ }
+
+ heapObjects.putAll(fakeClasses);
+ fakeClasses.clear();
+
+ weakReferenceClass = findClass("java.lang.ref.Reference");
+ referentFieldIndex = 0;
+ if (weakReferenceClass != null) {
+ JavaField[] fields = weakReferenceClass.getFieldsForInstance();
+ for (int i = 0; i < fields.length; i++) {
+ if ("referent".equals(fields[i].getName())) {
+ referentFieldIndex = i;
+ break;
+ }
+ }
+ }
+
+ if (calculateRefs) {
+ calculateReferencesToObjects();
+ System.out.print("Eliminating duplicate references");
+ System.out.flush();
+ // This println refers to the *next* step
+ }
+ int count = 0;
+ for (JavaHeapObject t : heapObjects.values()) {
+ t.setupReferers();
+ ++count;
+ if (calculateRefs && count % DOT_LIMIT == 0) {
+ System.out.print(".");
+ System.out.flush();
+ }
+ }
+ if (calculateRefs) {
+ System.out.println("");
+ }
+
+ // to ensure that Iterator.remove() on getClasses()
+ // result will throw exception..
+ classes = Collections.unmodifiableMap(classes);
+ }
+
+ private void calculateReferencesToObjects() {
+ System.out.print("Chasing references, expect "
+ + (heapObjects.size() / DOT_LIMIT) + " dots");
+ System.out.flush();
+ int count = 0;
+ MyVisitor visitor = new MyVisitor();
+ for (JavaHeapObject t : heapObjects.values()) {
+ visitor.t = t;
+ // call addReferenceFrom(t) on all objects t references:
+ t.visitReferencedObjects(visitor);
+ ++count;
+ if (count % DOT_LIMIT == 0) {
+ System.out.print(".");
+ System.out.flush();
+ }
+ }
+ System.out.println();
+ for (Root r : roots) {
+ r.resolve(this);
+ JavaHeapObject t = findThing(r.getId());
+ if (t != null) {
+ t.addReferenceFromRoot(r);
+ }
+ }
+ }
+
+ public void markNewRelativeTo(Snapshot baseline) {
+ hasNewSet = true;
+ for (JavaHeapObject t : heapObjects.values()) {
+ boolean isNew;
+ long thingID = t.getId();
+ if (thingID == 0L || thingID == -1L) {
+ isNew = false;
+ } else {
+ JavaThing other = baseline.findThing(t.getId());
+ if (other == null) {
+ isNew = true;
+ } else {
+ isNew = !t.isSameTypeAs(other);
+ }
+ }
+ t.setNew(isNew);
+ }
+ }
+
+ public Enumeration<JavaHeapObject> getThings() {
+ return heapObjects.elements();
+ }
+
+
+ public JavaHeapObject findThing(long id) {
+ Number idObj = makeId(id);
+ JavaHeapObject jho = heapObjects.get(idObj);
+ return jho != null? jho : fakeClasses.get(idObj);
+ }
+
+ public JavaHeapObject findThing(String id) {
+ return findThing(Misc.parseHex(id));
+ }
+
+ public JavaClass findClass(String name) {
+ if (name.startsWith("0x")) {
+ return (JavaClass) findThing(name);
+ } else {
+ return classes.get(name);
+ }
+ }
+
+ /**
+ * Return an Iterator of all of the classes in this snapshot.
+ **/
+ public Iterator<JavaClass> getClasses() {
+ // note that because classes is a TreeMap
+ // classes are already sorted by name
+ return classes.values().iterator();
+ }
+
+ public JavaClass[] getClassesArray() {
+ JavaClass[] res = new JavaClass[classes.size()];
+ classes.values().toArray(res);
+ return res;
+ }
+
+ public synchronized Enumeration<?> getFinalizerObjects() {
+ Vector<?> obj;
+ if (finalizablesCache != null &&
+ (obj = finalizablesCache.get()) != null) {
+ return obj.elements();
+ }
+
+ JavaClass clazz = findClass("java.lang.ref.Finalizer");
+ JavaObject queue = (JavaObject) clazz.getStaticField("queue");
+ JavaThing tmp = queue.getField("head");
+ Vector<JavaHeapObject> finalizables = new Vector<JavaHeapObject>();
+ if (tmp != getNullThing()) {
+ JavaObject head = (JavaObject) tmp;
+ while (true) {
+ JavaHeapObject referent = (JavaHeapObject) head.getField("referent");
+ JavaThing next = head.getField("next");
+ if (next == getNullThing() || next.equals(head)) {
+ break;
+ }
+ head = (JavaObject) next;
+ finalizables.add(referent);
+ }
+ }
+ finalizablesCache = new SoftReference<Vector<?>>(finalizables);
+ return finalizables.elements();
+ }
+
+ public Enumeration<Root> getRoots() {
+ return roots.elements();
+ }
+
+ public Root[] getRootsArray() {
+ Root[] res = new Root[roots.size()];
+ roots.toArray(res);
+ return res;
+ }
+
+ public Root getRootAt(int i) {
+ return roots.elementAt(i);
+ }
+
+ public ReferenceChain[]
+ rootsetReferencesTo(JavaHeapObject target, boolean includeWeak) {
+ Vector<ReferenceChain> fifo = new Vector<ReferenceChain>(); // This is slow... A real fifo would help
+ // Must be a fifo to go breadth-first
+ Hashtable<JavaHeapObject, JavaHeapObject> visited = new Hashtable<JavaHeapObject, JavaHeapObject>();
+ // Objects are added here right after being added to fifo.
+ Vector<ReferenceChain> result = new Vector<ReferenceChain>();
+ visited.put(target, target);
+ fifo.addElement(new ReferenceChain(target, null));
+
+ while (fifo.size() > 0) {
+ ReferenceChain chain = fifo.elementAt(0);
+ fifo.removeElementAt(0);
+ JavaHeapObject curr = chain.getObj();
+ if (curr.getRoot() != null) {
+ result.addElement(chain);
+ // Even though curr is in the rootset, we want to explore its
+ // referers, because they might be more interesting.
+ }
+ Enumeration<JavaThing> referers = curr.getReferers();
+ while (referers.hasMoreElements()) {
+ JavaHeapObject t = (JavaHeapObject) referers.nextElement();
+ if (t != null && !visited.containsKey(t)) {
+ if (includeWeak || !t.refersOnlyWeaklyTo(this, curr)) {
+ visited.put(t, t);
+ fifo.addElement(new ReferenceChain(t, chain));
+ }
+ }
+ }
+ }
+
+ ReferenceChain[] realResult = new ReferenceChain[result.size()];
+ for (int i = 0; i < result.size(); i++) {
+ realResult[i] = result.elementAt(i);
+ }
+ return realResult;
+ }
+
+ public boolean getUnresolvedObjectsOK() {
+ return unresolvedObjectsOK;
+ }
+
+ public void setUnresolvedObjectsOK(boolean v) {
+ unresolvedObjectsOK = v;
+ }
+
+ public JavaClass getWeakReferenceClass() {
+ return weakReferenceClass;
+ }
+
+ public int getReferentFieldIndex() {
+ return referentFieldIndex;
+ }
+
+ public JavaThing getNullThing() {
+ return nullThing;
+ }
+
+ public void setReachableExcludes(ReachableExcludes e) {
+ reachableExcludes = e;
+ }
+
+ public ReachableExcludes getReachableExcludes() {
+ return reachableExcludes;
+ }
+
+ // package privates
+ void addReferenceFromRoot(Root r, JavaHeapObject obj) {
+ Root root = rootsMap.get(obj);
+ if (root == null) {
+ rootsMap.put(obj, r);
+ } else {
+ rootsMap.put(obj, root.mostInteresting(r));
+ }
+ }
+
+ Root getRoot(JavaHeapObject obj) {
+ return rootsMap.get(obj);
+ }
+
+ JavaClass getJavaLangClass() {
+ return javaLangClass;
+ }
+
+ JavaClass getJavaLangString() {
+ return javaLangString;
+ }
+
+ JavaClass getJavaLangClassLoader() {
+ return javaLangClassLoader;
+ }
+
+ JavaClass getOtherArrayType() {
+ if (otherArrayType == null) {
+ synchronized(this) {
+ if (otherArrayType == null) {
+ addFakeClass(new JavaClass("[<other>", 0, 0, 0, 0,
+ EMPTY_FIELD_ARRAY, EMPTY_STATIC_ARRAY,
+ 0));
+ otherArrayType = findClass("[<other>");
+ }
+ }
+ }
+ return otherArrayType;
+ }
+
+ JavaClass getArrayClass(String elementSignature) {
+ JavaClass clazz;
+ synchronized(classes) {
+ clazz = findClass("[" + elementSignature);
+ if (clazz == null) {
+ clazz = new JavaClass("[" + elementSignature, 0, 0, 0, 0,
+ EMPTY_FIELD_ARRAY, EMPTY_STATIC_ARRAY, 0);
+ addFakeClass(clazz);
+ // This is needed because the JDK only creates Class structures
+ // for array element types, not the arrays themselves. For
+ // analysis, though, we need to pretend that there's a
+ // JavaClass for the array type, too.
+ }
+ }
+ return clazz;
+ }
+
+ ReadBuffer getReadBuffer() {
+ return readBuf;
+ }
+
+ void setNew(JavaHeapObject obj, boolean isNew) {
+ initNewObjects();
+ if (isNew) {
+ newObjects.put(obj, Boolean.TRUE);
+ }
+ }
+
+ boolean isNew(JavaHeapObject obj) {
+ if (newObjects != null) {
+ return newObjects.get(obj) != null;
+ } else {
+ return false;
+ }
+ }
+
+ // Internals only below this point
+ private Number makeId(long id) {
+ if (identifierSize == 4) {
+ return (int)id;
+ } else {
+ return id;
+ }
+ }
+
+ private void putInClassesMap(JavaClass c) {
+ String name = c.getName();
+ if (classes.containsKey(name)) {
+ // more than one class can have the same name
+ // if so, create a unique name by appending
+ // - and id string to it.
+ name += "-" + c.getIdString();
+ }
+ classes.put(c.getName(), c);
+ }
+
+ private void addFakeClass(JavaClass c) {
+ putInClassesMap(c);
+ c.resolve(this);
+ }
+
+ private void addFakeClass(Number id, JavaClass c) {
+ fakeClasses.put(id, c);
+ addFakeClass(c);
+ }
+
+ private synchronized void initNewObjects() {
+ if (newObjects == null) {
+ synchronized (this) {
+ if (newObjects == null) {
+ newObjects = new HashMap<JavaHeapObject, Boolean>();
+ }
+ }
+ }
+ }
+
+ private synchronized void initSiteTraces() {
+ if (siteTraces == null) {
+ synchronized (this) {
+ if (siteTraces == null) {
+ siteTraces = new HashMap<JavaHeapObject, StackTrace>();
+ }
+ }
+ }
+ }
+
+ @Override
+ public void close() throws Exception {
+ readBuf.close();
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/StackFrame.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ *
+ * @author Bill Foote
+ */
+
+
+/**
+ * Represents a stack frame.
+ */
+
+public class StackFrame {
+
+ //
+ // Values for the lineNumber data member. These are the same
+ // as the values used in the JDK 1.2 heap dump file.
+ //
+ public final static int LINE_NUMBER_UNKNOWN = -1;
+ public final static int LINE_NUMBER_COMPILED = -2;
+ public final static int LINE_NUMBER_NATIVE = -3;
+
+ private String methodName;
+ private String methodSignature;
+ private String className;
+ private String sourceFileName;
+ private int lineNumber;
+
+ public StackFrame(String methodName, String methodSignature,
+ String className, String sourceFileName, int lineNumber) {
+ this.methodName = methodName;
+ this.methodSignature = methodSignature;
+ this.className = className;
+ this.sourceFileName = sourceFileName;
+ this.lineNumber = lineNumber;
+ }
+
+ public void resolve(Snapshot snapshot) {
+ }
+
+ public String getMethodName() {
+ return methodName;
+ }
+
+ public String getMethodSignature() {
+ return methodSignature;
+ }
+
+ public String getClassName() {
+ return className;
+ }
+
+ public String getSourceFileName() {
+ return sourceFileName;
+ }
+
+ public String getLineNumber() {
+ switch(lineNumber) {
+ case LINE_NUMBER_UNKNOWN:
+ return "(unknown)";
+ case LINE_NUMBER_COMPILED:
+ return "(compiled method)";
+ case LINE_NUMBER_NATIVE:
+ return "(native method)";
+ default:
+ return Integer.toString(lineNumber, 10);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/model/StackTrace.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.model;
+
+/**
+ *
+ * @author Bill Foote
+ */
+
+
+/**
+ * Represents a stack trace, that is, an ordered collection of stack frames.
+ */
+
+public class StackTrace {
+
+ private StackFrame[] frames;
+
+ public StackTrace(StackFrame[] frames) {
+ this.frames = frames;
+ }
+
+ /**
+ * @param depth. The minimum reasonable depth is 1.
+ *
+ * @return a (possibly new) StackTrace that is limited to depth.
+ */
+ public StackTrace traceForDepth(int depth) {
+ if (depth >= frames.length) {
+ return this;
+ } else {
+ StackFrame[] f = new StackFrame[depth];
+ System.arraycopy(frames, 0, f, 0, depth);
+ return new StackTrace(f);
+ }
+ }
+
+ public void resolve(Snapshot snapshot) {
+ for (int i = 0; i < frames.length; i++) {
+ frames[i].resolve(snapshot);
+ }
+ }
+
+ public StackFrame[] getFrames() {
+ return frames;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/parser/FileReadBuffer.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.parser;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+
+/**
+ * Implementation of ReadBuffer using a RandomAccessFile
+ *
+ * @author A. Sundararajan
+ */
+class FileReadBuffer implements ReadBuffer {
+ // underlying file to read
+ private RandomAccessFile file;
+
+ FileReadBuffer(RandomAccessFile file) {
+ this.file = file;
+ }
+
+ private void seek(long pos) throws IOException {
+ file.getChannel().position(pos);
+ }
+
+ public synchronized void get(long pos, byte[] buf) throws IOException {
+ seek(pos);
+ file.read(buf);
+ }
+
+ public synchronized char getChar(long pos) throws IOException {
+ seek(pos);
+ return file.readChar();
+ }
+
+ public synchronized byte getByte(long pos) throws IOException {
+ seek(pos);
+ return (byte) file.read();
+ }
+
+ public synchronized short getShort(long pos) throws IOException {
+ seek(pos);
+ return file.readShort();
+ }
+
+ public synchronized int getInt(long pos) throws IOException {
+ seek(pos);
+ return file.readInt();
+ }
+
+ public synchronized long getLong(long pos) throws IOException {
+ seek(pos);
+ return file.readLong();
+ }
+
+ @Override
+ public void close() throws Exception {
+ file.close();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/parser/HprofReader.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,899 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.parser;
+
+import java.io.*;
+import java.util.Date;
+import java.util.Hashtable;
+import jdk.test.lib.hprof.model.ArrayTypeCodes;
+import jdk.test.lib.hprof.model.*;
+
+/**
+ * Object that's used to read a hprof file.
+ *
+ * @author Bill Foote
+ */
+
+public class HprofReader extends Reader /* imports */ implements ArrayTypeCodes {
+
+ final static int MAGIC_NUMBER = 0x4a415641;
+ // That's "JAVA", the first part of "JAVA PROFILE ..."
+ private final static String[] VERSIONS = {
+ " PROFILE 1.0\0",
+ " PROFILE 1.0.1\0",
+ " PROFILE 1.0.2\0",
+ };
+
+ private final static int VERSION_JDK12BETA3 = 0;
+ private final static int VERSION_JDK12BETA4 = 1;
+ private final static int VERSION_JDK6 = 2;
+ // These version numbers are indices into VERSIONS. The instance data
+ // member version is set to one of these, and it drives decisions when
+ // reading the file.
+ //
+ // Version 1.0.1 added HPROF_GC_PRIM_ARRAY_DUMP, which requires no
+ // version-sensitive parsing.
+ //
+ // Version 1.0.1 changed the type of a constant pool entry from a signature
+ // to a typecode.
+ //
+ // Version 1.0.2 added HPROF_HEAP_DUMP_SEGMENT and HPROF_HEAP_DUMP_END
+ // to allow a large heap to be dumped as a sequence of heap dump segments.
+ //
+ // The HPROF agent in J2SE 1.2 through to 5.0 generate a version 1.0.1
+ // file. In Java SE 6.0 the version is either 1.0.1 or 1.0.2 depending on
+ // the size of the heap (normally it will be 1.0.1 but for multi-GB
+ // heaps the heap dump will not fit in a HPROF_HEAP_DUMP record so the
+ // dump is generated as version 1.0.2).
+
+ //
+ // Record types:
+ //
+ static final int HPROF_UTF8 = 0x01;
+ static final int HPROF_LOAD_CLASS = 0x02;
+ static final int HPROF_UNLOAD_CLASS = 0x03;
+ static final int HPROF_FRAME = 0x04;
+ static final int HPROF_TRACE = 0x05;
+ static final int HPROF_ALLOC_SITES = 0x06;
+ static final int HPROF_HEAP_SUMMARY = 0x07;
+
+ static final int HPROF_START_THREAD = 0x0a;
+ static final int HPROF_END_THREAD = 0x0b;
+
+ static final int HPROF_HEAP_DUMP = 0x0c;
+
+ static final int HPROF_CPU_SAMPLES = 0x0d;
+ static final int HPROF_CONTROL_SETTINGS = 0x0e;
+ static final int HPROF_LOCKSTATS_WAIT_TIME = 0x10;
+ static final int HPROF_LOCKSTATS_HOLD_TIME = 0x11;
+
+ static final int HPROF_GC_ROOT_UNKNOWN = 0xff;
+ static final int HPROF_GC_ROOT_JNI_GLOBAL = 0x01;
+ static final int HPROF_GC_ROOT_JNI_LOCAL = 0x02;
+ static final int HPROF_GC_ROOT_JAVA_FRAME = 0x03;
+ static final int HPROF_GC_ROOT_NATIVE_STACK = 0x04;
+ static final int HPROF_GC_ROOT_STICKY_CLASS = 0x05;
+ static final int HPROF_GC_ROOT_THREAD_BLOCK = 0x06;
+ static final int HPROF_GC_ROOT_MONITOR_USED = 0x07;
+ static final int HPROF_GC_ROOT_THREAD_OBJ = 0x08;
+
+ static final int HPROF_GC_CLASS_DUMP = 0x20;
+ static final int HPROF_GC_INSTANCE_DUMP = 0x21;
+ static final int HPROF_GC_OBJ_ARRAY_DUMP = 0x22;
+ static final int HPROF_GC_PRIM_ARRAY_DUMP = 0x23;
+
+ static final int HPROF_HEAP_DUMP_SEGMENT = 0x1c;
+ static final int HPROF_HEAP_DUMP_END = 0x2c;
+
+ private final static int T_CLASS = 2;
+
+ private int version; // The version of .hprof being read
+
+ private int debugLevel;
+ private long currPos; // Current position in the file
+
+ private int dumpsToSkip;
+ private boolean callStack; // If true, read the call stack of objects
+
+ private int identifierSize; // Size, in bytes, of identifiers.
+ private Hashtable<Long, String> names;
+
+ // Hashtable<Integer, ThreadObject>, used to map the thread sequence number
+ // (aka "serial number") to the thread object ID for
+ // HPROF_GC_ROOT_THREAD_OBJ. ThreadObject is a trivial inner class,
+ // at the end of this file.
+ private Hashtable<Integer, ThreadObject> threadObjects;
+
+ // Hashtable<Long, String>, maps class object ID to class name
+ // (with / converted to .)
+ private Hashtable<Long, String> classNameFromObjectID;
+
+ // Hashtable<Integer, Integer>, maps class serial # to class object ID
+ private Hashtable<Integer, String> classNameFromSerialNo;
+
+ // Hashtable<Long, StackFrame> maps stack frame ID to StackFrame.
+ // Null if we're not tracking them.
+ private Hashtable<Long, StackFrame> stackFrames;
+
+ // Hashtable<Integer, StackTrace> maps stack frame ID to StackTrace
+ // Null if we're not tracking them.
+ private Hashtable<Integer, StackTrace> stackTraces;
+
+ private Snapshot snapshot;
+
+ public HprofReader(String fileName, PositionDataInputStream in,
+ int dumpNumber, boolean callStack, int debugLevel)
+ throws IOException {
+ super(in);
+ RandomAccessFile file = new RandomAccessFile(fileName, "r");
+ this.snapshot = new Snapshot(MappedReadBuffer.create(file));
+ this.dumpsToSkip = dumpNumber - 1;
+ this.callStack = callStack;
+ this.debugLevel = debugLevel;
+ names = new Hashtable<Long, String>();
+ threadObjects = new Hashtable<Integer, ThreadObject>(43);
+ classNameFromObjectID = new Hashtable<Long, String>();
+ if (callStack) {
+ stackFrames = new Hashtable<Long, StackFrame>(43);
+ stackTraces = new Hashtable<Integer, StackTrace>(43);
+ classNameFromSerialNo = new Hashtable<Integer, String>();
+ }
+ }
+
+ public Snapshot read() throws IOException {
+ currPos = 4; // 4 because of the magic number
+ version = readVersionHeader();
+ identifierSize = in.readInt();
+ snapshot.setIdentifierSize(identifierSize);
+ if (version >= VERSION_JDK12BETA4) {
+ snapshot.setNewStyleArrayClass(true);
+ } else {
+ snapshot.setNewStyleArrayClass(false);
+ }
+
+ currPos += 4;
+ if (identifierSize != 4 && identifierSize != 8) {
+ throw new IOException("I'm sorry, but I can't deal with an identifier size of " + identifierSize + ". I can only deal with 4 or 8.");
+ }
+ System.out.println("Dump file created " + (new Date(in.readLong())));
+ currPos += 8;
+
+ for (;;) {
+ int type;
+ try {
+ type = in.readUnsignedByte();
+ } catch (EOFException ignored) {
+ break;
+ }
+ in.readInt(); // Timestamp of this record
+ // Length of record: readInt() will return negative value for record
+ // length >2GB. so store 32bit value in long to keep it unsigned.
+ long length = in.readInt() & 0xffffffffL;
+ if (debugLevel > 0) {
+ System.out.println("Read record type " + type
+ + ", length " + length
+ + " at position " + toHex(currPos));
+ }
+ if (length < 0) {
+ throw new IOException("Bad record length of " + length
+ + " at byte " + toHex(currPos+5)
+ + " of file.");
+ }
+ currPos += 9 + length;
+ switch (type) {
+ case HPROF_UTF8: {
+ long id = readID();
+ byte[] chars = new byte[(int)length - identifierSize];
+ in.readFully(chars);
+ names.put(id, new String(chars));
+ break;
+ }
+ case HPROF_LOAD_CLASS: {
+ int serialNo = in.readInt(); // Not used
+ long classID = readID();
+ int stackTraceSerialNo = in.readInt();
+ long classNameID = readID();
+ Long classIdI = classID;
+ String nm = getNameFromID(classNameID).replace('/', '.');
+ classNameFromObjectID.put(classIdI, nm);
+ if (classNameFromSerialNo != null) {
+ classNameFromSerialNo.put(serialNo, nm);
+ }
+ break;
+ }
+
+ case HPROF_HEAP_DUMP: {
+ if (dumpsToSkip <= 0) {
+ try {
+ readHeapDump(length, currPos);
+ } catch (EOFException exp) {
+ handleEOF(exp, snapshot);
+ }
+ if (debugLevel > 0) {
+ System.out.println(" Finished processing instances in heap dump.");
+ }
+ return snapshot;
+ } else {
+ dumpsToSkip--;
+ skipBytes(length);
+ }
+ break;
+ }
+
+ case HPROF_HEAP_DUMP_END: {
+ if (version >= VERSION_JDK6) {
+ if (dumpsToSkip <= 0) {
+ skipBytes(length); // should be no-op
+ return snapshot;
+ } else {
+ // skip this dump (of the end record for a sequence of dump segments)
+ dumpsToSkip--;
+ }
+ } else {
+ // HPROF_HEAP_DUMP_END only recognized in >= 1.0.2
+ warn("Ignoring unrecognized record type " + type);
+ }
+ skipBytes(length); // should be no-op
+ break;
+ }
+
+ case HPROF_HEAP_DUMP_SEGMENT: {
+ if (version >= VERSION_JDK6) {
+ if (dumpsToSkip <= 0) {
+ try {
+ // read the dump segment
+ readHeapDump(length, currPos);
+ } catch (EOFException exp) {
+ handleEOF(exp, snapshot);
+ }
+ } else {
+ // all segments comprising the heap dump will be skipped
+ skipBytes(length);
+ }
+ } else {
+ // HPROF_HEAP_DUMP_SEGMENT only recognized in >= 1.0.2
+ warn("Ignoring unrecognized record type " + type);
+ skipBytes(length);
+ }
+ break;
+ }
+
+ case HPROF_FRAME: {
+ if (stackFrames == null) {
+ skipBytes(length);
+ } else {
+ long id = readID();
+ String methodName = getNameFromID(readID());
+ String methodSig = getNameFromID(readID());
+ String sourceFile = getNameFromID(readID());
+ int classSer = in.readInt();
+ String className = classNameFromSerialNo.get(classSer);
+ int lineNumber = in.readInt();
+ if (lineNumber < StackFrame.LINE_NUMBER_NATIVE) {
+ warn("Weird stack frame line number: " + lineNumber);
+ lineNumber = StackFrame.LINE_NUMBER_UNKNOWN;
+ }
+ stackFrames.put(id,
+ new StackFrame(methodName, methodSig,
+ className, sourceFile,
+ lineNumber));
+ }
+ break;
+ }
+ case HPROF_TRACE: {
+ if (stackTraces == null) {
+ skipBytes(length);
+ } else {
+ int serialNo = in.readInt();
+ int threadSeq = in.readInt(); // Not used
+ StackFrame[] frames = new StackFrame[in.readInt()];
+ for (int i = 0; i < frames.length; i++) {
+ long fid = readID();
+ frames[i] = stackFrames.get(fid);
+ if (frames[i] == null) {
+ throw new IOException("Stack frame " + toHex(fid) + " not found");
+ }
+ }
+ stackTraces.put(serialNo,
+ new StackTrace(frames));
+ }
+ break;
+ }
+ case HPROF_UNLOAD_CLASS:
+ case HPROF_ALLOC_SITES:
+ case HPROF_START_THREAD:
+ case HPROF_END_THREAD:
+ case HPROF_HEAP_SUMMARY:
+ case HPROF_CPU_SAMPLES:
+ case HPROF_CONTROL_SETTINGS:
+ case HPROF_LOCKSTATS_WAIT_TIME:
+ case HPROF_LOCKSTATS_HOLD_TIME:
+ {
+ // Ignore these record types
+ skipBytes(length);
+ break;
+ }
+ default: {
+ skipBytes(length);
+ warn("Ignoring unrecognized record type " + type);
+ }
+ }
+ }
+
+ return snapshot;
+ }
+
+ private void skipBytes(long length) throws IOException {
+ while (length > 0) {
+ long skipped = in.skip(length);
+ if (skipped == 0) {
+ // EOF or other problem, throw exception
+ throw new EOFException("Couldn't skip enough bytes");
+ }
+ length -= skipped;
+ }
+ }
+
+ private int readVersionHeader() throws IOException {
+ int candidatesLeft = VERSIONS.length;
+ boolean[] matched = new boolean[VERSIONS.length];
+ for (int i = 0; i < candidatesLeft; i++) {
+ matched[i] = true;
+ }
+
+ int pos = 0;
+ while (candidatesLeft > 0) {
+ char c = (char) in.readByte();
+ currPos++;
+ for (int i = 0; i < VERSIONS.length; i++) {
+ if (matched[i]) {
+ if (c != VERSIONS[i].charAt(pos)) { // Not matched
+ matched[i] = false;
+ --candidatesLeft;
+ } else if (pos == VERSIONS[i].length() - 1) { // Full match
+ return i;
+ }
+ }
+ }
+ ++pos;
+ }
+ throw new IOException("Version string not recognized at byte " + (pos+3));
+ }
+
+ private void readHeapDump(long bytesLeft, long posAtEnd) throws IOException {
+ while (bytesLeft > 0) {
+ int type = in.readUnsignedByte();
+ if (debugLevel > 0) {
+ System.out.println(" Read heap sub-record type " + type
+ + " at position "
+ + toHex(posAtEnd - bytesLeft));
+ }
+ bytesLeft--;
+ switch(type) {
+ case HPROF_GC_ROOT_UNKNOWN: {
+ long id = readID();
+ bytesLeft -= identifierSize;
+ snapshot.addRoot(new Root(id, 0, Root.UNKNOWN, ""));
+ break;
+ }
+ case HPROF_GC_ROOT_THREAD_OBJ: {
+ long id = readID();
+ int threadSeq = in.readInt();
+ int stackSeq = in.readInt();
+ bytesLeft -= identifierSize + 8;
+ threadObjects.put(threadSeq,
+ new ThreadObject(id, stackSeq));
+ break;
+ }
+ case HPROF_GC_ROOT_JNI_GLOBAL: {
+ long id = readID();
+ long globalRefId = readID(); // Ignored, for now
+ bytesLeft -= 2*identifierSize;
+ snapshot.addRoot(new Root(id, 0, Root.NATIVE_STATIC, ""));
+ break;
+ }
+ case HPROF_GC_ROOT_JNI_LOCAL: {
+ long id = readID();
+ int threadSeq = in.readInt();
+ int depth = in.readInt();
+ bytesLeft -= identifierSize + 8;
+ ThreadObject to = getThreadObjectFromSequence(threadSeq);
+ StackTrace st = getStackTraceFromSerial(to.stackSeq);
+ if (st != null) {
+ st = st.traceForDepth(depth+1);
+ }
+ snapshot.addRoot(new Root(id, to.threadId,
+ Root.NATIVE_LOCAL, "", st));
+ break;
+ }
+ case HPROF_GC_ROOT_JAVA_FRAME: {
+ long id = readID();
+ int threadSeq = in.readInt();
+ int depth = in.readInt();
+ bytesLeft -= identifierSize + 8;
+ ThreadObject to = getThreadObjectFromSequence(threadSeq);
+ StackTrace st = getStackTraceFromSerial(to.stackSeq);
+ if (st != null) {
+ st = st.traceForDepth(depth+1);
+ }
+ snapshot.addRoot(new Root(id, to.threadId,
+ Root.JAVA_LOCAL, "", st));
+ break;
+ }
+ case HPROF_GC_ROOT_NATIVE_STACK: {
+ long id = readID();
+ int threadSeq = in.readInt();
+ bytesLeft -= identifierSize + 4;
+ ThreadObject to = getThreadObjectFromSequence(threadSeq);
+ StackTrace st = getStackTraceFromSerial(to.stackSeq);
+ snapshot.addRoot(new Root(id, to.threadId,
+ Root.NATIVE_STACK, "", st));
+ break;
+ }
+ case HPROF_GC_ROOT_STICKY_CLASS: {
+ long id = readID();
+ bytesLeft -= identifierSize;
+ snapshot.addRoot(new Root(id, 0, Root.SYSTEM_CLASS, ""));
+ break;
+ }
+ case HPROF_GC_ROOT_THREAD_BLOCK: {
+ long id = readID();
+ int threadSeq = in.readInt();
+ bytesLeft -= identifierSize + 4;
+ ThreadObject to = getThreadObjectFromSequence(threadSeq);
+ StackTrace st = getStackTraceFromSerial(to.stackSeq);
+ snapshot.addRoot(new Root(id, to.threadId,
+ Root.THREAD_BLOCK, "", st));
+ break;
+ }
+ case HPROF_GC_ROOT_MONITOR_USED: {
+ long id = readID();
+ bytesLeft -= identifierSize;
+ snapshot.addRoot(new Root(id, 0, Root.BUSY_MONITOR, ""));
+ break;
+ }
+ case HPROF_GC_CLASS_DUMP: {
+ int bytesRead = readClass();
+ bytesLeft -= bytesRead;
+ break;
+ }
+ case HPROF_GC_INSTANCE_DUMP: {
+ int bytesRead = readInstance();
+ bytesLeft -= bytesRead;
+ break;
+ }
+ case HPROF_GC_OBJ_ARRAY_DUMP: {
+ long bytesRead = readArray(false);
+ bytesLeft -= bytesRead;
+ break;
+ }
+ case HPROF_GC_PRIM_ARRAY_DUMP: {
+ long bytesRead = readArray(true);
+ bytesLeft -= bytesRead;
+ break;
+ }
+ default: {
+ throw new IOException("Unrecognized heap dump sub-record type: " + type);
+ }
+ }
+ }
+ if (bytesLeft != 0) {
+ warn("Error reading heap dump or heap dump segment: Byte count is " + bytesLeft + " instead of 0");
+ skipBytes(bytesLeft);
+ }
+ if (debugLevel > 0) {
+ System.out.println(" Finished heap sub-records.");
+ }
+ }
+
+ private long readID() throws IOException {
+ return (identifierSize == 4)?
+ (Snapshot.SMALL_ID_MASK & (long)in.readInt()) : in.readLong();
+ }
+
+ //
+ // Read a java value. If result is non-null, it's expected to be an
+ // array of one element. We use it to fake multiple return values.
+ // @returns the number of bytes read
+ //
+ private int readValue(JavaThing[] resultArr) throws IOException {
+ byte type = in.readByte();
+ return 1 + readValueForType(type, resultArr);
+ }
+
+ private int readValueForType(byte type, JavaThing[] resultArr)
+ throws IOException {
+ if (version >= VERSION_JDK12BETA4) {
+ type = signatureFromTypeId(type);
+ }
+ return readValueForTypeSignature(type, resultArr);
+ }
+
+ private int readValueForTypeSignature(byte type, JavaThing[] resultArr)
+ throws IOException {
+ switch (type) {
+ case '[':
+ case 'L': {
+ long id = readID();
+ if (resultArr != null) {
+ resultArr[0] = new JavaObjectRef(id);
+ }
+ return identifierSize;
+ }
+ case 'Z': {
+ int b = in.readByte();
+ if (b != 0 && b != 1) {
+ warn("Illegal boolean value read");
+ }
+ if (resultArr != null) {
+ resultArr[0] = new JavaBoolean(b != 0);
+ }
+ return 1;
+ }
+ case 'B': {
+ byte b = in.readByte();
+ if (resultArr != null) {
+ resultArr[0] = new JavaByte(b);
+ }
+ return 1;
+ }
+ case 'S': {
+ short s = in.readShort();
+ if (resultArr != null) {
+ resultArr[0] = new JavaShort(s);
+ }
+ return 2;
+ }
+ case 'C': {
+ char ch = in.readChar();
+ if (resultArr != null) {
+ resultArr[0] = new JavaChar(ch);
+ }
+ return 2;
+ }
+ case 'I': {
+ int val = in.readInt();
+ if (resultArr != null) {
+ resultArr[0] = new JavaInt(val);
+ }
+ return 4;
+ }
+ case 'J': {
+ long val = in.readLong();
+ if (resultArr != null) {
+ resultArr[0] = new JavaLong(val);
+ }
+ return 8;
+ }
+ case 'F': {
+ float val = in.readFloat();
+ if (resultArr != null) {
+ resultArr[0] = new JavaFloat(val);
+ }
+ return 4;
+ }
+ case 'D': {
+ double val = in.readDouble();
+ if (resultArr != null) {
+ resultArr[0] = new JavaDouble(val);
+ }
+ return 8;
+ }
+ default: {
+ throw new IOException("Bad value signature: " + type);
+ }
+ }
+ }
+
+ private ThreadObject getThreadObjectFromSequence(int threadSeq)
+ throws IOException {
+ ThreadObject to = threadObjects.get(threadSeq);
+ if (to == null) {
+ throw new IOException("Thread " + threadSeq +
+ " not found for JNI local ref");
+ }
+ return to;
+ }
+
+ private String getNameFromID(long id) throws IOException {
+ return getNameFromID(Long.valueOf(id));
+ }
+
+ private String getNameFromID(Long id) throws IOException {
+ if (id.longValue() == 0L) {
+ return "";
+ }
+ String result = names.get(id);
+ if (result == null) {
+ warn("Name not found at " + toHex(id.longValue()));
+ return "unresolved name " + toHex(id.longValue());
+ }
+ return result;
+ }
+
+ private StackTrace getStackTraceFromSerial(int ser) throws IOException {
+ if (stackTraces == null) {
+ return null;
+ }
+ StackTrace result = stackTraces.get(ser);
+ if (result == null) {
+ warn("Stack trace not found for serial # " + ser);
+ }
+ return result;
+ }
+
+ //
+ // Handle a HPROF_GC_CLASS_DUMP
+ // Return number of bytes read
+ //
+ private int readClass() throws IOException {
+ long id = readID();
+ StackTrace stackTrace = getStackTraceFromSerial(in.readInt());
+ long superId = readID();
+ long classLoaderId = readID();
+ long signersId = readID();
+ long protDomainId = readID();
+ long reserved1 = readID();
+ long reserved2 = readID();
+ int instanceSize = in.readInt();
+ int bytesRead = 7 * identifierSize + 8;
+
+ int numConstPoolEntries = in.readUnsignedShort();
+ bytesRead += 2;
+ for (int i = 0; i < numConstPoolEntries; i++) {
+ int index = in.readUnsignedShort(); // unused
+ bytesRead += 2;
+ bytesRead += readValue(null); // We ignore the values
+ }
+
+ int numStatics = in.readUnsignedShort();
+ bytesRead += 2;
+ JavaThing[] valueBin = new JavaThing[1];
+ JavaStatic[] statics = new JavaStatic[numStatics];
+ for (int i = 0; i < numStatics; i++) {
+ long nameId = readID();
+ bytesRead += identifierSize;
+ byte type = in.readByte();
+ bytesRead++;
+ bytesRead += readValueForType(type, valueBin);
+ String fieldName = getNameFromID(nameId);
+ if (version >= VERSION_JDK12BETA4) {
+ type = signatureFromTypeId(type);
+ }
+ String signature = "" + ((char) type);
+ JavaField f = new JavaField(fieldName, signature);
+ statics[i] = new JavaStatic(f, valueBin[0]);
+ }
+
+ int numFields = in.readUnsignedShort();
+ bytesRead += 2;
+ JavaField[] fields = new JavaField[numFields];
+ for (int i = 0; i < numFields; i++) {
+ long nameId = readID();
+ bytesRead += identifierSize;
+ byte type = in.readByte();
+ bytesRead++;
+ String fieldName = getNameFromID(nameId);
+ if (version >= VERSION_JDK12BETA4) {
+ type = signatureFromTypeId(type);
+ }
+ String signature = "" + ((char) type);
+ fields[i] = new JavaField(fieldName, signature);
+ }
+ String name = classNameFromObjectID.get(id);
+ if (name == null) {
+ warn("Class name not found for " + toHex(id));
+ name = "unknown-name@" + toHex(id);
+ }
+ JavaClass c = new JavaClass(id, name, superId, classLoaderId, signersId,
+ protDomainId, fields, statics,
+ instanceSize);
+ snapshot.addClass(id, c);
+ snapshot.setSiteTrace(c, stackTrace);
+
+ return bytesRead;
+ }
+
+ private String toHex(long addr) {
+ return jdk.test.lib.hprof.util.Misc.toHex(addr);
+ }
+
+ //
+ // Handle a HPROF_GC_INSTANCE_DUMP
+ // Return number of bytes read
+ //
+ private int readInstance() throws IOException {
+ long start = in.position();
+ long id = readID();
+ StackTrace stackTrace = getStackTraceFromSerial(in.readInt());
+ long classID = readID();
+ int bytesFollowing = in.readInt();
+ int bytesRead = (2 * identifierSize) + 8 + bytesFollowing;
+ JavaObject jobj = new JavaObject(classID, start);
+ skipBytes(bytesFollowing);
+ snapshot.addHeapObject(id, jobj);
+ snapshot.setSiteTrace(jobj, stackTrace);
+ return bytesRead;
+ }
+
+ //
+ // Handle a HPROF_GC_OBJ_ARRAY_DUMP or HPROF_GC_PRIM_ARRAY_DUMP
+ // Return number of bytes read
+ //
+ private long readArray(boolean isPrimitive) throws IOException {
+ long start = in.position();
+ long id = readID();
+ StackTrace stackTrace = getStackTraceFromSerial(in.readInt());
+ int num = in.readInt();
+ long bytesRead = identifierSize + 8;
+ long elementClassID;
+ if (isPrimitive) {
+ elementClassID = in.readByte();
+ bytesRead++;
+ } else {
+ elementClassID = readID();
+ bytesRead += identifierSize;
+ }
+
+ // Check for primitive arrays:
+ byte primitiveSignature = 0x00;
+ int elSize = 0;
+ if (isPrimitive || version < VERSION_JDK12BETA4) {
+ switch ((int)elementClassID) {
+ case T_BOOLEAN: {
+ primitiveSignature = (byte) 'Z';
+ elSize = 1;
+ break;
+ }
+ case T_CHAR: {
+ primitiveSignature = (byte) 'C';
+ elSize = 2;
+ break;
+ }
+ case T_FLOAT: {
+ primitiveSignature = (byte) 'F';
+ elSize = 4;
+ break;
+ }
+ case T_DOUBLE: {
+ primitiveSignature = (byte) 'D';
+ elSize = 8;
+ break;
+ }
+ case T_BYTE: {
+ primitiveSignature = (byte) 'B';
+ elSize = 1;
+ break;
+ }
+ case T_SHORT: {
+ primitiveSignature = (byte) 'S';
+ elSize = 2;
+ break;
+ }
+ case T_INT: {
+ primitiveSignature = (byte) 'I';
+ elSize = 4;
+ break;
+ }
+ case T_LONG: {
+ primitiveSignature = (byte) 'J';
+ elSize = 8;
+ break;
+ }
+ }
+ if (version >= VERSION_JDK12BETA4 && primitiveSignature == 0x00) {
+ throw new IOException("Unrecognized typecode: "
+ + elementClassID);
+ }
+ }
+ if (primitiveSignature != 0x00) {
+ long size = elSize * (long)num;
+ bytesRead += size;
+ JavaValueArray va = new JavaValueArray(primitiveSignature, start);
+ skipBytes(size);
+ snapshot.addHeapObject(id, va);
+ snapshot.setSiteTrace(va, stackTrace);
+ } else {
+ long sz = (long)num * identifierSize;
+ bytesRead += sz;
+ JavaObjectArray arr = new JavaObjectArray(elementClassID, start);
+ skipBytes(sz);
+ snapshot.addHeapObject(id, arr);
+ snapshot.setSiteTrace(arr, stackTrace);
+ }
+ return bytesRead;
+ }
+
+ private byte signatureFromTypeId(byte typeId) throws IOException {
+ switch (typeId) {
+ case T_CLASS: {
+ return (byte) 'L';
+ }
+ case T_BOOLEAN: {
+ return (byte) 'Z';
+ }
+ case T_CHAR: {
+ return (byte) 'C';
+ }
+ case T_FLOAT: {
+ return (byte) 'F';
+ }
+ case T_DOUBLE: {
+ return (byte) 'D';
+ }
+ case T_BYTE: {
+ return (byte) 'B';
+ }
+ case T_SHORT: {
+ return (byte) 'S';
+ }
+ case T_INT: {
+ return (byte) 'I';
+ }
+ case T_LONG: {
+ return (byte) 'J';
+ }
+ default: {
+ throw new IOException("Invalid type id of " + typeId);
+ }
+ }
+ }
+
+ private void handleEOF(EOFException exp, Snapshot snapshot) {
+ if (debugLevel > 0) {
+ exp.printStackTrace();
+ }
+ warn("Unexpected EOF. Will miss information...");
+ // we have EOF, we have to tolerate missing references
+ snapshot.setUnresolvedObjectsOK(true);
+ }
+
+ private void warn(String msg) {
+ System.out.println("WARNING: " + msg);
+ }
+
+ //
+ // A trivial data-holder class for HPROF_GC_ROOT_THREAD_OBJ.
+ //
+ private class ThreadObject {
+
+ long threadId;
+ int stackSeq;
+
+ ThreadObject(long threadId, int stackSeq) {
+ this.threadId = threadId;
+ this.stackSeq = stackSeq;
+ }
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/parser/MappedReadBuffer.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,136 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.parser;
+
+import java.io.IOException;
+import java.io.RandomAccessFile;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.FileChannel;
+
+/**
+ * Implementation of ReadBuffer using mapped file buffer
+ *
+ * @author A. Sundararajan
+ */
+class MappedReadBuffer implements ReadBuffer {
+ private MappedByteBuffer buf;
+ private RandomAccessFile file;
+
+ MappedReadBuffer(RandomAccessFile file, MappedByteBuffer buf) {
+ this.file = file;
+ this.buf = buf;
+ }
+
+ /**
+ * Factory method to create correct ReadBuffer for a given file.
+ *
+ * The initial purpose of this method was to choose how to read hprof file for parsing
+ * depending on the size of the file and the system property 'jhat.disableFileMap':
+ * "If file size is more than 2 GB and when file mapping is configured (default),
+ * use mapped file reader".
+ *
+ * However, it has been discovered a problem with this approach.
+ * Creating java.nio.MappedByteBuffer from inside the test leads to hprof file
+ * is locked on Windows until test process dies since there is no good way to
+ * release this resource.
+ *
+ * java.nio.MappedByteBuffer will be used only if 'jhat.enableFileMap' is set to true.
+ * Per default 'jhat.enableFileMap' is not set.
+ */
+ static ReadBuffer create(RandomAccessFile file) throws IOException {
+ if (canUseFileMap()) {
+ MappedByteBuffer buf;
+ try {
+ FileChannel ch = file.getChannel();
+ long size = ch.size();
+ buf = ch.map(FileChannel.MapMode.READ_ONLY, 0, size);
+ ch.close();
+ return new MappedReadBuffer(file, buf);
+ } catch (IOException exp) {
+ exp.printStackTrace();
+ System.err.println("File mapping failed, will use direct read");
+ // fall through
+ }
+ } // else fall through
+ return new FileReadBuffer(file);
+ }
+
+ /**
+ * Set system property 'jhat.enableFileMap' to 'true' to enable file mapping.
+ */
+ private static boolean canUseFileMap() {
+ String prop = System.getProperty("jhat.enableFileMap");
+ return prop != null && prop.equals("true");
+ }
+
+ private void seek(long pos) throws IOException {
+ assert pos <= Integer.MAX_VALUE : "position overflow";
+ buf.position((int)pos);
+ }
+
+ public synchronized void get(long pos, byte[] res) throws IOException {
+ seek(pos);
+ buf.get(res);
+ }
+
+ public synchronized char getChar(long pos) throws IOException {
+ seek(pos);
+ return buf.getChar();
+ }
+
+ public synchronized byte getByte(long pos) throws IOException {
+ seek(pos);
+ return buf.get();
+ }
+
+ public synchronized short getShort(long pos) throws IOException {
+ seek(pos);
+ return buf.getShort();
+ }
+
+ public synchronized int getInt(long pos) throws IOException {
+ seek(pos);
+ return buf.getInt();
+ }
+
+ public synchronized long getLong(long pos) throws IOException {
+ seek(pos);
+ return buf.getLong();
+ }
+
+ @Override
+ public void close() throws Exception {
+ file.close();
+ }
+
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/parser/PositionDataInputStream.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.parser;
+
+import java.io.DataInputStream;
+import java.io.InputStream;
+
+/**
+ * A DataInputStream that keeps track of total bytes read
+ * (in effect 'position' in stream) so far.
+ *
+ */
+public class PositionDataInputStream extends DataInputStream {
+ public PositionDataInputStream(InputStream in) {
+ super(in instanceof PositionInputStream?
+ in : new PositionInputStream(in));
+ }
+
+ public boolean markSupported() {
+ return false;
+ }
+
+ public void mark(int readLimit) {
+ throw new UnsupportedOperationException("mark");
+ }
+
+ public void reset() {
+ throw new UnsupportedOperationException("reset");
+ }
+
+ public long position() {
+ return ((PositionInputStream)in).position();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/parser/PositionInputStream.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.parser;
+
+import java.io.FilterInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * InputStream that keeps track of total bytes read (in effect
+ * 'position' in stream) from the input stream.
+ *
+ */
+public class PositionInputStream extends FilterInputStream {
+ private long position = 0L;
+
+ public PositionInputStream(InputStream in) {
+ super(in);
+ }
+
+ public int read() throws IOException {
+ int res = super.read();
+ if (res != -1) position++;
+ return res;
+ }
+
+ public int read(byte[] b, int off, int len) throws IOException {
+ int res = super.read(b, off, len);
+ if (res != -1) position += res;
+ return res;
+ }
+
+ public long skip(long n) throws IOException {
+ long res = super.skip(n);
+ position += res;
+ return res;
+ }
+
+ public boolean markSupported() {
+ return false;
+ }
+
+ public void mark(int readLimit) {
+ throw new UnsupportedOperationException("mark");
+ }
+
+ public void reset() {
+ throw new UnsupportedOperationException("reset");
+ }
+
+ public long position() {
+ return position;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/parser/ReadBuffer.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.parser;
+
+import java.io.IOException;
+
+/**
+ * Positionable read only buffer
+ *
+ * @author A. Sundararajan
+ */
+public interface ReadBuffer extends AutoCloseable {
+ // read methods - only byte array and int primitive types.
+ // read position has to be specified always.
+ public void get(long pos, byte[] buf) throws IOException;
+ public char getChar(long pos) throws IOException;
+ public byte getByte(long pos) throws IOException;
+ public short getShort(long pos) throws IOException;
+ public int getInt(long pos) throws IOException;
+ public long getLong(long pos) throws IOException;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/parser/Reader.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.parser;
+
+import java.io.*;
+import jdk.test.lib.hprof.model.*;
+
+/**
+ * Abstract base class for reading object dump files. A reader need not be
+ * thread-safe.
+ *
+ * @author Bill Foote
+ */
+
+
+public abstract class Reader {
+ protected PositionDataInputStream in;
+
+ protected Reader(PositionDataInputStream in) {
+ this.in = in;
+ }
+
+ /**
+ * Read a snapshot from a data input stream. It is assumed that the magic
+ * number has already been read.
+ */
+ abstract public Snapshot read() throws IOException;
+
+ /**
+ * Read a snapshot from a file.
+ *
+ * @param heapFile The name of a file containing a heap dump
+ * @param callStack If true, read the call stack of allocaation sites
+ */
+ public static Snapshot readFile(String heapFile, boolean callStack,
+ int debugLevel)
+ throws IOException {
+ int dumpNumber = 1;
+ int pos = heapFile.lastIndexOf('#');
+ if (pos > -1) {
+ String num = heapFile.substring(pos+1, heapFile.length());
+ try {
+ dumpNumber = Integer.parseInt(num, 10);
+ } catch (java.lang.NumberFormatException ex) {
+ String msg = "In file name \"" + heapFile
+ + "\", a dump number was "
+ + "expected after the :, but \""
+ + num + "\" was found instead.";
+ System.err.println(msg);
+ throw new IOException(msg);
+ }
+ heapFile = heapFile.substring(0, pos);
+ }
+ try (PositionDataInputStream in = new PositionDataInputStream(
+ new BufferedInputStream(new FileInputStream(heapFile)))) {
+ int i = in.readInt();
+ if (i == HprofReader.MAGIC_NUMBER) {
+ Reader r
+ = new HprofReader(heapFile, in, dumpNumber,
+ callStack, debugLevel);
+ return r.read();
+ } else {
+ throw new IOException("Unrecognized magic number: " + i);
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/util/ArraySorter.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,147 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.util;
+import java.util.*;
+
+/**
+ * A singleton utility class that sorts an array of objects.
+ * <p>
+ * Use:
+ * <pre>
+ *
+ * Stuff[] arr = ...;
+ * ArraySorter.sort(arr, new Comparer() {
+ * public int compare(Object lhs, Object rhs) {
+ * return ((String) lhs).compareTo((String) rhs);
+ * }
+ * });
+ * </pre>
+ *
+ * @author Bill Foote
+ */
+
+public class ArraySorter {
+
+ /**
+ * Sort the given array, using c for comparison
+ **/
+ static public void sort(Object[] arr, Comparer c) {
+ quickSort(arr, c, 0, arr.length-1);
+ }
+
+
+ /**
+ * Sort an array of strings, using String.compareTo()
+ **/
+ static public void sortArrayOfStrings(Object[] arr) {
+ sort(arr, new Comparer() {
+ public int compare(Object lhs, Object rhs) {
+ return ((String) lhs).compareTo((String) rhs);
+ }
+ });
+ }
+
+
+ static private void swap(Object[] arr, int a, int b) {
+ Object tmp = arr[a];
+ arr[a] = arr[b];
+ arr[b] = tmp;
+ }
+
+ //
+ // Sorts arr between from and to, inclusive. This is a quick, off-the-top-
+ // of-my-head quicksort: I haven't put any thought into optimizing it.
+ // I _did_ put thought into making sure it's safe (it will always
+ // terminate). Worst-case it's O(n^2), but it will usually run in
+ // in O(n log n). It's well-behaved if the list is already sorted,
+ // or nearly so.
+ //
+ static private void quickSort(Object[] arr, Comparer c, int from, int to) {
+ if (to <= from)
+ return;
+ int mid = (from + to) / 2;
+ if (mid != from)
+ swap(arr, mid, from);
+ Object pivot = arr[from]; // Simple-minded, but reasonable
+ int highestBelowPivot = from - 1;
+ int low = from+1;
+ int high = to;
+ // We now move low and high toward each other, maintaining the
+ // invariants:
+ // arr[i] <= pivot for all i < low
+ // arr[i] > pivot for all i > high
+ // As long as these invariants hold, and every iteration makes
+ // progress, we are safe.
+ while (low <= high) {
+ int cmp = c.compare(arr[low], pivot);
+ if (cmp <= 0) { // arr[low] <= pivot
+ if (cmp < 0) {
+ highestBelowPivot = low;
+ }
+ low++;
+ } else {
+ int c2;
+ for (;;) {
+ // arr[high] > pivot:
+ c2 = c.compare(arr[high], pivot);
+ if (c2 > 0) {
+ high--;
+ if (low > high) {
+ break;
+ }
+ } else {
+ break;
+ }
+ }
+ // At this point, low is never == high, BTW
+ if (low <= high) {
+ swap(arr, low, high);
+ if (c2 < 0) {
+ highestBelowPivot = low;
+ }
+ low++;
+ high--;
+ }
+ }
+ }
+ // At this point, low == high+1
+ // Now we just need to sort from from..highestBelowPivot
+ // and from high+1..to
+ if (highestBelowPivot > from) {
+ // pivot == pivot, so ensure algorithm terminates
+ swap(arr, from, highestBelowPivot);
+ quickSort(arr, c, from, highestBelowPivot-1);
+ }
+ quickSort(arr, c, high+1, to);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/util/Comparer.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.util;
+
+/**
+ * Base class for comparison of two objects.
+ * @see VectorSorter
+ *
+ * @author Bill Foote
+ */
+
+abstract public class Comparer {
+
+ /**
+ * @return a number <, == or > 0 depending on lhs compared to rhs
+ * @see java.lang.String.compareTo
+ **/
+ abstract public int compare(Object lhs, Object rhs);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/util/CompositeEnumeration.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.util;
+
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+import jdk.test.lib.hprof.model.JavaHeapObject;
+
+public class CompositeEnumeration implements Enumeration<JavaHeapObject> {
+ Enumeration<JavaHeapObject> e1;
+ Enumeration<JavaHeapObject> e2;
+
+ public CompositeEnumeration(Enumeration<JavaHeapObject> e1, Enumeration<JavaHeapObject> e2) {
+ this.e1 = e1;
+ this.e2 = e2;
+ }
+
+ public boolean hasMoreElements() {
+ return e1.hasMoreElements() || e2.hasMoreElements();
+ }
+
+ public JavaHeapObject nextElement() {
+ if (e1.hasMoreElements()) {
+ return e1.nextElement();
+ }
+
+ if (e2.hasMoreElements()) {
+ return e2.nextElement();
+ }
+
+ throw new NoSuchElementException();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/util/Misc.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.util;
+import java.util.*;
+
+/**
+ * Miscellaneous functions I couldn't think of a good place to put.
+ *
+ * @author Bill Foote
+ */
+
+
+public class Misc {
+
+ private static char[] digits = { '0', '1', '2', '3', '4', '5', '6', '7',
+ '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+
+ public final static String toHex(int addr) {
+ char[] buf = new char[8];
+ int i = 0;
+ for (int s = 28; s >= 0; s -= 4) {
+ buf[i++] = digits[(addr >> s) & 0xf];
+ }
+ return "0x" + new String(buf);
+ }
+
+ public final static String toHex(long addr) {
+ return "0x" + Long.toHexString(addr);
+ }
+
+ public final static long parseHex(String value) {
+ long result = 0;
+ if (value.length() < 2 || value.charAt(0) != '0' ||
+ value.charAt(1) != 'x') {
+ return -1L;
+ }
+ for(int i = 2; i < value.length(); i++) {
+ result *= 16;
+ char ch = value.charAt(i);
+ if (ch >= '0' && ch <= '9') {
+ result += (ch - '0');
+ } else if (ch >= 'a' && ch <= 'f') {
+ result += (ch - 'a') + 10;
+ } else if (ch >= 'A' && ch <= 'F') {
+ result += (ch - 'A') + 10;
+ } else {
+ throw new NumberFormatException("" + ch
+ + " is not a valid hex digit");
+ }
+ }
+ return result;
+ }
+
+ public static String encodeHtml(String str) {
+ final int len = str.length();
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < len; i++) {
+ char ch = str.charAt(i);
+ if (ch == '<') {
+ sb.append("<");
+ } else if (ch == '>') {
+ sb.append(">");
+ } else if (ch == '"') {
+ sb.append(""");
+ } else if (ch == '\'') {
+ sb.append("'");
+ } else if (ch == '&') {
+ sb.append("&");
+ } else if (ch < ' ') {
+ sb.append("&#").append((int)ch).append(';');
+ } else {
+ int c = (ch & 0xFFFF);
+ if (c > 127) {
+ sb.append("&#").append(c).append(';');
+ } else {
+ sb.append(ch);
+ }
+ }
+ }
+ return sb.toString();
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/hprof/util/VectorSorter.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+
+/*
+ * The Original Code is HAT. The Initial Developer of the
+ * Original Code is Bill Foote, with contributions from others
+ * at JavaSoft/Sun.
+ */
+
+package jdk.test.lib.hprof.util;
+import java.util.*;
+
+/**
+ * A singleton utility class that sorts a vector.
+ * <p>
+ * Use:
+ * <pre>
+ *
+ * Vector v = <a vector of, say, String objects>;
+ * VectorSorter.sort(v, new Comparer() {
+ * public int compare(Object lhs, Object rhs) {
+ * return ((String) lhs).compareTo((String) rhs);
+ * }
+ * });
+ * </pre>
+ *
+ * @author Bill Foote
+ */
+
+
+public class VectorSorter {
+
+ /**
+ * Sort the given vector, using c for comparison
+ **/
+ static public void sort(Vector<Object> v, Comparer c) {
+ quickSort(v, c, 0, v.size()-1);
+ }
+
+
+ /**
+ * Sort a vector of strings, using String.compareTo()
+ **/
+ static public void sortVectorOfStrings(Vector<Object> v) {
+ sort(v, new Comparer() {
+ public int compare(Object lhs, Object rhs) {
+ return ((String) lhs).compareTo((String) rhs);
+ }
+ });
+ }
+
+
+ static private void swap(Vector<Object> v, int a, int b) {
+ Object tmp = v.elementAt(a);
+ v.setElementAt(v.elementAt(b), a);
+ v.setElementAt(tmp, b);
+ }
+
+ //
+ // Sorts v between from and to, inclusive. This is a quick, off-the-top-
+ // of-my-head quicksort: I haven't put any thought into optimizing it.
+ // I _did_ put thought into making sure it's safe (it will always
+ // terminate). Worst-case it's O(n^2), but it will usually run in
+ // in O(n log n). It's well-behaved if the list is already sorted,
+ // or nearly so.
+ //
+ static private void quickSort(Vector<Object> v, Comparer c, int from, int to) {
+ if (to <= from)
+ return;
+ int mid = (from + to) / 2;
+ if (mid != from)
+ swap(v, mid, from);
+ Object pivot = v.elementAt(from);
+ // Simple-minded, but reasonable
+ int highestBelowPivot = from - 1;
+ int low = from+1;
+ int high = to;
+ // We now move low and high toward eachother, maintaining the
+ // invariants:
+ // v[i] <= pivot for all i < low
+ // v[i] > pivot for all i > high
+ // As long as these invariants hold, and every iteration makes
+ // progress, we are safe.
+ while (low <= high) {
+ int cmp = c.compare(v.elementAt(low), pivot);
+ if (cmp <= 0) { // v[low] <= pivot
+ if (cmp < 0) {
+ highestBelowPivot = low;
+ }
+ low++;
+ } else {
+ int c2;
+ for (;;) {
+ c2 = c.compare(v.elementAt(high), pivot);
+ // v[high] > pivot:
+ if (c2 > 0) {
+ high--;
+ if (low > high) {
+ break;
+ }
+ } else {
+ break;
+ }
+ }
+ // At this point, low is never == high
+ if (low <= high) {
+ swap(v, low, high);
+ if (c2 < 0) {
+ highestBelowPivot = low;
+ }
+ low++;
+ high--;
+ }
+ }
+ }
+ // Now we just need to sort from from..highestBelowPivot
+ // and from high+1..to
+ if (highestBelowPivot > from) {
+ // pivot == pivot, so ensure algorithm terminates
+ swap(v, from, highestBelowPivot);
+ quickSort(v, c, from, highestBelowPivot-1);
+ }
+ quickSort(v, c, high+1, to);
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/process/ExitCode.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib.process;
+
+/**
+ * Exit code values that could be returned by the JVM.
+ */
+public enum ExitCode {
+ OK(0),
+ FAIL(1),
+ CRASH(134);
+
+ public final int value;
+
+ ExitCode(int value) {
+ this.value = value;
+ }
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/process/OutputAnalyzer.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,436 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib.process;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class OutputAnalyzer {
+
+ private final String stdout;
+ private final String stderr;
+ private final int exitValue;
+
+ /**
+ * Create an OutputAnalyzer, a utility class for verifying output and exit
+ * value from a Process
+ *
+ * @param process Process to analyze
+ * @throws IOException If an I/O error occurs.
+ */
+ public OutputAnalyzer(Process process) throws IOException {
+ OutputBuffer output = ProcessTools.getOutput(process);
+ exitValue = process.exitValue();
+ this.stdout = output.getStdout();
+ this.stderr = output.getStderr();
+ }
+
+ /**
+ * Create an OutputAnalyzer, a utility class for verifying output
+ *
+ * @param buf String buffer to analyze
+ */
+ public OutputAnalyzer(String buf) {
+ this(buf, buf);
+ }
+
+ /**
+ * Create an OutputAnalyzer, a utility class for verifying output
+ *
+ * @param stdout stdout buffer to analyze
+ * @param stderr stderr buffer to analyze
+ */
+ public OutputAnalyzer(String stdout, String stderr) {
+ this.stdout = stdout;
+ this.stderr = stderr;
+ exitValue = -1;
+ }
+
+ /**
+ * Verify that the stdout contents of output buffer is empty
+ *
+ * @throws RuntimeException
+ * If stdout was not empty
+ */
+ public void stdoutShouldBeEmpty() {
+ if (!getStdout().isEmpty()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("stdout was not empty");
+ }
+ }
+
+ /**
+ * Verify that the stderr contents of output buffer is empty
+ *
+ * @throws RuntimeException
+ * If stderr was not empty
+ */
+ public void stderrShouldBeEmpty() {
+ if (!getStderr().isEmpty()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("stderr was not empty");
+ }
+ }
+
+ /**
+ * Verify that the stdout contents of output buffer is not empty
+ *
+ * @throws RuntimeException
+ * If stdout was empty
+ */
+ public void stdoutShouldNotBeEmpty() {
+ if (getStdout().isEmpty()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("stdout was empty");
+ }
+ }
+
+ /**
+ * Verify that the stderr contents of output buffer is not empty
+ *
+ * @throws RuntimeException
+ * If stderr was empty
+ */
+ public void stderrShouldNotBeEmpty() {
+ if (getStderr().isEmpty()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("stderr was empty");
+ }
+ }
+
+ /**
+ * Verify that the stdout and stderr contents of output buffer contains the string
+ *
+ * @param expectedString String that buffer should contain
+ * @throws RuntimeException If the string was not found
+ */
+ public OutputAnalyzer shouldContain(String expectedString) {
+ if (!stdout.contains(expectedString) && !stderr.contains(expectedString)) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stdout contents of output buffer contains the string
+ *
+ * @param expectedString String that buffer should contain
+ * @throws RuntimeException If the string was not found
+ */
+ public OutputAnalyzer stdoutShouldContain(String expectedString) {
+ if (!stdout.contains(expectedString)) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + expectedString + "' missing from stdout \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stderr contents of output buffer contains the string
+ *
+ * @param expectedString String that buffer should contain
+ * @throws RuntimeException If the string was not found
+ */
+ public OutputAnalyzer stderrShouldContain(String expectedString) {
+ if (!stderr.contains(expectedString)) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + expectedString + "' missing from stderr \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stdout and stderr contents of output buffer does not contain the string
+ *
+ * @param expectedString String that the buffer should not contain
+ * @throws RuntimeException If the string was found
+ */
+ public OutputAnalyzer shouldNotContain(String notExpectedString) {
+ if (stdout.contains(notExpectedString)) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
+ }
+ if (stderr.contains(notExpectedString)) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stdout contents of output buffer does not contain the string
+ *
+ * @param expectedString String that the buffer should not contain
+ * @throws RuntimeException If the string was found
+ */
+ public OutputAnalyzer stdoutShouldNotContain(String notExpectedString) {
+ if (stdout.contains(notExpectedString)) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stderr contents of output buffer does not contain the string
+ *
+ * @param expectedString String that the buffer should not contain
+ * @throws RuntimeException If the string was found
+ */
+ public OutputAnalyzer stderrShouldNotContain(String notExpectedString) {
+ if (stderr.contains(notExpectedString)) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stdout and stderr contents of output buffer matches
+ * the pattern
+ *
+ * @param pattern
+ * @throws RuntimeException If the pattern was not found
+ */
+ public OutputAnalyzer shouldMatch(String pattern) {
+ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
+ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+ if (!stdoutMatcher.find() && !stderrMatcher.find()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+ + "' missing from stdout/stderr \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stdout contents of output buffer matches the
+ * pattern
+ *
+ * @param pattern
+ * @throws RuntimeException If the pattern was not found
+ */
+ public OutputAnalyzer stdoutShouldMatch(String pattern) {
+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
+ if (!matcher.find()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+ + "' missing from stdout \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stderr contents of output buffer matches the
+ * pattern
+ *
+ * @param pattern
+ * @throws RuntimeException If the pattern was not found
+ */
+ public OutputAnalyzer stderrShouldMatch(String pattern) {
+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+ if (!matcher.find()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+ + "' missing from stderr \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stdout and stderr contents of output buffer does not
+ * match the pattern
+ *
+ * @param pattern
+ * @throws RuntimeException If the pattern was found
+ */
+ public OutputAnalyzer shouldNotMatch(String pattern) {
+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
+ if (matcher.find()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+ + "' found in stdout: '" + matcher.group() + "' \n");
+ }
+ matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+ if (matcher.find()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+ + "' found in stderr: '" + matcher.group() + "' \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stdout contents of output buffer does not match the
+ * pattern
+ *
+ * @param pattern
+ * @throws RuntimeException If the pattern was found
+ */
+ public OutputAnalyzer stdoutShouldNotMatch(String pattern) {
+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
+ if (matcher.find()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+ + "' found in stdout \n");
+ }
+ return this;
+ }
+
+ /**
+ * Verify that the stderr contents of output buffer does not match the
+ * pattern
+ *
+ * @param pattern
+ * @throws RuntimeException If the pattern was found
+ */
+ public OutputAnalyzer stderrShouldNotMatch(String pattern) {
+ Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+ if (matcher.find()) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("'" + pattern
+ + "' found in stderr \n");
+ }
+ return this;
+ }
+
+ /**
+ * Get the captured group of the first string matching the pattern.
+ * stderr is searched before stdout.
+ *
+ * @param pattern The multi-line pattern to match
+ * @param group The group to capture
+ * @return The matched string or null if no match was found
+ */
+ public String firstMatch(String pattern, int group) {
+ Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
+ Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
+ if (stderrMatcher.find()) {
+ return stderrMatcher.group(group);
+ }
+ if (stdoutMatcher.find()) {
+ return stdoutMatcher.group(group);
+ }
+ return null;
+ }
+
+ /**
+ * Get the first string matching the pattern.
+ * stderr is searched before stdout.
+ *
+ * @param pattern The multi-line pattern to match
+ * @return The matched string or null if no match was found
+ */
+ public String firstMatch(String pattern) {
+ return firstMatch(pattern, 0);
+ }
+
+ /**
+ * Verify the exit value of the process
+ *
+ * @param expectedExitValue Expected exit value from process
+ * @throws RuntimeException If the exit value from the process did not match the expected value
+ */
+ public OutputAnalyzer shouldHaveExitValue(int expectedExitValue) {
+ if (getExitValue() != expectedExitValue) {
+ reportDiagnosticSummary();
+ throw new RuntimeException("Expected to get exit value of ["
+ + expectedExitValue + "]\n");
+ }
+ return this;
+ }
+
+
+ /**
+ * Report summary that will help to diagnose the problem
+ * Currently includes:
+ * - standard input produced by the process under test
+ * - standard output
+ * - exit code
+ * Note: the command line is printed by the ProcessTools
+ */
+ public void reportDiagnosticSummary() {
+ String msg =
+ " stdout: [" + stdout + "];\n" +
+ " stderr: [" + stderr + "]\n" +
+ " exitValue = " + getExitValue() + "\n";
+
+ System.err.println(msg);
+ }
+
+
+ /**
+ * Get the contents of the output buffer (stdout and stderr)
+ *
+ * @return Content of the output buffer
+ */
+ public String getOutput() {
+ return stdout + stderr;
+ }
+
+ /**
+ * Get the contents of the stdout buffer
+ *
+ * @return Content of the stdout buffer
+ */
+ public String getStdout() {
+ return stdout;
+ }
+
+ /**
+ * Get the contents of the stderr buffer
+ *
+ * @return Content of the stderr buffer
+ */
+ public String getStderr() {
+ return stderr;
+ }
+
+ /**
+ * Get the process exit value
+ *
+ * @return Process exit value
+ */
+ public int getExitValue() {
+ return exitValue;
+ }
+
+ /**
+ * Get the contents of the output buffer (stdout and stderr) as list of strings.
+ * Output will be split by newlines.
+ *
+ * @return Contents of the output buffer as list of strings
+ */
+ public List<String> asLines() {
+ return asLines(getOutput());
+ }
+
+ private List<String> asLines(String buffer) {
+ return Arrays.asList(buffer.split("(\\r\\n|\\n|\\r)"));
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/process/OutputBuffer.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib.process;
+
+public class OutputBuffer {
+ private final String stdout;
+ private final String stderr;
+
+ /**
+ * Create an OutputBuffer, a class for storing and managing stdout and stderr
+ * results separately
+ *
+ * @param stdout stdout result
+ * @param stderr stderr result
+ */
+ public OutputBuffer(String stdout, String stderr) {
+ this.stdout = stdout;
+ this.stderr = stderr;
+ }
+
+ /**
+ * Returns the stdout result
+ *
+ * @return stdout result
+ */
+ public String getStdout() {
+ return stdout;
+ }
+
+ /**
+ * Returns the stderr result
+ *
+ * @return stderr result
+ */
+ public String getStderr() {
+ return stderr;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/process/ProcessTools.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,617 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib.process;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.lang.management.ManagementFactory;
+import java.lang.management.RuntimeMXBean;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.concurrent.CountDownLatch;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Predicate;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import jdk.test.lib.JDKToolFinder;
+import jdk.test.lib.Platform;
+import jdk.test.lib.Utils;
+
+public final class ProcessTools {
+ private static final class LineForwarder extends StreamPumper.LinePump {
+ private final PrintStream ps;
+ private final String prefix;
+ LineForwarder(String prefix, PrintStream os) {
+ this.ps = os;
+ this.prefix = prefix;
+ }
+ @Override
+ protected void processLine(String line) {
+ ps.println("[" + prefix + "] " + line);
+ }
+ }
+
+ private ProcessTools() {
+ }
+
+ /**
+ * Pumps stdout and stderr from running the process into a String.
+ *
+ * @param processHandler ProcessHandler to run.
+ * @return Output from process.
+ * @throws IOException If an I/O error occurs.
+ */
+ public static OutputBuffer getOutput(ProcessBuilder processBuilder) throws IOException {
+ return getOutput(processBuilder.start());
+ }
+
+ /**
+ * Pumps stdout and stderr the running process into a String.
+ *
+ * @param process Process to pump.
+ * @return Output from process.
+ * @throws IOException If an I/O error occurs.
+ */
+ public static OutputBuffer getOutput(Process process) throws IOException {
+ ByteArrayOutputStream stderrBuffer = new ByteArrayOutputStream();
+ ByteArrayOutputStream stdoutBuffer = new ByteArrayOutputStream();
+ StreamPumper outPumper = new StreamPumper(process.getInputStream(), stdoutBuffer);
+ StreamPumper errPumper = new StreamPumper(process.getErrorStream(), stderrBuffer);
+ Thread outPumperThread = new Thread(outPumper);
+ Thread errPumperThread = new Thread(errPumper);
+
+ outPumperThread.setDaemon(true);
+ errPumperThread.setDaemon(true);
+
+ outPumperThread.start();
+ errPumperThread.start();
+
+ try {
+ process.waitFor();
+ outPumperThread.join();
+ errPumperThread.join();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return null;
+ }
+
+ return new OutputBuffer(stdoutBuffer.toString(), stderrBuffer.toString());
+ }
+
+ /**
+ * <p>Starts a process from its builder.</p>
+ * <span>The default redirects of STDOUT and STDERR are started</span>
+ * @param name The process name
+ * @param processBuilder The process builder
+ * @return Returns the initialized process
+ * @throws IOException
+ */
+ public static Process startProcess(String name,
+ ProcessBuilder processBuilder)
+ throws IOException {
+ return startProcess(name, processBuilder, (Consumer<String>)null);
+ }
+
+ /**
+ * <p>Starts a process from its builder.</p>
+ * <span>The default redirects of STDOUT and STDERR are started</span>
+ * <p>It is possible to monitor the in-streams via the provided {@code consumer}
+ * @param name The process name
+ * @param consumer {@linkplain Consumer} instance to process the in-streams
+ * @param processBuilder The process builder
+ * @return Returns the initialized process
+ * @throws IOException
+ */
+ @SuppressWarnings("overloads")
+ public static Process startProcess(String name,
+ ProcessBuilder processBuilder,
+ Consumer<String> consumer)
+ throws IOException {
+ try {
+ return startProcess(name, processBuilder, consumer, null, -1, TimeUnit.NANOSECONDS);
+ } catch (InterruptedException | TimeoutException e) {
+ // will never happen
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * <p>Starts a process from its builder.</p>
+ * <span>The default redirects of STDOUT and STDERR are started</span>
+ * <p>
+ * It is possible to wait for the process to get to a warmed-up state
+ * via {@linkplain Predicate} condition on the STDOUT
+ * </p>
+ * @param name The process name
+ * @param processBuilder The process builder
+ * @param linePredicate The {@linkplain Predicate} to use on the STDOUT
+ * Used to determine the moment the target app is
+ * properly warmed-up.
+ * It can be null - in that case the warmup is skipped.
+ * @param timeout The timeout for the warmup waiting; -1 = no wait; 0 = wait forever
+ * @param unit The timeout {@linkplain TimeUnit}
+ * @return Returns the initialized {@linkplain Process}
+ * @throws IOException
+ * @throws InterruptedException
+ * @throws TimeoutException
+ */
+ public static Process startProcess(String name,
+ ProcessBuilder processBuilder,
+ final Predicate<String> linePredicate,
+ long timeout,
+ TimeUnit unit)
+ throws IOException, InterruptedException, TimeoutException {
+ return startProcess(name, processBuilder, null, linePredicate, timeout, unit);
+ }
+
+ /**
+ * <p>Starts a process from its builder.</p>
+ * <span>The default redirects of STDOUT and STDERR are started</span>
+ * <p>
+ * It is possible to wait for the process to get to a warmed-up state
+ * via {@linkplain Predicate} condition on the STDOUT and monitor the
+ * in-streams via the provided {@linkplain Consumer}
+ * </p>
+ * @param name The process name
+ * @param processBuilder The process builder
+ * @param lineConsumer The {@linkplain Consumer} the lines will be forwarded to
+ * @param linePredicate The {@linkplain Predicate} to use on the STDOUT
+ * Used to determine the moment the target app is
+ * properly warmed-up.
+ * It can be null - in that case the warmup is skipped.
+ * @param timeout The timeout for the warmup waiting; -1 = no wait; 0 = wait forever
+ * @param unit The timeout {@linkplain TimeUnit}
+ * @return Returns the initialized {@linkplain Process}
+ * @throws IOException
+ * @throws InterruptedException
+ * @throws TimeoutException
+ */
+ public static Process startProcess(String name,
+ ProcessBuilder processBuilder,
+ final Consumer<String> lineConsumer,
+ final Predicate<String> linePredicate,
+ long timeout,
+ TimeUnit unit)
+ throws IOException, InterruptedException, TimeoutException {
+ System.out.println("["+name+"]:" + processBuilder.command().stream().collect(Collectors.joining(" ")));
+ Process p = processBuilder.start();
+ StreamPumper stdout = new StreamPumper(p.getInputStream());
+ StreamPumper stderr = new StreamPumper(p.getErrorStream());
+
+ stdout.addPump(new LineForwarder(name, System.out));
+ stderr.addPump(new LineForwarder(name, System.err));
+ if (lineConsumer != null) {
+ StreamPumper.LinePump pump = new StreamPumper.LinePump() {
+ @Override
+ protected void processLine(String line) {
+ lineConsumer.accept(line);
+ }
+ };
+ stdout.addPump(pump);
+ stderr.addPump(pump);
+ }
+
+
+ CountDownLatch latch = new CountDownLatch(1);
+ if (linePredicate != null) {
+ StreamPumper.LinePump pump = new StreamPumper.LinePump() {
+ @Override
+ protected void processLine(String line) {
+ if (latch.getCount() > 0 && linePredicate.test(line)) {
+ latch.countDown();
+ }
+ }
+ };
+ stdout.addPump(pump);
+ stderr.addPump(pump);
+ } else {
+ latch.countDown();
+ }
+ final Future<Void> stdoutTask = stdout.process();
+ final Future<Void> stderrTask = stderr.process();
+
+ try {
+ if (timeout > -1) {
+ if (timeout == 0) {
+ latch.await();
+ } else {
+ if (!latch.await(Utils.adjustTimeout(timeout), unit)) {
+ throw new TimeoutException();
+ }
+ }
+ }
+ } catch (TimeoutException | InterruptedException e) {
+ System.err.println("Failed to start a process (thread dump follows)");
+ for(Map.Entry<Thread, StackTraceElement[]> s : Thread.getAllStackTraces().entrySet()) {
+ printStack(s.getKey(), s.getValue());
+ }
+
+ if (p.isAlive()) {
+ p.destroyForcibly();
+ }
+
+ stdoutTask.cancel(true);
+ stderrTask.cancel(true);
+ throw e;
+ }
+
+ return new ProcessImpl(p, stdoutTask, stderrTask);
+ }
+
+ /**
+ * <p>Starts a process from its builder.</p>
+ * <span>The default redirects of STDOUT and STDERR are started</span>
+ * <p>
+ * It is possible to wait for the process to get to a warmed-up state
+ * via {@linkplain Predicate} condition on the STDOUT. The warm-up will
+ * wait indefinitely.
+ * </p>
+ * @param name The process name
+ * @param processBuilder The process builder
+ * @param linePredicate The {@linkplain Predicate} to use on the STDOUT
+ * Used to determine the moment the target app is
+ * properly warmed-up.
+ * It can be null - in that case the warmup is skipped.
+ * @return Returns the initialized {@linkplain Process}
+ * @throws IOException
+ * @throws InterruptedException
+ * @throws TimeoutException
+ */
+ @SuppressWarnings("overloads")
+ public static Process startProcess(String name,
+ ProcessBuilder processBuilder,
+ final Predicate<String> linePredicate)
+ throws IOException, InterruptedException, TimeoutException {
+ return startProcess(name, processBuilder, linePredicate, 0, TimeUnit.SECONDS);
+ }
+
+ /**
+ * Get the process id of the current running Java process
+ *
+ * @return Process id
+ */
+ public static long getProcessId() throws Exception {
+ return ProcessHandle.current().getPid();
+ }
+ /**
+ * Gets the array of strings containing input arguments passed to the VM
+ *
+ * @return arguments
+ */
+ public static String[] getVmInputArgs() {
+ RuntimeMXBean runtime = ManagementFactory.getRuntimeMXBean();
+ List<String> args = runtime.getInputArguments();
+ return args.toArray(new String[args.size()]);
+ }
+
+ /**
+ * Get platform specific VM arguments (e.g. -d64 on 64bit Solaris)
+ *
+ * @return String[] with platform specific arguments, empty if there are
+ * none
+ */
+ public static String[] getPlatformSpecificVMArgs() {
+
+ if (Platform.is64bit() && Platform.isSolaris()) {
+ return new String[] { "-d64" };
+ }
+
+ return new String[] {};
+ }
+
+
+ /**
+ * Create ProcessBuilder using the java launcher from the jdk to be tested and
+ * with any platform specific arguments prepended
+ */
+ public static ProcessBuilder createJavaProcessBuilder(String... command) throws Exception {
+ return createJavaProcessBuilder(false, command);
+ }
+
+ /**
+ * Create ProcessBuilder using the java launcher from the jdk to be tested,
+ * and with any platform specific arguments prepended.
+ *
+ * @param addTestVmAndJavaOptions If true, adds test.vm.opts and test.java.opts
+ * to the java arguments.
+ * @param command Arguments to pass to the java command.
+ * @return The ProcessBuilder instance representing the java command.
+ */
+ public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmAndJavaOptions, String... command) throws Exception {
+ String javapath = JDKToolFinder.getJDKTool("java");
+
+ ArrayList<String> args = new ArrayList<>();
+ args.add(javapath);
+ Collections.addAll(args, getPlatformSpecificVMArgs());
+
+ args.add("-cp");
+ args.add(System.getProperty("java.class.path"));
+
+ if (addTestVmAndJavaOptions) {
+ Collections.addAll(args, Utils.getTestJavaOpts());
+ }
+
+ Collections.addAll(args, command);
+
+ // Reporting
+ StringBuilder cmdLine = new StringBuilder();
+ for (String cmd : args)
+ cmdLine.append(cmd).append(' ');
+ System.out.println("Command line: [" + cmdLine.toString() + "]");
+
+ return new ProcessBuilder(args.toArray(new String[args.size()]));
+ }
+
+ private static void printStack(Thread t, StackTraceElement[] stack) {
+ System.out.println("\t" + t +
+ " stack: (length = " + stack.length + ")");
+ if (t != null) {
+ for (StackTraceElement stack1 : stack) {
+ System.out.println("\t" + stack1);
+ }
+ System.out.println();
+ }
+ }
+
+ /**
+ * Executes a test jvm process, waits for it to finish and returns the process output.
+ * The default jvm options from the test's run command, jtreg, test.vm.opts and test.java.opts, are added.
+ * The java from the test.jdk is used to execute the command.
+ *
+ * The command line will be like:
+ * {test.jdk}/bin/java {test.fromRun.opts} {test.vm.opts} {test.java.opts} cmds
+ *
+ * @param cmds User specifed arguments.
+ * @return The output from the process.
+ */
+ public static OutputAnalyzer executeTestJvmAllArgs(String... cmds) throws Throwable {
+ List<String> argsList = new ArrayList<>();
+ String[] testArgs = getVmInputArgs();
+ Collections.addAll(argsList, testArgs);
+ Collections.addAll(argsList, Utils.addTestJavaOpts(cmds));
+ ProcessBuilder pb = createJavaProcessBuilder(argsList.toArray(new String[argsList.size()]));
+ return executeProcess(pb);
+ }
+
+ /**
+ * Executes a test jvm process, waits for it to finish and returns the process output.
+ * The default jvm options from jtreg, test.vm.opts and test.java.opts, are added.
+ * The java from the test.jdk is used to execute the command.
+ *
+ * The command line will be like:
+ * {test.jdk}/bin/java {test.vm.opts} {test.java.opts} cmds
+ *
+ * The jvm process will have exited before this method returns.
+ *
+ * @param cmds User specifed arguments.
+ * @return The output from the process.
+ */
+ public static OutputAnalyzer executeTestJvm(String... cmds) throws Exception {
+ ProcessBuilder pb = createJavaProcessBuilder(Utils.addTestJavaOpts(cmds));
+ return executeProcess(pb);
+ }
+
+ /**
+ * Executes a process, waits for it to finish and returns the process output.
+ * The process will have exited before this method returns.
+ * @param pb The ProcessBuilder to execute.
+ * @return The {@linkplain OutputAnalyzer} instance wrapping the process.
+ */
+ public static OutputAnalyzer executeProcess(ProcessBuilder pb) throws Exception {
+ OutputAnalyzer output = null;
+ Process p = null;
+ boolean failed = false;
+ try {
+ p = pb.start();
+ output = new OutputAnalyzer(p);
+ p.waitFor();
+
+ return output;
+ } catch (Throwable t) {
+ if (p != null) {
+ p.destroyForcibly().waitFor();
+ }
+
+ failed = true;
+ System.out.println("executeProcess() failed: " + t);
+ throw t;
+ } finally {
+ if (failed) {
+ System.err.println(getProcessLog(pb, output));
+ }
+ }
+ }
+
+ /**
+ * Executes a process, waits for it to finish and returns the process output.
+ *
+ * The process will have exited before this method returns.
+ *
+ * @param cmds The command line to execute.
+ * @return The output from the process.
+ */
+ public static OutputAnalyzer executeProcess(String... cmds) throws Throwable {
+ return executeProcess(new ProcessBuilder(cmds));
+ }
+
+ /**
+ * Used to log command line, stdout, stderr and exit code from an executed process.
+ * @param pb The executed process.
+ * @param output The output from the process.
+ */
+ public static String getProcessLog(ProcessBuilder pb, OutputAnalyzer output) {
+ String stderr = output == null ? "null" : output.getStderr();
+ String stdout = output == null ? "null" : output.getStdout();
+ String exitValue = output == null ? "null": Integer.toString(output.getExitValue());
+ StringBuilder logMsg = new StringBuilder();
+ final String nl = System.getProperty("line.separator");
+ logMsg.append("--- ProcessLog ---" + nl);
+ logMsg.append("cmd: " + getCommandLine(pb) + nl);
+ logMsg.append("exitvalue: " + exitValue + nl);
+ logMsg.append("stderr: " + stderr + nl);
+ logMsg.append("stdout: " + stdout + nl);
+
+ return logMsg.toString();
+ }
+
+ /**
+ * @return The full command line for the ProcessBuilder.
+ */
+ public static String getCommandLine(ProcessBuilder pb) {
+ if (pb == null) {
+ return "null";
+ }
+ StringBuilder cmd = new StringBuilder();
+ for (String s : pb.command()) {
+ cmd.append(s).append(" ");
+ }
+ return cmd.toString().trim();
+ }
+
+ /**
+ * Executes a process, waits for it to finish, prints the process output
+ * to stdout, and returns the process output.
+ *
+ * The process will have exited before this method returns.
+ *
+ * @param cmds The command line to execute.
+ * @return The {@linkplain OutputAnalyzer} instance wrapping the process.
+ */
+ public static OutputAnalyzer executeCommand(String... cmds)
+ throws Throwable {
+ String cmdLine = Arrays.stream(cmds).collect(Collectors.joining(" "));
+ System.out.println("Command line: [" + cmdLine + "]");
+ OutputAnalyzer analyzer = ProcessTools.executeProcess(cmds);
+ System.out.println(analyzer.getOutput());
+ return analyzer;
+ }
+
+ /**
+ * Executes a process, waits for it to finish, prints the process output
+ * to stdout and returns the process output.
+ *
+ * The process will have exited before this method returns.
+ *
+ * @param pb The ProcessBuilder to execute.
+ * @return The {@linkplain OutputAnalyzer} instance wrapping the process.
+ */
+ public static OutputAnalyzer executeCommand(ProcessBuilder pb)
+ throws Throwable {
+ String cmdLine = pb.command().stream().collect(Collectors.joining(" "));
+ System.out.println("Command line: [" + cmdLine + "]");
+ OutputAnalyzer analyzer = ProcessTools.executeProcess(pb);
+ System.out.println(analyzer.getOutput());
+ return analyzer;
+ }
+
+ private static class ProcessImpl extends Process {
+
+ private final Process p;
+ private final Future<Void> stdoutTask;
+ private final Future<Void> stderrTask;
+
+ public ProcessImpl(Process p, Future<Void> stdoutTask, Future<Void> stderrTask) {
+ this.p = p;
+ this.stdoutTask = stdoutTask;
+ this.stderrTask = stderrTask;
+ }
+
+ @Override
+ public OutputStream getOutputStream() {
+ return p.getOutputStream();
+ }
+
+ @Override
+ public InputStream getInputStream() {
+ return p.getInputStream();
+ }
+
+ @Override
+ public InputStream getErrorStream() {
+ return p.getErrorStream();
+ }
+
+ @Override
+ public int waitFor() throws InterruptedException {
+ int rslt = p.waitFor();
+ waitForStreams();
+ return rslt;
+ }
+
+ @Override
+ public int exitValue() {
+ return p.exitValue();
+ }
+
+ @Override
+ public void destroy() {
+ p.destroy();
+ }
+
+ @Override
+ public long getPid() {
+ return p.getPid();
+ }
+
+ @Override
+ public boolean isAlive() {
+ return p.isAlive();
+ }
+
+ @Override
+ public Process destroyForcibly() {
+ return p.destroyForcibly();
+ }
+
+ @Override
+ public boolean waitFor(long timeout, TimeUnit unit) throws InterruptedException {
+ boolean rslt = p.waitFor(timeout, unit);
+ if (rslt) {
+ waitForStreams();
+ }
+ return rslt;
+ }
+
+ private void waitForStreams() throws InterruptedException {
+ try {
+ stdoutTask.get();
+ } catch (ExecutionException e) {
+ }
+ try {
+ stderrTask.get();
+ } catch (ExecutionException e) {
+ }
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/process/StreamPumper.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,197 @@
+/*
+ * Copyright (c) 2013, 2016, 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 jdk.test.lib.process;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public final class StreamPumper implements Runnable {
+
+ private static final int BUF_SIZE = 256;
+
+ /**
+ * Pump will be called by the StreamPumper to process the incoming data
+ */
+ abstract public static class Pump {
+ abstract void register(StreamPumper d);
+ }
+
+ /**
+ * OutputStream -> Pump adapter
+ */
+ final public static class StreamPump extends Pump {
+ private final OutputStream out;
+ public StreamPump(OutputStream out) {
+ this.out = out;
+ }
+
+ @Override
+ void register(StreamPumper sp) {
+ sp.addOutputStream(out);
+ }
+ }
+
+ /**
+ * Used to process the incoming data line-by-line
+ */
+ abstract public static class LinePump extends Pump {
+ @Override
+ final void register(StreamPumper sp) {
+ sp.addLineProcessor(this);
+ }
+
+ abstract protected void processLine(String line);
+ }
+
+ private final InputStream in;
+ private final Set<OutputStream> outStreams = new HashSet<>();
+ private final Set<LinePump> linePumps = new HashSet<>();
+
+ private final AtomicBoolean processing = new AtomicBoolean(false);
+ private final FutureTask<Void> processingTask = new FutureTask<>(this, null);
+
+ public StreamPumper(InputStream in) {
+ this.in = in;
+ }
+
+ /**
+ * Create a StreamPumper that reads from in and writes to out.
+ *
+ * @param in The stream to read from.
+ * @param out The stream to write to.
+ */
+ public StreamPumper(InputStream in, OutputStream out) {
+ this(in);
+ this.addOutputStream(out);
+ }
+
+ /**
+ * Implements Thread.run(). Continuously read from {@code in} and write to
+ * {@code out} until {@code in} has reached end of stream. Abort on
+ * interruption. Abort on IOExceptions.
+ */
+ @Override
+ public void run() {
+ try (BufferedInputStream is = new BufferedInputStream(in)) {
+ ByteArrayOutputStream lineBos = new ByteArrayOutputStream();
+ byte[] buf = new byte[BUF_SIZE];
+ int len = 0;
+ int linelen = 0;
+
+ while ((len = is.read(buf)) > 0 && !Thread.interrupted()) {
+ for(OutputStream out : outStreams) {
+ out.write(buf, 0, len);
+ }
+ if (!linePumps.isEmpty()) {
+ int i = 0;
+ int lastcrlf = -1;
+ while (i < len) {
+ if (buf[i] == '\n' || buf[i] == '\r') {
+ int bufLinelen = i - lastcrlf - 1;
+ if (bufLinelen > 0) {
+ lineBos.write(buf, lastcrlf + 1, bufLinelen);
+ }
+ linelen += bufLinelen;
+
+ if (linelen > 0) {
+ lineBos.flush();
+ final String line = lineBos.toString();
+ linePumps.stream().forEach((lp) -> {
+ lp.processLine(line);
+ });
+ lineBos.reset();
+ linelen = 0;
+ }
+ lastcrlf = i;
+ }
+
+ i++;
+ }
+ if (lastcrlf == -1) {
+ lineBos.write(buf, 0, len);
+ linelen += len;
+ } else if (lastcrlf < len - 1) {
+ lineBos.write(buf, lastcrlf + 1, len - lastcrlf - 1);
+ linelen += len - lastcrlf - 1;
+ }
+ }
+ }
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ } finally {
+ for(OutputStream out : outStreams) {
+ try {
+ out.flush();
+ } catch (IOException e) {}
+ }
+ try {
+ in.close();
+ } catch (IOException e) {}
+ }
+ }
+
+ final void addOutputStream(OutputStream out) {
+ outStreams.add(out);
+ }
+
+ final void addLineProcessor(LinePump lp) {
+ linePumps.add(lp);
+ }
+
+ final public StreamPumper addPump(Pump ... pump) {
+ if (processing.get()) {
+ throw new IllegalStateException("Can not modify pumper while " +
+ "processing is in progress");
+ }
+ for(Pump p : pump) {
+ p.register(this);
+ }
+ return this;
+ }
+
+ final public Future<Void> process() {
+ if (!processing.compareAndSet(false, true)) {
+ throw new IllegalStateException("Can not re-run the processing");
+ }
+ Thread t = new Thread(new Runnable() {
+ @Override
+ public void run() {
+ processingTask.run();
+ }
+ });
+ t.setDaemon(true);
+ t.start();
+
+ return processingTask;
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/util/Pair.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.util;
+
+import java.util.Objects;
+
+/**
+ * Pair - a two element tuple
+ *
+ * @param <F> first type
+ * @param <S> second type
+ */
+public class Pair<F, S> {
+ public final F first;
+ public final S second;
+
+ public Pair(F first, S second) {
+ this.first = first;
+ this.second = second;
+ }
+
+ @Override
+ public String toString() {
+ return "(" + first + ":" + second + ")";
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other instanceof Pair<?, ?>) {
+ Pair<?, ?> otherPair = (Pair<?, ?>) other;
+ return Objects.equals(first, otherPair.first) &&
+ Objects.equals(second, otherPair.second);
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ if (first == null) {
+ return (second == null) ? 0 : second.hashCode();
+ } else if (second == null) {
+ return first.hashCode();
+ } else {
+ return first.hashCode() * 17 + second.hashCode();
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/util/Triple.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2015, 2016, 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 jdk.test.lib.util;
+
+import java.util.Objects;
+
+/**
+ * Triple - a three element tuple
+ *
+ * @param <F> first element type
+ * @param <S> second element type
+ * @param <T> third element type
+ */
+public class Triple<F, S, T> {
+ private final Pair<F, Pair<S, T>> container;
+
+ /**
+ * Constructor
+ *
+ * @param first first element of the triple
+ * @param second second element of the triple
+ * @param third third element of the triple
+ */
+ public Triple(F first, S second, T third) {
+ container = new Pair<>(first, new Pair<>(second, third));
+ }
+
+ /**
+ * Gets first element of the triple
+ */
+ public F getFirst() {
+ return container.first;
+ }
+
+ /**
+ * Gets second element of the triple
+ */
+ public S getSecond() {
+ return container.second.first;
+ }
+
+ /**
+ * Gets third element of the triple
+ */
+ public T getThird() {
+ return container.second.second;
+ }
+
+ @Override
+ public int hashCode() {
+ return container.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof Triple<?, ?, ?>) {
+ Triple<?, ?, ?> objTriple = (Triple<?, ?, ?>) obj;
+ return Objects.equals(container.first, objTriple.container.first)
+ && Objects.equals(container.second,
+ objTriple.container.second);
+ }
+ return false;
+ }
+
+ @Override
+ public String toString() {
+ return "(" + getFirst() + " : " + getSecond() + " : " + getThird() + ")";
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/wrappers/InfiniteLoop.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib.wrappers;
+
+import java.util.Objects;
+
+/**
+ * Class which runs another Runnable in infinite loop with certain pauses
+ * between cycles.
+ */
+public class InfiniteLoop implements Runnable {
+ private final Runnable target;
+ private final long mills;
+
+
+ /**
+ * @param target a target to run in a loop
+ * @param mills the length of pause time in milliseconds
+ * @throws NullPointerException if target is null
+ * @throws IllegalArgumentException if the value of millis is negative
+ */
+ public InfiniteLoop(Runnable target, long mills) {
+ Objects.requireNonNull(target);
+ if (mills < 0) {
+ throw new IllegalArgumentException("mills < 0");
+ }
+ this.target = target;
+ this.mills = mills;
+ }
+
+ @Override
+ public void run() {
+ try {
+ while (true) {
+ target.run();
+ if (mills > 0) {
+ Thread.sleep(mills);
+ }
+ }
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new Error(e);
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/lib/jdk/test/lib/wrappers/TimeLimitedRunner.java Mon Sep 12 22:04:48 2016 +0000
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2014, 2016, 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 jdk.test.lib.wrappers;
+
+import java.util.Objects;
+import java.util.concurrent.Callable;
+
+/**
+ * Auxiliary class to run target w/ given timeout.
+ */
+public class TimeLimitedRunner implements Callable<Void> {
+ private final long stoptime;
+ private final long timeout;
+ private final double factor;
+ private final Callable<Boolean> target;
+
+ /**
+ * @param timeout a timeout. zero means no time limitation
+ * @param factor a multiplier used to estimate next iteration time
+ * @param target a target to run
+ * @throws NullPointerException if target is null
+ * @throws IllegalArgumentException if timeout is negative or
+ factor isn't positive
+ */
+ public TimeLimitedRunner(long timeout, double factor,
+ Callable<Boolean> target) {
+ Objects.requireNonNull(target, "target must not be null");
+ if (timeout < 0) {
+ throw new IllegalArgumentException("timeout[" + timeout + "] < 0");
+ }
+ if (factor <= 0d) {
+ throw new IllegalArgumentException("factor[" + factor + "] <= 0");
+ }
+ this.stoptime = System.currentTimeMillis() + timeout;
+ this.timeout = timeout;
+ this.factor = factor;
+ this.target = target;
+ }
+
+ /**
+ * Runs @{linkplan target} while it returns true and timeout isn't exceeded
+ */
+ @Override
+ public Void call() throws Exception {
+ long maxDuration = 0L;
+ long iterStart = System.currentTimeMillis();
+ if (timeout != 0 && iterStart > stoptime) {
+ return null;
+ }
+ while (target.call()) {
+ if (timeout != 0) {
+ long iterDuration = System.currentTimeMillis() - iterStart;
+ maxDuration = Math.max(maxDuration, iterDuration);
+ iterStart = System.currentTimeMillis();
+ if (iterStart + (maxDuration * factor) > stoptime) {
+ System.out.println("Not enough time to continue execution. "
+ + "Interrupted.");
+ break;
+ }
+ }
+ }
+ return null;
+ }
+
+}
--- a/test/lib/share/classes/jdk/test/lib/Asserts.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,620 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.util.Objects;
-
-/**
- * Asserts that can be used for verifying assumptions in tests.
- *
- * An assertion will throw a {@link RuntimeException} if the assertion isn't true.
- * All the asserts can be imported into a test by using a static import:
- *
- * <pre>
- * {@code
- * import static jdk.testlibrary.Asserts.*;
- * }
- *
- * Always provide a message describing the assumption if the line number of the
- * failing assertion isn't enough to understand why the assumption failed. For
- * example, if the assertion is in a loop or in a method that is called
- * multiple times, then the line number won't provide enough context to
- * understand the failure.
- * </pre>
- */
-public class Asserts {
-
- /**
- * Shorthand for {@link #assertLessThan(Comparable, Comparable)}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertLessThan(Comparable, Comparable)
- */
- public static <T extends Comparable<T>> void assertLT(T lhs, T rhs) {
- assertLessThan(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertLessThan(Comparable, Comparable, String)}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @see #assertLessThan(Comparable, Comparable, String)
- */
- public static <T extends Comparable<T>> void assertLT(T lhs, T rhs, String msg) {
- assertLessThan(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertLessThan(Comparable, Comparable, String)} with a default message.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertLessThan(Comparable, Comparable, String)
- */
- public static <T extends Comparable<T>> void assertLessThan(T lhs, T rhs) {
- assertLessThan(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is less than {@code rhs}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static <T extends Comparable<T>>void assertLessThan(T lhs, T rhs, String msg) {
- if (!(compare(lhs, rhs, msg) < 0)) {
- msg = Objects.toString(msg, "assertLessThan")
- + ": expected that " + Objects.toString(lhs)
- + " < " + Objects.toString(rhs);
- fail(msg);
- }
- }
-
- /**
- * Shorthand for {@link #assertLessThanOrEqual(Comparable, Comparable)}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertLessThanOrEqual(Comparable, Comparable)
- */
- public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs) {
- assertLessThanOrEqual(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertLessThanOrEqual(Comparable, Comparable, String)}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @see #assertLessThanOrEqual(Comparable, Comparable, String)
- */
- public static <T extends Comparable<T>> void assertLTE(T lhs, T rhs, String msg) {
- assertLessThanOrEqual(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertLessThanOrEqual(Comparable, Comparable, String)} with a default message.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertLessThanOrEqual(Comparable, Comparable, String)
- */
- public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs) {
- assertLessThanOrEqual(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is less than or equal to {@code rhs}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static <T extends Comparable<T>> void assertLessThanOrEqual(T lhs, T rhs, String msg) {
- if (!(compare(lhs, rhs, msg) <= 0)) {
- msg = Objects.toString(msg, "assertLessThanOrEqual")
- + ": expected that " + Objects.toString(lhs)
- + " <= " + Objects.toString(rhs);
- fail(msg);
- }
- }
-
- /**
- * Shorthand for {@link #assertEquals(Object, Object)}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertEquals(Object, Object)
- */
- public static void assertEQ(Object lhs, Object rhs) {
- assertEquals(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertEquals(Object, Object, String)}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @see #assertEquals(Object, Object, String)
- */
- public static void assertEQ(Object lhs, Object rhs, String msg) {
- assertEquals(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertEquals(java.lang.Object, java.lang.Object, java.lang.String)} with a default message.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertEquals(Object, Object, String)
- */
- public static void assertEquals(Object lhs, Object rhs) {
- assertEquals(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is equal to {@code rhs}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static void assertEquals(Object lhs, Object rhs, String msg) {
- if ((lhs != rhs) && ((lhs == null) || !(lhs.equals(rhs)))) {
- msg = Objects.toString(msg, "assertEquals")
- + ": expected " + Objects.toString(lhs)
- + " to equal " + Objects.toString(rhs);
- fail(msg);
- }
- }
-
- /**
- * Calls {@link #assertSame(java.lang.Object, java.lang.Object, java.lang.String)} with a default message.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertSame(Object, Object, String)
- */
- public static void assertSame(Object lhs, Object rhs) {
- assertSame(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is the same as {@code rhs}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static void assertSame(Object lhs, Object rhs, String msg) {
- if (lhs != rhs) {
- msg = Objects.toString(msg, "assertSame")
- + ": expected " + Objects.toString(lhs)
- + " to equal " + Objects.toString(rhs);
- fail(msg);
- }
- }
-
- /**
- * Shorthand for {@link #assertGreaterThanOrEqual(Comparable, Comparable)}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertGreaterThanOrEqual(Comparable, Comparable)
- */
- public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs) {
- assertGreaterThanOrEqual(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertGreaterThanOrEqual(Comparable, Comparable, String)}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @see #assertGreaterThanOrEqual(Comparable, Comparable, String)
- */
- public static <T extends Comparable<T>> void assertGTE(T lhs, T rhs, String msg) {
- assertGreaterThanOrEqual(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertGreaterThanOrEqual(Comparable, Comparable, String)} with a default message.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertGreaterThanOrEqual(Comparable, Comparable, String)
- */
- public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs) {
- assertGreaterThanOrEqual(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is greater than or equal to {@code rhs}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static <T extends Comparable<T>> void assertGreaterThanOrEqual(T lhs, T rhs, String msg) {
- if (!(compare(lhs, rhs, msg) >= 0)) {
- msg = Objects.toString(msg, "assertGreaterThanOrEqual")
- + ": expected " + Objects.toString(lhs)
- + " >= " + Objects.toString(rhs);
- fail(msg);
- }
- }
-
- /**
- * Shorthand for {@link #assertGreaterThan(Comparable, Comparable)}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertGreaterThan(Comparable, Comparable)
- */
- public static <T extends Comparable<T>> void assertGT(T lhs, T rhs) {
- assertGreaterThan(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertGreaterThan(Comparable, Comparable, String)}.
- *
- * @param <T> a type
- * @param lhs the left hand value
- * @param rhs the right hand value
- * @param msg A description of the assumption; {@code null} for a default message.
- * @see #assertGreaterThan(Comparable, Comparable, String)
- */
- public static <T extends Comparable<T>> void assertGT(T lhs, T rhs, String msg) {
- assertGreaterThan(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertGreaterThan(Comparable, Comparable, String)} with a default message.
- *
- * @param <T> a type
- * @param lhs the left hand value
- * @param rhs the right hand value
- * @see #assertGreaterThan(Comparable, Comparable, String)
- */
- public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs) {
- assertGreaterThan(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is greater than {@code rhs}.
- *
- * @param <T> a type
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static <T extends Comparable<T>> void assertGreaterThan(T lhs, T rhs, String msg) {
- if (!(compare(lhs, rhs, msg) > 0)) {
- msg = Objects.toString(msg, "assertGreaterThan")
- + ": expected " + Objects.toString(lhs)
- + " > " + Objects.toString(rhs);
- fail(msg);
- }
- }
-
- /**
- * Shorthand for {@link #assertNotEquals(Object, Object)}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertNotEquals(Object, Object)
- */
- public static void assertNE(Object lhs, Object rhs) {
- assertNotEquals(lhs, rhs);
- }
-
- /**
- * Shorthand for {@link #assertNotEquals(Object, Object, String)}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @see #assertNotEquals(Object, Object, String)
- */
- public static void assertNE(Object lhs, Object rhs, String msg) {
- assertNotEquals(lhs, rhs, msg);
- }
-
- /**
- * Calls {@link #assertNotEquals(Object, Object, String)} with a default message.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @see #assertNotEquals(Object, Object, String)
- */
- public static void assertNotEquals(Object lhs, Object rhs) {
- assertNotEquals(lhs, rhs, null);
- }
-
- /**
- * Asserts that {@code lhs} is not equal to {@code rhs}.
- *
- * @param lhs The left hand side of the comparison.
- * @param rhs The right hand side of the comparison.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static void assertNotEquals(Object lhs, Object rhs, String msg) {
- if ((lhs == rhs) || (lhs != null && lhs.equals(rhs))) {
- msg = Objects.toString(msg, "assertNotEquals")
- + ": expected " + Objects.toString(lhs)
- + " to not equal " + Objects.toString(rhs);
- fail(msg);
- }
- }
-
- /**
- * Calls {@link #assertNull(Object, String)} with a default message.
- *
- * @param o The reference assumed to be null.
- * @see #assertNull(Object, String)
- */
- public static void assertNull(Object o) {
- assertNull(o, null);
- }
-
- /**
- * Asserts that {@code o} is null.
- *
- * @param o The reference assumed to be null.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static void assertNull(Object o, String msg) {
- assertEquals(o, null, msg);
- }
-
- /**
- * Calls {@link #assertNotNull(Object, String)} with a default message.
- *
- * @param o The reference assumed <i>not</i> to be null,
- * @see #assertNotNull(Object, String)
- */
- public static void assertNotNull(Object o) {
- assertNotNull(o, null);
- }
-
- /**
- * Asserts that {@code o} is <i>not</i> null.
- *
- * @param o The reference assumed <i>not</i> to be null,
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static void assertNotNull(Object o, String msg) {
- assertNotEquals(o, null, msg);
- }
-
- /**
- * Calls {@link #assertFalse(boolean, String)} with a default message.
- *
- * @param value The value assumed to be false.
- * @see #assertFalse(boolean, String)
- */
- public static void assertFalse(boolean value) {
- assertFalse(value, null);
- }
-
- /**
- * Asserts that {@code value} is {@code false}.
- *
- * @param value The value assumed to be false.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static void assertFalse(boolean value, String msg) {
- if (value) {
- msg = Objects.toString(msg, "assertFalse")
- + ": expected false, was true";
- fail(msg);
- }
- }
-
- /**
- * Calls {@link #assertTrue(boolean, String)} with a default message.
- *
- * @param value The value assumed to be true.
- * @see #assertTrue(boolean, String)
- */
- public static void assertTrue(boolean value) {
- assertTrue(value, null);
- }
-
- /**
- * Asserts that {@code value} is {@code true}.
- *
- * @param value The value assumed to be true.
- * @param msg A description of the assumption; {@code null} for a default message.
- * @throws RuntimeException if the assertion is not true.
- */
- public static void assertTrue(boolean value, String msg) {
- if (!value) {
- msg = Objects.toString(msg, "assertTrue")
- + ": expected true, was false";
- fail(msg);
- }
- }
-
- private static <T extends Comparable<T>> int compare(T lhs, T rhs, String msg) {
- if (lhs == null || rhs == null) {
- fail(lhs, rhs, msg + ": values must be non-null:", ",");
- }
- return lhs.compareTo(rhs);
- }
-
-/**
- * Asserts that two strings are equal.
- *
- * If strings are not equals, then exception message
- * will contain {@code msg} followed by list of mismatched lines.
- *
- * @param str1 First string to compare.
- * @param str2 Second string to compare.
- * @param msg A description of the assumption.
- * @throws RuntimeException if strings are not equal.
- */
- public static void assertStringsEqual(String str1, String str2,
- String msg) {
- String lineSeparator = System.getProperty("line.separator");
- String str1Lines[] = str1.split(lineSeparator);
- String str2Lines[] = str2.split(lineSeparator);
-
- int minLength = Math.min(str1Lines.length, str2Lines.length);
- String longestStringLines[] = ((str1Lines.length == minLength) ?
- str2Lines : str1Lines);
-
- boolean stringsAreDifferent = false;
-
- StringBuilder messageBuilder = new StringBuilder(msg);
-
- messageBuilder.append("\n");
-
- for (int line = 0; line < minLength; line++) {
- if (!str1Lines[line].equals(str2Lines[line])) {
- messageBuilder.append(String.
- format("[line %d] '%s' differs " +
- "from '%s'\n",
- line,
- str1Lines[line],
- str2Lines[line]));
- stringsAreDifferent = true;
- }
- }
-
- if (minLength < longestStringLines.length) {
- String stringName = ((longestStringLines == str1Lines) ?
- "first" : "second");
- messageBuilder.append(String.format("Only %s string contains " +
- "following lines:\n",
- stringName));
- stringsAreDifferent = true;
- for(int line = minLength; line < longestStringLines.length; line++) {
- messageBuilder.append(String.
- format("[line %d] '%s'", line,
- longestStringLines[line]));
- }
- }
-
- if (stringsAreDifferent) {
- fail(messageBuilder.toString());
- }
- }
-
- /**
- * Returns a string formatted with a message and expected and actual values.
- * @param lhs the actual value
- * @param rhs the expected value
- * @param message the actual value
- * @param relation the asserted relationship between lhs and rhs
- * @return a formatted string
- */
- public static String format(Object lhs, Object rhs, String message, String relation) {
- StringBuilder sb = new StringBuilder(80);
- if (message != null) {
- sb.append(message);
- sb.append(' ');
- }
- sb.append("<");
- sb.append(Objects.toString(lhs));
- sb.append("> ");
- sb.append(Objects.toString(relation, ","));
- sb.append(" <");
- sb.append(Objects.toString(rhs));
- sb.append(">");
- return sb.toString();
- }
-
- /**
- * Fail reports a failure with message fail.
- *
- * @throws RuntimeException always
- */
- public static void fail() {
- fail("fail");
- }
-
- /**
- * Fail reports a failure with a message.
- * @param message for the failure
- * @throws RuntimeException always
- */
- public static void fail(String message) {
- throw new RuntimeException(message);
- }
-
- /**
- * Fail reports a failure with a formatted message.
- *
- * @param lhs the actual value
- * @param rhs the expected value
- * @param message to be format before the expected and actual values
- * @param relation the asserted relationship between lhs and rhs
- * @throws RuntimeException always
- */
- public static void fail(Object lhs, Object rhs, String message, String relation) {
- throw new RuntimeException(format(lhs, rhs, message, relation));
- }
-
- /**
- * Fail reports a failure with a message and a cause.
- * @param message to be format before the expected and actual values
- * @param cause the exception that caused this failure
- * @throws RuntimeException always
- */
- public static void fail(String message, Throwable cause) {
- throw new RuntimeException(message, cause);
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/JDKToolFinder.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.io.FileNotFoundException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-public final class JDKToolFinder {
-
- private JDKToolFinder() {
- }
-
- /**
- * Returns the full path to an executable in jdk/bin based on System
- * property {@code test.jdk} or {@code compile.jdk} (both are set by the jtreg test suite)
- *
- * @return Full path to an executable in jdk/bin
- */
- public static String getJDKTool(String tool) {
-
- // First try to find the executable in test.jdk
- try {
- return getTool(tool, "test.jdk");
- } catch (FileNotFoundException e) {
-
- }
-
- // Now see if it's available in compile.jdk
- try {
- return getTool(tool, "compile.jdk");
- } catch (FileNotFoundException e) {
- throw new RuntimeException("Failed to find " + tool +
- ", looked in test.jdk (" + System.getProperty("test.jdk") +
- ") and compile.jdk (" + System.getProperty("compile.jdk") + ")");
- }
- }
-
- /**
- * Returns the full path to an executable in jdk/bin based on System
- * property {@code compile.jdk}
- *
- * @return Full path to an executable in jdk/bin
- */
- public static String getCompileJDKTool(String tool) {
- try {
- return getTool(tool, "compile.jdk");
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * Returns the full path to an executable in jdk/bin based on System
- * property {@code test.jdk}
- *
- * @return Full path to an executable in jdk/bin
- */
- public static String getTestJDKTool(String tool) {
- try {
- return getTool(tool, "test.jdk");
- } catch (FileNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
-
- private static String getTool(String tool, String property) throws FileNotFoundException {
- String jdkPath = System.getProperty(property);
-
- if (jdkPath == null) {
- throw new RuntimeException(
- "System property '" + property + "' not set. This property is normally set by jtreg. "
- + "When running test separately, set this property using '-D" + property + "=/path/to/jdk'.");
- }
-
- Path toolName = Paths.get("bin", tool + (Platform.isWindows() ? ".exe" : ""));
-
- Path jdkTool = Paths.get(jdkPath, toolName.toString());
- if (!jdkTool.toFile().exists()) {
- throw new FileNotFoundException("Could not find file " + jdkTool.toAbsolutePath());
- }
-
- return jdkTool.toAbsolutePath().toString();
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/JDKToolLauncher.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import jdk.test.lib.process.*;
-
-/**
- * A utility for constructing command lines for starting JDK tool processes.
- *
- * The JDKToolLauncher can in particular be combined with a
- * java.lang.ProcessBuilder to easily run a JDK tool. For example, the following
- * code run {@code jmap -heap} against a process with GC logging turned on for
- * the {@code jmap} process:
- *
- * <pre>
- * {@code
- * JDKToolLauncher jmap = JDKToolLauncher.create("jmap")
- * .addVMArg("-XX:+PrintGC");
- * .addVMArg("-XX:+PrintGCDetails")
- * .addToolArg("-heap")
- * .addToolArg(pid);
- * ProcessBuilder pb = new ProcessBuilder(jmap.getCommand());
- * Process p = pb.start();
- * }
- * </pre>
- */
-public class JDKToolLauncher {
- private final String executable;
- private final List<String> vmArgs = new ArrayList<String>();
- private final List<String> toolArgs = new ArrayList<String>();
-
- private JDKToolLauncher(String tool, boolean useCompilerJDK) {
- if (useCompilerJDK) {
- executable = JDKToolFinder.getJDKTool(tool);
- } else {
- executable = JDKToolFinder.getTestJDKTool(tool);
- }
- vmArgs.addAll(Arrays.asList(ProcessTools.getPlatformSpecificVMArgs()));
- }
-
- /**
- * Creates a new JDKToolLauncher for the specified tool. Using tools path
- * from the compiler JDK.
- *
- * @param tool
- * The name of the tool
- * @return A new JDKToolLauncher
- */
- public static JDKToolLauncher create(String tool) {
- return new JDKToolLauncher(tool, true);
- }
-
- /**
- * Creates a new JDKToolLauncher for the specified tool in the Tested JDK.
- *
- * @param tool
- * The name of the tool
- *
- * @return A new JDKToolLauncher
- */
- public static JDKToolLauncher createUsingTestJDK(String tool) {
- return new JDKToolLauncher(tool, false);
- }
-
- /**
- * Adds an argument to the JVM running the tool.
- *
- * The JVM arguments are passed to the underlying JVM running the tool.
- * Arguments will automatically be prepended with "-J".
- *
- * Any platform specific arguments required for running the tool are
- * automatically added.
- *
- *
- * @param arg
- * The argument to VM running the tool
- * @return The JDKToolLauncher instance
- */
- public JDKToolLauncher addVMArg(String arg) {
- vmArgs.add(arg);
- return this;
- }
-
- /**
- * Adds an argument to the tool.
- *
- * @param arg
- * The argument to the tool
- * @return The JDKToolLauncher instance
- */
- public JDKToolLauncher addToolArg(String arg) {
- toolArgs.add(arg);
- return this;
- }
-
- /**
- * Returns the command that can be used for running the tool.
- *
- * @return An array whose elements are the arguments of the command.
- */
- public String[] getCommand() {
- List<String> command = new ArrayList<String>();
- command.add(executable);
- // Add -J in front of all vmArgs
- for (String arg : vmArgs) {
- command.add("-J" + arg);
- }
- command.addAll(toolArgs);
- return command.toArray(new String[command.size()]);
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/Platform.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,219 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.util.regex.Pattern;
-
-public class Platform {
- public static final String vmName = System.getProperty("java.vm.name");
- public static final String vmInfo = System.getProperty("java.vm.info");
- private static final String osName = System.getProperty("os.name");
- private static final String dataModel = System.getProperty("sun.arch.data.model");
- private static final String vmVersion = System.getProperty("java.vm.version");
- private static final String javaVersion = System.getProperty("java.version");
- private static final String osArch = System.getProperty("os.arch");
- private static final String userName = System.getProperty("user.name");
- private static final String compiler = System.getProperty("sun.management.compiler");
-
- public static boolean isClient() {
- return vmName.endsWith(" Client VM");
- }
-
- public static boolean isServer() {
- return vmName.endsWith(" Server VM");
- }
-
- public static boolean isGraal() {
- return vmName.endsWith(" Graal VM");
- }
-
- public static boolean isZero() {
- return vmName.endsWith(" Zero VM");
- }
-
- public static boolean isMinimal() {
- return vmName.endsWith(" Minimal VM");
- }
-
- public static boolean isEmbedded() {
- return vmName.contains("Embedded");
- }
-
- public static boolean isTieredSupported() {
- return compiler.contains("Tiered Compilers");
- }
-
- public static boolean isInt() {
- return vmInfo.contains("interpreted");
- }
-
- public static boolean isMixed() {
- return vmInfo.contains("mixed");
- }
-
- public static boolean isComp() {
- return vmInfo.contains("compiled");
- }
-
- public static boolean is32bit() {
- return dataModel.equals("32");
- }
-
- public static boolean is64bit() {
- return dataModel.equals("64");
- }
-
- public static boolean isAix() {
- return isOs("aix");
- }
-
- public static boolean isLinux() {
- return isOs("linux");
- }
-
- public static boolean isOSX() {
- return isOs("mac");
- }
-
- public static boolean isSolaris() {
- return isOs("sunos");
- }
-
- public static boolean isWindows() {
- return isOs("win");
- }
-
- private static boolean isOs(String osname) {
- return osName.toLowerCase().startsWith(osname.toLowerCase());
- }
-
- public static String getOsName() {
- return osName;
- }
-
- public static boolean isDebugBuild() {
- return (vmVersion.toLowerCase().contains("debug") ||
- javaVersion.toLowerCase().contains("debug"));
- }
-
- public static String getVMVersion() {
- return vmVersion;
- }
-
- // Returns true for sparc and sparcv9.
- public static boolean isSparc() {
- return isArch("sparc.*");
- }
-
- public static boolean isARM() {
- return isArch("arm.*");
- }
-
- public static boolean isPPC() {
- return isArch("ppc.*");
- }
-
- public static boolean isX86() {
- // On Linux it's 'i386', Windows 'x86' without '_64' suffix.
- return isArch("(i386)|(x86(?!_64))");
- }
-
- public static boolean isX64() {
- // On OSX it's 'x86_64' and on other (Linux, Windows and Solaris) platforms it's 'amd64'
- return isArch("(amd64)|(x86_64)");
- }
-
- public static boolean isAArch64() {
- return isArch("aarch64");
- }
-
- public static String getOsArch() {
- return osArch;
- }
-
- /**
- * Return a boolean for whether we expect to be able to attach
- * the SA to our own processes on this system.
- */
- public static boolean shouldSAAttach() throws Exception {
-
- if (isAix()) {
- return false; // SA not implemented.
- } else if (isLinux()) {
- return canPtraceAttachLinux();
- } else if (isOSX()) {
- return canAttachOSX();
- } else {
- // Other platforms expected to work:
- return true;
- }
- }
-
- /**
- * On Linux, first check the SELinux boolean "deny_ptrace" and return false
- * as we expect to be denied if that is "1". Then expect permission to attach
- * if we are root, so return true. Then return false for an expected denial
- * if "ptrace_scope" is 1, and true otherwise.
- */
- public static boolean canPtraceAttachLinux() throws Exception {
-
- // SELinux deny_ptrace:
- String deny_ptrace = Utils.fileAsString("/sys/fs/selinux/booleans/deny_ptrace");
- if (deny_ptrace != null && deny_ptrace.contains("1")) {
- // ptrace will be denied:
- return false;
- }
-
- // YAMA enhanced security ptrace_scope:
- // 0 - a process can PTRACE_ATTACH to any other process running under the same uid
- // 1 - restricted ptrace: a process must be a children of the inferior or user is root
- // 2 - only processes with CAP_SYS_PTRACE may use ptrace or user is root
- // 3 - no attach: no processes may use ptrace with PTRACE_ATTACH
- String ptrace_scope = Utils.fileAsString("/proc/sys/kernel/yama/ptrace_scope");
- if (ptrace_scope != null) {
- if (ptrace_scope.startsWith("3")) {
- return false;
- }
- if (!userName.equals("root") && !ptrace_scope.startsWith("0")) {
- // ptrace will be denied:
- return false;
- }
- }
- // Otherwise expect to be permitted:
- return true;
- }
-
- /**
- * On OSX, expect permission to attach only if we are root.
- */
- public static boolean canAttachOSX() throws Exception {
- return userName.equals("root");
- }
-
- private static boolean isArch(String archnameRE) {
- return Pattern.compile(archnameRE, Pattern.CASE_INSENSITIVE)
- .matcher(osArch)
- .matches();
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/Utils.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,640 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.net.InetAddress;
-import java.net.MalformedURLException;
-import java.net.ServerSocket;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.UnknownHostException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Random;
-import java.util.function.BooleanSupplier;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import jdk.internal.misc.Unsafe;
-
-import jdk.test.lib.process.*;
-import static jdk.test.lib.Asserts.assertTrue;
-
-/**
- * Common library for various test helper functions.
- */
-public final class Utils {
-
- /**
- * Returns the value of 'test.class.path' system property.
- */
- public static final String TEST_CLASS_PATH = System.getProperty("test.class.path", ".");
-
- /**
- * Returns the sequence used by operating system to separate lines.
- */
- public static final String NEW_LINE = System.getProperty("line.separator");
-
- /**
- * Returns the value of 'test.vm.opts' system property.
- */
- public static final String VM_OPTIONS = System.getProperty("test.vm.opts", "").trim();
-
- /**
- * Returns the value of 'test.java.opts' system property.
- */
- public static final String JAVA_OPTIONS = System.getProperty("test.java.opts", "").trim();
-
- /**
- * Returns the value of 'test.src' system property.
- */
- public static final String TEST_SRC = System.getProperty("test.src", "").trim();
-
- private static Unsafe unsafe = null;
-
- /**
- * Defines property name for seed value.
- */
- public static final String SEED_PROPERTY_NAME = "jdk.test.lib.random.seed";
-
- /* (non-javadoc)
- * Random generator with (or without) predefined seed. Depends on
- * "jdk.test.lib.random.seed" property value.
- */
- private static volatile Random RANDOM_GENERATOR;
-
- /**
- * Contains the seed value used for {@link java.util.Random} creation.
- */
- public static final long SEED = Long.getLong(SEED_PROPERTY_NAME, new Random().nextLong());
- /**
- * Returns the value of 'test.timeout.factor' system property
- * converted to {@code double}.
- */
- public static final double TIMEOUT_FACTOR;
- static {
- String toFactor = System.getProperty("test.timeout.factor", "1.0");
- TIMEOUT_FACTOR = Double.parseDouble(toFactor);
- }
-
- /**
- * Returns the value of JTREG default test timeout in milliseconds
- * converted to {@code long}.
- */
- public static final long DEFAULT_TEST_TIMEOUT = TimeUnit.SECONDS.toMillis(120);
-
- private Utils() {
- // Private constructor to prevent class instantiation
- }
-
- /**
- * Returns the list of VM options.
- *
- * @return List of VM options
- */
- public static List<String> getVmOptions() {
- return Arrays.asList(safeSplitString(VM_OPTIONS));
- }
-
- /**
- * Returns the list of VM options with -J prefix.
- *
- * @return The list of VM options with -J prefix
- */
- public static List<String> getForwardVmOptions() {
- String[] opts = safeSplitString(VM_OPTIONS);
- for (int i = 0; i < opts.length; i++) {
- opts[i] = "-J" + opts[i];
- }
- return Arrays.asList(opts);
- }
-
- /**
- * Returns the default JTReg arguments for a jvm running a test.
- * This is the combination of JTReg arguments test.vm.opts and test.java.opts.
- * @return An array of options, or an empty array if no options.
- */
- public static String[] getTestJavaOpts() {
- List<String> opts = new ArrayList<String>();
- Collections.addAll(opts, safeSplitString(VM_OPTIONS));
- Collections.addAll(opts, safeSplitString(JAVA_OPTIONS));
- return opts.toArray(new String[0]);
- }
-
- /**
- * Combines given arguments with default JTReg arguments for a jvm running a test.
- * This is the combination of JTReg arguments test.vm.opts and test.java.opts
- * @return The combination of JTReg test java options and user args.
- */
- public static String[] addTestJavaOpts(String... userArgs) {
- List<String> opts = new ArrayList<String>();
- Collections.addAll(opts, getTestJavaOpts());
- Collections.addAll(opts, userArgs);
- return opts.toArray(new String[0]);
- }
-
- /**
- * Removes any options specifying which GC to use, for example "-XX:+UseG1GC".
- * Removes any options matching: -XX:(+/-)Use*GC
- * Used when a test need to set its own GC version. Then any
- * GC specified by the framework must first be removed.
- * @return A copy of given opts with all GC options removed.
- */
- private static final Pattern useGcPattern = Pattern.compile(
- "(?:\\-XX\\:[\\+\\-]Use.+GC)"
- + "|(?:\\-Xconcgc)");
- public static List<String> removeGcOpts(List<String> opts) {
- List<String> optsWithoutGC = new ArrayList<String>();
- for (String opt : opts) {
- if (useGcPattern.matcher(opt).matches()) {
- System.out.println("removeGcOpts: removed " + opt);
- } else {
- optsWithoutGC.add(opt);
- }
- }
- return optsWithoutGC;
- }
-
- /**
- * Returns the default JTReg arguments for a jvm running a test without
- * options that matches regular expressions in {@code filters}.
- * This is the combination of JTReg arguments test.vm.opts and test.java.opts.
- * @param filters Regular expressions used to filter out options.
- * @return An array of options, or an empty array if no options.
- */
- public static String[] getFilteredTestJavaOpts(String... filters) {
- String options[] = getTestJavaOpts();
-
- if (filters.length == 0) {
- return options;
- }
-
- List<String> filteredOptions = new ArrayList<String>(options.length);
- Pattern patterns[] = new Pattern[filters.length];
- for (int i = 0; i < filters.length; i++) {
- patterns[i] = Pattern.compile(filters[i]);
- }
-
- for (String option : options) {
- boolean matched = false;
- for (int i = 0; i < patterns.length && !matched; i++) {
- Matcher matcher = patterns[i].matcher(option);
- matched = matcher.find();
- }
- if (!matched) {
- filteredOptions.add(option);
- }
- }
-
- return filteredOptions.toArray(new String[filteredOptions.size()]);
- }
-
- /**
- * Splits a string by white space.
- * Works like String.split(), but returns an empty array
- * if the string is null or empty.
- */
- private static String[] safeSplitString(String s) {
- if (s == null || s.trim().isEmpty()) {
- return new String[] {};
- }
- return s.trim().split("\\s+");
- }
-
- /**
- * @return The full command line for the ProcessBuilder.
- */
- public static String getCommandLine(ProcessBuilder pb) {
- StringBuilder cmd = new StringBuilder();
- for (String s : pb.command()) {
- cmd.append(s).append(" ");
- }
- return cmd.toString();
- }
-
- /**
- * Returns the free port on the local host.
- * The function will spin until a valid port number is found.
- *
- * @return The port number
- * @throws InterruptedException if any thread has interrupted the current thread
- * @throws IOException if an I/O error occurs when opening the socket
- */
- public static int getFreePort() throws InterruptedException, IOException {
- int port = -1;
-
- while (port <= 0) {
- Thread.sleep(100);
-
- ServerSocket serverSocket = null;
- try {
- serverSocket = new ServerSocket(0);
- port = serverSocket.getLocalPort();
- } finally {
- serverSocket.close();
- }
- }
-
- return port;
- }
-
- /**
- * Returns the name of the local host.
- *
- * @return The host name
- * @throws UnknownHostException if IP address of a host could not be determined
- */
- public static String getHostname() throws UnknownHostException {
- InetAddress inetAddress = InetAddress.getLocalHost();
- String hostName = inetAddress.getHostName();
-
- assertTrue((hostName != null && !hostName.isEmpty()),
- "Cannot get hostname");
-
- return hostName;
- }
-
- /**
- * Uses "jcmd -l" to search for a jvm pid. This function will wait
- * forever (until jtreg timeout) for the pid to be found.
- * @param key Regular expression to search for
- * @return The found pid.
- */
- public static int waitForJvmPid(String key) throws Throwable {
- final long iterationSleepMillis = 250;
- System.out.println("waitForJvmPid: Waiting for key '" + key + "'");
- System.out.flush();
- while (true) {
- int pid = tryFindJvmPid(key);
- if (pid >= 0) {
- return pid;
- }
- Thread.sleep(iterationSleepMillis);
- }
- }
-
- /**
- * Searches for a jvm pid in the output from "jcmd -l".
- *
- * Example output from jcmd is:
- * 12498 sun.tools.jcmd.JCmd -l
- * 12254 /tmp/jdk8/tl/jdk/JTwork/classes/com/sun/tools/attach/Application.jar
- *
- * @param key A regular expression to search for.
- * @return The found pid, or -1 if not found.
- * @throws Exception If multiple matching jvms are found.
- */
- public static int tryFindJvmPid(String key) throws Throwable {
- OutputAnalyzer output = null;
- try {
- JDKToolLauncher jcmdLauncher = JDKToolLauncher.create("jcmd");
- jcmdLauncher.addToolArg("-l");
- output = ProcessTools.executeProcess(jcmdLauncher.getCommand());
- output.shouldHaveExitValue(0);
-
- // Search for a line starting with numbers (pid), follwed by the key.
- Pattern pattern = Pattern.compile("([0-9]+)\\s.*(" + key + ").*\\r?\\n");
- Matcher matcher = pattern.matcher(output.getStdout());
-
- int pid = -1;
- if (matcher.find()) {
- pid = Integer.parseInt(matcher.group(1));
- System.out.println("findJvmPid.pid: " + pid);
- if (matcher.find()) {
- throw new Exception("Found multiple JVM pids for key: " + key);
- }
- }
- return pid;
- } catch (Throwable t) {
- System.out.println(String.format("Utils.findJvmPid(%s) failed: %s", key, t));
- throw t;
- }
- }
-
- /**
- * Adjusts the provided timeout value for the TIMEOUT_FACTOR
- * @param tOut the timeout value to be adjusted
- * @return The timeout value adjusted for the value of "test.timeout.factor"
- * system property
- */
- public static long adjustTimeout(long tOut) {
- return Math.round(tOut * Utils.TIMEOUT_FACTOR);
- }
-
- /**
- * Return the contents of the named file as a single String,
- * or null if not found.
- * @param filename name of the file to read
- * @return String contents of file, or null if file not found.
- * @throws IOException
- * if an I/O error occurs reading from the file or a malformed or
- * unmappable byte sequence is read
- */
- public static String fileAsString(String filename) throws IOException {
- Path filePath = Paths.get(filename);
- if (!Files.exists(filePath)) return null;
- return new String(Files.readAllBytes(filePath));
- }
-
- /**
- * @return Unsafe instance.
- */
- public static synchronized Unsafe getUnsafe() {
- if (unsafe == null) {
- try {
- Field f = Unsafe.class.getDeclaredField("theUnsafe");
- f.setAccessible(true);
- unsafe = (Unsafe) f.get(null);
- } catch (NoSuchFieldException | IllegalAccessException e) {
- throw new RuntimeException("Unable to get Unsafe instance.", e);
- }
- }
- return unsafe;
- }
- private static final char[] hexArray = new char[]{'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F'};
-
- /**
- * Returns hex view of byte array
- *
- * @param bytes byte array to process
- * @return Space separated hexadecimal string representation of bytes
- */
-
- public static String toHexString(byte[] bytes) {
- char[] hexView = new char[bytes.length * 3];
- int i = 0;
- for (byte b : bytes) {
- hexView[i++] = hexArray[(b >> 4) & 0x0F];
- hexView[i++] = hexArray[b & 0x0F];
- hexView[i++] = ' ';
- }
- return new String(hexView);
- }
-
- /**
- * Returns {@link java.util.Random} generator initialized with particular seed.
- * The seed could be provided via system property {@link Utils#SEED_PROPERTY_NAME}
- * In case no seed is provided, the method uses a random number.
- * The used seed printed to stdout.
- * @return {@link java.util.Random} generator with particular seed.
- */
- public static Random getRandomInstance() {
- if (RANDOM_GENERATOR == null) {
- synchronized (Utils.class) {
- if (RANDOM_GENERATOR == null) {
- RANDOM_GENERATOR = new Random(SEED);
- System.out.printf("For random generator using seed: %d%n", SEED);
- System.out.printf("To re-run test with same seed value please add \"-D%s=%d\" to command line.%n", SEED_PROPERTY_NAME, SEED);
- }
- }
- }
- return RANDOM_GENERATOR;
- }
-
- /**
- * Returns random element of non empty collection
- *
- * @param <T> a type of collection element
- * @param collection collection of elements
- * @return random element of collection
- * @throws IllegalArgumentException if collection is empty
- */
- public static <T> T getRandomElement(Collection<T> collection)
- throws IllegalArgumentException {
- if (collection.isEmpty()) {
- throw new IllegalArgumentException("Empty collection");
- }
- Random random = getRandomInstance();
- int elementIndex = 1 + random.nextInt(collection.size() - 1);
- Iterator<T> iterator = collection.iterator();
- while (--elementIndex != 0) {
- iterator.next();
- }
- return iterator.next();
- }
-
- /**
- * Wait for condition to be true
- *
- * @param condition, a condition to wait for
- */
- public static final void waitForCondition(BooleanSupplier condition) {
- waitForCondition(condition, -1L, 100L);
- }
-
- /**
- * Wait until timeout for condition to be true
- *
- * @param condition, a condition to wait for
- * @param timeout a time in milliseconds to wait for condition to be true
- * specifying -1 will wait forever
- * @return condition value, to determine if wait was successful
- */
- public static final boolean waitForCondition(BooleanSupplier condition,
- long timeout) {
- return waitForCondition(condition, timeout, 100L);
- }
-
- /**
- * Wait until timeout for condition to be true for specified time
- *
- * @param condition, a condition to wait for
- * @param timeout a time in milliseconds to wait for condition to be true,
- * specifying -1 will wait forever
- * @param sleepTime a time to sleep value in milliseconds
- * @return condition value, to determine if wait was successful
- */
- public static final boolean waitForCondition(BooleanSupplier condition,
- long timeout, long sleepTime) {
- long startTime = System.currentTimeMillis();
- while (!(condition.getAsBoolean() || (timeout != -1L
- && ((System.currentTimeMillis() - startTime) > timeout)))) {
- try {
- Thread.sleep(sleepTime);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw new Error(e);
- }
- }
- return condition.getAsBoolean();
- }
-
- /**
- * Interface same as java.lang.Runnable but with
- * method {@code run()} able to throw any Throwable.
- */
- public static interface ThrowingRunnable {
- void run() throws Throwable;
- }
-
- /**
- * Filters out an exception that may be thrown by the given
- * test according to the given filter.
- *
- * @param test - method that is invoked and checked for exception.
- * @param filter - function that checks if the thrown exception matches
- * criteria given in the filter's implementation.
- * @return - exception that matches the filter if it has been thrown or
- * {@code null} otherwise.
- * @throws Throwable - if test has thrown an exception that does not
- * match the filter.
- */
- public static Throwable filterException(ThrowingRunnable test,
- Function<Throwable, Boolean> filter) throws Throwable {
- try {
- test.run();
- } catch (Throwable t) {
- if (filter.apply(t)) {
- return t;
- } else {
- throw t;
- }
- }
- return null;
- }
-
- /**
- * Ensures a requested class is loaded
- * @param aClass class to load
- */
- public static void ensureClassIsLoaded(Class<?> aClass) {
- if (aClass == null) {
- throw new Error("Requested null class");
- }
- try {
- Class.forName(aClass.getName(), /* initialize = */ true,
- ClassLoader.getSystemClassLoader());
- } catch (ClassNotFoundException e) {
- throw new Error("Class not found", e);
- }
- }
- /**
- * @param parent a class loader to be the parent for the returned one
- * @return an UrlClassLoader with urls made of the 'test.class.path' jtreg
- * property and with the given parent
- */
- public static URLClassLoader getTestClassPathURLClassLoader(ClassLoader parent) {
- URL[] urls = Arrays.stream(TEST_CLASS_PATH.split(File.pathSeparator))
- .map(Paths::get)
- .map(Path::toUri)
- .map(x -> {
- try {
- return x.toURL();
- } catch (MalformedURLException ex) {
- throw new Error("Test issue. JTREG property"
- + " 'test.class.path'"
- + " is not defined correctly", ex);
- }
- }).toArray(URL[]::new);
- return new URLClassLoader(urls, parent);
- }
-
- /**
- * Runs runnable and checks that it throws expected exception. If exceptionException is null it means
- * that we expect no exception to be thrown.
- * @param runnable what we run
- * @param expectedException expected exception
- */
- public static void runAndCheckException(Runnable runnable, Class<? extends Throwable> expectedException) {
- runAndCheckException(runnable, t -> {
- if (t == null) {
- if (expectedException != null) {
- throw new AssertionError("Didn't get expected exception " + expectedException.getSimpleName());
- }
- } else {
- String message = "Got unexpected exception " + t.getClass().getSimpleName();
- if (expectedException == null) {
- throw new AssertionError(message, t);
- } else if (!expectedException.isAssignableFrom(t.getClass())) {
- message += " instead of " + expectedException.getSimpleName();
- throw new AssertionError(message, t);
- }
- }
- });
- }
-
- /**
- * Runs runnable and makes some checks to ensure that it throws expected exception.
- * @param runnable what we run
- * @param checkException a consumer which checks that we got expected exception and raises a new exception otherwise
- */
- public static void runAndCheckException(Runnable runnable, Consumer<Throwable> checkException) {
- try {
- runnable.run();
- checkException.accept(null);
- } catch (Throwable t) {
- checkException.accept(t);
- }
- }
-
- /**
- * Converts to VM type signature
- *
- * @param type Java type to convert
- * @return string representation of VM type
- */
- public static String toJVMTypeSignature(Class<?> type) {
- if (type.isPrimitive()) {
- if (type == boolean.class) {
- return "Z";
- } else if (type == byte.class) {
- return "B";
- } else if (type == char.class) {
- return "C";
- } else if (type == double.class) {
- return "D";
- } else if (type == float.class) {
- return "F";
- } else if (type == int.class) {
- return "I";
- } else if (type == long.class) {
- return "J";
- } else if (type == short.class) {
- return "S";
- } else if (type == void.class) {
- return "V";
- } else {
- throw new Error("Unsupported type: " + type);
- }
- }
- String result = type.getName().replaceAll("\\.", "/");
- if (!type.isArray()) {
- return "L" + result + ";";
- }
- return result;
- }
-}
-
--- a/test/lib/share/classes/jdk/test/lib/apps/LingeredApp.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,466 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib.apps;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.file.Files;
-import java.nio.file.NoSuchFileException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.nio.file.attribute.FileTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * This is a framework to launch an app that could be synchronized with caller
- * to make further attach actions reliable across supported platforms
-
- * Caller example:
- * SmartTestApp a = SmartTestApp.startApp(cmd);
- * // do something
- * a.stopApp();
- *
- * or fine grained control
- *
- * a = new SmartTestApp("MyLock.lck");
- * a.createLock();
- * a.runApp();
- * a.waitAppReady();
- * // do something
- * a.deleteLock();
- * a.waitAppTerminate();
- *
- * Then you can work with app output and process object
- *
- * output = a.getAppOutput();
- * process = a.getProcess();
- *
- */
-public class LingeredApp {
-
- private static final long spinDelay = 1000;
- private static final int appWaitTime = 100;
-
- private final String lockFileName;
- private long lockCreationTime;
- private Process appProcess;
- private final ArrayList<String> storedAppOutput;
-
- /*
- * Drain child process output, store it into string array
- */
- class InputGobbler extends Thread {
-
- InputStream is;
- List<String> astr;
-
- InputGobbler(InputStream is, List<String> astr) {
- this.is = is;
- this.astr = astr;
- }
-
- public void run() {
- try {
- InputStreamReader isr = new InputStreamReader(is);
- BufferedReader br = new BufferedReader(isr);
- String line = null;
- while ((line = br.readLine()) != null) {
- astr.add(line);
- }
- } catch (IOException ex) {
- // pass
- }
- }
- }
-
- /**
- * Create LingeredApp object on caller side. Lock file have be a valid filename
- * at writable location
- *
- * @param lockFileName - the name of lock file
- */
- public LingeredApp(String lockFileName) {
- this.lockFileName = lockFileName;
- this.storedAppOutput = new ArrayList<String>();
- }
-
- public LingeredApp() {
- final String lockName = UUID.randomUUID().toString() + ".lck";
- this.lockFileName = lockName;
- this.storedAppOutput = new ArrayList<String>();
- }
-
- /**
- *
- * @return name of lock file
- */
- public String getLockFileName() {
- return this.lockFileName;
- }
-
- /**
- *
- * @return name of testapp
- */
- public String getAppName() {
- return this.getClass().getName();
- }
-
- /**
- *
- * @return pid of java process running testapp
- */
- public long getPid() {
- if (appProcess == null) {
- throw new RuntimeException("Process is not alive");
- }
- return appProcess.getPid();
- }
-
- /**
- *
- * @return process object
- */
- public Process getProcess() {
- return appProcess;
- }
-
- /**
- *
- * @return application output as string array. Empty array if application produced no output
- */
- public List<String> getAppOutput() {
- if (appProcess.isAlive()) {
- throw new RuntimeException("Process is still alive. Can't get its output.");
- }
- return storedAppOutput;
- }
-
- /* Make sure all part of the app use the same method to get dates,
- as different methods could produce different results
- */
- private static long epoch() {
- return new Date().getTime();
- }
-
- private static long lastModified(String fileName) throws IOException {
- Path path = Paths.get(fileName);
- BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
- return attr.lastModifiedTime().toMillis();
- }
-
- private static void setLastModified(String fileName, long newTime) throws IOException {
- Path path = Paths.get(fileName);
- FileTime fileTime = FileTime.fromMillis(newTime);
- Files.setLastModifiedTime(path, fileTime);
- }
-
- /**
- * create lock
- *
- * @throws IOException
- */
- public void createLock() throws IOException {
- Path path = Paths.get(lockFileName);
- // Files.deleteIfExists(path);
- Files.createFile(path);
- lockCreationTime = lastModified(lockFileName);
- }
-
- /**
- * Delete lock
- *
- * @throws IOException
- */
- public void deleteLock() throws IOException {
- try {
- Path path = Paths.get(lockFileName);
- Files.delete(path);
- } catch (NoSuchFileException ex) {
- // Lock already deleted. Ignore error
- }
- }
-
- public void waitAppTerminate() {
- while (true) {
- try {
- appProcess.waitFor();
- break;
- } catch (InterruptedException ex) {
- // pass
- }
- }
- }
-
- /**
- * The app touches the lock file when it's started
- * wait while it happens. Caller have to delete lock on wait error.
- *
- * @param timeout
- * @throws java.io.IOException
- */
- public void waitAppReady(long timeout) throws IOException {
- long here = epoch();
- while (true) {
- long epoch = epoch();
- if (epoch - here > (timeout * 1000)) {
- throw new IOException("App waiting timeout");
- }
-
- // Live process should touch lock file every second
- long lm = lastModified(lockFileName);
- if (lm > lockCreationTime) {
- break;
- }
-
- // Make sure process didn't already exit
- if (!appProcess.isAlive()) {
- throw new IOException("App exited unexpectedly with " + appProcess.exitValue());
- }
-
- try {
- Thread.sleep(spinDelay);
- } catch (InterruptedException ex) {
- // pass
- }
- }
- }
-
- /**
- * Run the app
- *
- * @param vmArguments
- * @throws IOException
- */
- public void runApp(List<String> vmArguments)
- throws IOException {
-
- // We should always use testjava or throw an exception,
- // so we can't use JDKToolFinder.getJDKTool("java");
- // that falls back to compile java on error
- String jdkPath = System.getProperty("test.jdk");
- if (jdkPath == null) {
- // we are not under jtreg, try env
- Map<String, String> env = System.getenv();
- jdkPath = env.get("TESTJAVA");
- }
-
- if (jdkPath == null) {
- throw new RuntimeException("Can't determine jdk path neither test.jdk property no TESTJAVA env are set");
- }
-
- String osname = System.getProperty("os.name");
- String javapath = jdkPath + ((osname.startsWith("window")) ? "/bin/java.exe" : "/bin/java");
-
- List<String> cmd = new ArrayList<String>();
- cmd.add(javapath);
-
-
- if (vmArguments == null) {
- // Propagate test.vm.options to LingeredApp, filter out possible empty options
- String testVmOpts[] = System.getProperty("test.vm.opts","").split("\\s+");
- for (String s : testVmOpts) {
- if (!s.equals("")) {
- cmd.add(s);
- }
- }
- }
- else{
- // Lets user manage LingeredApp options
- cmd.addAll(vmArguments);
- }
-
- // Make sure we set correct classpath to run the app
- cmd.add("-cp");
- String classpath = System.getProperty("test.class.path");
- cmd.add((classpath == null) ? "." : classpath);
-
- cmd.add(this.getAppName());
- cmd.add(lockFileName);
-
- // Reporting
- StringBuilder cmdLine = new StringBuilder();
- for (String strCmd : cmd) {
- cmdLine.append("'").append(strCmd).append("' ");
- }
-
- // A bit of verbosity
- System.out.println("Command line: [" + cmdLine.toString() + "]");
-
- ProcessBuilder pb = new ProcessBuilder(cmd);
- // we don't expect any error output but make sure we are not stuck on pipe
- // pb.redirectErrorStream(false);
- pb.redirectError(ProcessBuilder.Redirect.INHERIT);
-
- appProcess = pb.start();
-
- // Create pipe reader for process, and read stdin and stderr to array of strings
- InputGobbler gb = new InputGobbler(appProcess.getInputStream(), storedAppOutput);
- gb.start();
- }
-
- /**
- * Delete lock file that signals app to terminate, then
- * wait until app is actually terminated.
- * @throws IOException
- */
- public void stopApp() throws IOException {
- deleteLock();
- waitAppTerminate();
- int exitcode = appProcess.exitValue();
- if (exitcode != 0) {
- throw new IOException("LingeredApp terminated with non-zero exit code " + exitcode);
- }
- }
-
- /**
- * High level interface for test writers
- */
- /**
- * Factory method that creates LingeredApp object with ready to use application
- * lock name is autogenerated
- * @param cmd - vm options, could be null to auto add testvm.options
- * @return LingeredApp object
- * @throws IOException
- */
- public static LingeredApp startApp(List<String> cmd) throws IOException {
- LingeredApp a = new LingeredApp();
- a.createLock();
- try {
- a.runApp(cmd);
- a.waitAppReady(appWaitTime);
- } catch (Exception ex) {
- a.deleteLock();
- throw ex;
- }
-
- return a;
- }
-
- /**
- * Factory method that starts pre-created LingeredApp
- * lock name is autogenerated
- * @param cmd - vm options, could be null to auto add testvm.options
- * @param theApp - app to start
- * @return LingeredApp object
- * @throws IOException
- */
-
- public static void startApp(List<String> cmd, LingeredApp theApp) throws IOException {
- theApp.createLock();
- try {
- theApp.runApp(cmd);
- theApp.waitAppReady(appWaitTime);
- } catch (Exception ex) {
- theApp.deleteLock();
- throw ex;
- }
- }
-
- public static LingeredApp startApp() throws IOException {
- return startApp(null);
- }
-
- public static void stopApp(LingeredApp app) throws IOException {
- if (app != null) {
- // LingeredApp can throw an exception during the intialization,
- // make sure we don't have cascade NPE
- app.stopApp();
- }
- }
-
- /**
- * LastModified time might not work correctly in some cases it might
- * cause later failures
- */
-
- public static boolean isLastModifiedWorking() {
- boolean sane = true;
- try {
- long lm = lastModified(".");
- if (lm == 0) {
- System.err.println("SANITY Warning! The lastModifiedTime() doesn't work on this system, it returns 0");
- sane = false;
- }
-
- long now = epoch();
- if (lm > now) {
- System.err.println("SANITY Warning! The Clock is wrong on this system lastModifiedTime() > getTime()");
- sane = false;
- }
-
- setLastModified(".", epoch());
- long lm1 = lastModified(".");
- if (lm1 <= lm) {
- System.err.println("SANITY Warning! The setLastModified doesn't work on this system");
- sane = false;
- }
- }
- catch(IOException e) {
- System.err.println("SANITY Warning! IOException during sanity check " + e);
- sane = false;
- }
-
- return sane;
- }
-
- /**
- * This part is the application it self
- */
- public static void main(String args[]) {
-
- if (args.length != 1) {
- System.err.println("Lock file name is not specified");
- System.exit(7);
- }
-
- String theLockFileName = args[0];
-
- try {
- Path path = Paths.get(theLockFileName);
-
- while (Files.exists(path)) {
- // Touch the lock to indicate our readiness
- setLastModified(theLockFileName, epoch());
- Thread.sleep(spinDelay);
- }
- } catch (NoSuchFileException ex) {
- // Lock deleted while we are setting last modified time.
- // Ignore error and lets the app exits
- } catch (Exception ex) {
- System.err.println("LingeredApp ERROR: " + ex);
- // Leave exit_code = 1 to Java launcher
- System.exit(3);
- }
-
- System.exit(0);
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/apps/LingeredAppWithDeadlock.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2005, 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.
- */
-package jdk.test.lib.apps;
-
-import java.util.concurrent.Phaser;
-
-public class LingeredAppWithDeadlock extends LingeredApp {
-
- private static final Object Lock1 = new Object();
- private static final Object Lock2 = new Object();
-
- private static volatile int reachCount = 0;
-
- private static final Phaser p = new Phaser(2);
-
- private static class ThreadOne extends Thread {
- public void run() {
- // wait Lock2 is locked
- p.arriveAndAwaitAdvance();
- synchronized (Lock1) {
- // signal Lock1 is locked
- p.arriveAndAwaitAdvance();
- synchronized (Lock2) {
- reachCount += 1;
- }
- }
- }
- }
-
- private static class ThreadTwo extends Thread {
- public void run() {
- synchronized (Lock2) {
- // signal Lock2 is locked
- p.arriveAndAwaitAdvance();
- // wait Lock1 is locked
- p.arriveAndAwaitAdvance();
- synchronized (Lock1) {
- reachCount += 1;
- }
- }
- }
- }
-
- public static void main(String args[]) {
- if (args.length != 1) {
- System.err.println("Lock file name is not specified");
- System.exit(7);
- }
-
- // Run two theads that should come to deadlock
- new ThreadOne().start();
- new ThreadTwo().start();
-
- if (reachCount > 0) {
- // Not able to deadlock, exiting
- System.exit(3);
- }
-
- LingeredApp.main(args);
- }
- }
--- a/test/lib/share/classes/jdk/test/lib/hprof/HprofParser.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 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.
- */
-
-package jdk.test.lib.hprof;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.PrintStream;
-
-import jdk.test.lib.hprof.model.Snapshot;
-import jdk.test.lib.hprof.parser.Reader;
-
-/**
- * Helper class to parse a java heap dump file.
- */
-public class HprofParser {
-
- public static void main(String[] args) throws Exception {
- if (args.length < 1) {
- System.out.println("No arguments supplied");
- }
- File dump = new File(args[0]);
- if (!dump.exists() || !dump.isFile()) {
- throw new RuntimeException("The dump file does not exist or not a file");
- }
- parse(dump);
- }
-
- /**
- * @see #parse(File, boolean, boolean, boolean)
- */
- public static File parse(File dump) throws Exception {
- return parse(dump, false, true, true);
- }
-
- /**
- * @see #parse(File, boolean, boolean, boolean)
- */
- public static File parseWithDebugInfo(File dump) throws Exception {
- return parse(dump, true, true, true);
- }
-
- /**
- * Parse a java heap dump file
- *
- * @param dump Heap dump file to parse
- * @param debug Turn on/off debug file parsing
- * @param callStack Turn on/off tracking of object allocation call stack
- * @param calculateRefs Turn on/off tracking object allocation call stack
- * @throws Exception
- * @return File containing output from the parser
- */
- public static File parse(File dump, boolean debug, boolean callStack, boolean calculateRefs) throws Exception {
- File out = new File("hprof." + System.currentTimeMillis() + ".out");
- if (out.exists()) {
- out.delete();
- }
-
- PrintStream psSystemOut = System.out;
- try (PrintStream psHprof = new PrintStream(new BufferedOutputStream(new FileOutputStream(out.getAbsolutePath())))) {
- System.setOut(psHprof);
-
- int debugLevel = debug ? 2 : 0;
- try (Snapshot snapshot = Reader.readFile(dump.getAbsolutePath(), callStack, debugLevel)) {
- System.out.println("Snapshot read, resolving...");
- snapshot.resolve(calculateRefs);
- System.out.println("Snapshot resolved.");
- }
- } finally {
- System.setOut(psSystemOut);
- }
-
- return out;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/README Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-The jhat tool has been removed. jhat hprof file parser/validator
-are needed for tests. The old packages for jhat were moved here:
-com.sun.tools.hat.internal.model -> jdk.test.lib.hprof.model
-com.sun.tools.hat.internal.parser -> jdk.test.lib.hprof.parser
-com.sun.tools.hat.internal.util -> jdk.test.lib.hprof.util
-
-jhat was added in JDK 6 and its original implementation was from
-java.net HAT project [1]. jhat is an experimental, unsupported tool.
-There hasn't been much update to jhat tool in the JDK. In addition,
-there are several better heap dump visualizer/analyzer emerged since
-JDK 5/6 serviceability support.
-
-[1] https://java.net/projects/hat
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/AbstractJavaHeapObjectVisitor.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * A visitor for a JavaThing. @see JavaObject#visitReferencedObjects()
- *
- */
-
-
-abstract public class AbstractJavaHeapObjectVisitor
- implements JavaHeapObjectVisitor {
- abstract public void visit(JavaHeapObject other);
-
- /**
- * Should the given field be excluded from the set of things visited?
- * @return true if it should.
- */
- public boolean exclude(JavaClass clazz, JavaField f) {
- return false;
- }
-
- /**
- * @return true iff exclude might ever return true
- */
- public boolean mightExclude() {
- return false;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/ArrayTypeCodes.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Primitive array type codes as defined by VM specification.
- *
- */
-public interface ArrayTypeCodes {
- // Typecodes for array elements.
- // Refer to newarray instruction in VM Spec.
- public static final int T_BOOLEAN = 4;
- public static final int T_CHAR = 5;
- public static final int T_FLOAT = 6;
- public static final int T_DOUBLE = 7;
- public static final int T_BYTE = 8;
- public static final int T_SHORT = 9;
- public static final int T_INT = 10;
- public static final int T_LONG = 11;
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/HackJavaValue.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * This is used to represent values that the program doesn't really understand.
- * This includes the null vlaue, and unresolved references (which shouldn't
- * happen in well-formed hprof files).
- *
- *
- * @author Bill Foote
- */
-
-
-
-
-public class HackJavaValue extends JavaValue {
-
- private String value;
- private int size;
-
- public HackJavaValue(String value, int size) {
- this.value = value;
- this.size = size;
- }
-
- public String toString() {
- return value;
- }
-
- public int getSize() {
- return size;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaBoolean.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Represents a boolean (i.e. a boolean field in an instance).
- *
- * @author Bill Foote
- */
-
-
-public class JavaBoolean extends JavaValue {
-
- boolean value;
-
- public JavaBoolean(boolean value) {
- this.value = value;
- }
-
- public String toString() {
- return "" + value;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaByte.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Represents an byte (i.e. a byte field in an instance).
- *
- * @author Bill Foote
- */
-
-
-public class JavaByte extends JavaValue {
-
- byte value;
-
- public JavaByte(byte value) {
- this.value = value;
- }
-
- public String toString() {
- return "0x" + Integer.toString(((int) value) & 0xff, 16);
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaChar.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Represents a char (i.e. a char field in an instance).
- *
- * @author Bill Foote
- */
-
-
-public class JavaChar extends JavaValue {
-
- char value;
-
- public JavaChar(char value) {
- this.value = value;
- }
-
- public String toString() {
- return "" + value;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaClass.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,503 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import java.util.Vector;
-import java.util.Enumeration;
-import jdk.test.lib.hprof.util.CompositeEnumeration;
-import jdk.test.lib.hprof.parser.ReadBuffer;
-
-/**
- *
- * @author Bill Foote
- */
-
-
-public class JavaClass extends JavaHeapObject {
- // my id
- private long id;
- // my name
- private String name;
-
- // These are JavaObjectRef before resolve
- private JavaThing superclass;
- private JavaThing loader;
- private JavaThing signers;
- private JavaThing protectionDomain;
-
- // non-static fields
- private JavaField[] fields;
- // static fields
- private JavaStatic[] statics;
-
- private static final JavaClass[] EMPTY_CLASS_ARRAY = new JavaClass[0];
- // my subclasses
- private JavaClass[] subclasses = EMPTY_CLASS_ARRAY;
-
- // my instances
- private Vector<JavaHeapObject> instances = new Vector<JavaHeapObject>();
-
- // Who I belong to. Set on resolve.
- private Snapshot mySnapshot;
-
- // Size of an instance, including VM overhead
- private int instanceSize;
- // Total number of fields including inherited ones
- private int totalNumFields;
-
-
- public JavaClass(long id, String name, long superclassId, long loaderId,
- long signersId, long protDomainId,
- JavaField[] fields, JavaStatic[] statics,
- int instanceSize) {
- this.id = id;
- this.name = name;
- this.superclass = new JavaObjectRef(superclassId);
- this.loader = new JavaObjectRef(loaderId);
- this.signers = new JavaObjectRef(signersId);
- this.protectionDomain = new JavaObjectRef(protDomainId);
- this.fields = fields;
- this.statics = statics;
- this.instanceSize = instanceSize;
- }
-
- public JavaClass(String name, long superclassId, long loaderId,
- long signersId, long protDomainId,
- JavaField[] fields, JavaStatic[] statics,
- int instanceSize) {
- this(-1L, name, superclassId, loaderId, signersId,
- protDomainId, fields, statics, instanceSize);
- }
-
- public final JavaClass getClazz() {
- return mySnapshot.getJavaLangClass();
- }
-
- public final int getIdentifierSize() {
- return mySnapshot.getIdentifierSize();
- }
-
- public final int getMinimumObjectSize() {
- return mySnapshot.getMinimumObjectSize();
- }
-
- public void resolve(Snapshot snapshot) {
- if (mySnapshot != null) {
- return;
- }
- mySnapshot = snapshot;
- resolveSuperclass(snapshot);
- if (superclass != null) {
- ((JavaClass) superclass).addSubclass(this);
- }
-
- loader = loader.dereference(snapshot, null);
- signers = signers.dereference(snapshot, null);
- protectionDomain = protectionDomain.dereference(snapshot, null);
-
- for (int i = 0; i < statics.length; i++) {
- statics[i].resolve(this, snapshot);
- }
- snapshot.getJavaLangClass().addInstance(this);
- super.resolve(snapshot);
- return;
- }
-
- /**
- * Resolve our superclass. This might be called well before
- * all instances are available (like when reading deferred
- * instances in a 1.2 dump file :-) Calling this is sufficient
- * to be able to explore this class' fields.
- */
- public void resolveSuperclass(Snapshot snapshot) {
- if (superclass == null) {
- // We must be java.lang.Object, so we have no superclass.
- } else {
- totalNumFields = fields.length;
- superclass = superclass.dereference(snapshot, null);
- if (superclass == snapshot.getNullThing()) {
- superclass = null;
- } else {
- try {
- JavaClass sc = (JavaClass) superclass;
- sc.resolveSuperclass(snapshot);
- totalNumFields += sc.totalNumFields;
- } catch (ClassCastException ex) {
- System.out.println("Warning! Superclass of " + name + " is " + superclass);
- superclass = null;
- }
- }
- }
- }
-
- public boolean isString() {
- return mySnapshot.getJavaLangString() == this;
- }
-
- public boolean isClassLoader() {
- return mySnapshot.getJavaLangClassLoader().isAssignableFrom(this);
- }
-
- /**
- * Get a numbered field from this class
- */
- public JavaField getField(int i) {
- if (i < 0 || i >= fields.length) {
- throw new Error("No field " + i + " for " + name);
- }
- return fields[i];
- }
-
- /**
- * Get the total number of fields that are part of an instance of
- * this class. That is, include superclasses.
- */
- public int getNumFieldsForInstance() {
- return totalNumFields;
- }
-
- /**
- * Get a numbered field from all the fields that are part of instance
- * of this class. That is, include superclasses.
- */
- public JavaField getFieldForInstance(int i) {
- if (superclass != null) {
- JavaClass sc = (JavaClass) superclass;
- if (i < sc.totalNumFields) {
- return sc.getFieldForInstance(i);
- }
- i -= sc.totalNumFields;
- }
- return getField(i);
- }
-
- /**
- * Get the class responsible for field i, where i is a field number that
- * could be passed into getFieldForInstance.
- *
- * @see JavaClass.getFieldForInstance()
- */
- public JavaClass getClassForField(int i) {
- if (superclass != null) {
- JavaClass sc = (JavaClass) superclass;
- if (i < sc.totalNumFields) {
- return sc.getClassForField(i);
- }
- }
- return this;
- }
-
- public long getId() {
- return id;
- }
-
- public String getName() {
- return name;
- }
-
- public boolean isArray() {
- return name.indexOf('[') != -1;
- }
-
- public Enumeration<JavaHeapObject> getInstances(boolean includeSubclasses) {
- if (includeSubclasses) {
- Enumeration<JavaHeapObject> res = instances.elements();
- for (int i = 0; i < subclasses.length; i++) {
- res = new CompositeEnumeration(res,
- subclasses[i].getInstances(true));
- }
- return res;
- } else {
- return instances.elements();
- }
- }
-
- /**
- * @return a count of the instances of this class
- */
- public int getInstancesCount(boolean includeSubclasses) {
- int result = instances.size();
- if (includeSubclasses) {
- for (int i = 0; i < subclasses.length; i++) {
- result += subclasses[i].getInstancesCount(includeSubclasses);
- }
- }
- return result;
- }
-
- public JavaClass[] getSubclasses() {
- return subclasses;
- }
-
- /**
- * This can only safely be called after resolve()
- */
- public JavaClass getSuperclass() {
- return (JavaClass) superclass;
- }
-
- /**
- * This can only safely be called after resolve()
- */
- public JavaThing getLoader() {
- return loader;
- }
-
- /**
- * This can only safely be called after resolve()
- */
- public boolean isBootstrap() {
- return loader == mySnapshot.getNullThing();
- }
-
- /**
- * This can only safely be called after resolve()
- */
- public JavaThing getSigners() {
- return signers;
- }
-
- /**
- * This can only safely be called after resolve()
- */
- public JavaThing getProtectionDomain() {
- return protectionDomain;
- }
-
- public JavaField[] getFields() {
- return fields;
- }
-
- /**
- * Includes superclass fields
- */
- public JavaField[] getFieldsForInstance() {
- Vector<JavaField> v = new Vector<JavaField>();
- addFields(v);
- JavaField[] result = new JavaField[v.size()];
- for (int i = 0; i < v.size(); i++) {
- result[i] = v.elementAt(i);
- }
- return result;
- }
-
-
- public JavaStatic[] getStatics() {
- return statics;
- }
-
- // returns value of static field of given name
- public JavaThing getStaticField(String name) {
- for (int i = 0; i < statics.length; i++) {
- JavaStatic s = statics[i];
- if (s.getField().getName().equals(name)) {
- return s.getValue();
- }
- }
- return null;
- }
-
- public String toString() {
- return "class " + name;
- }
-
- public int compareTo(JavaThing other) {
- if (other instanceof JavaClass) {
- return name.compareTo(((JavaClass) other).name);
- }
- return super.compareTo(other);
- }
-
-
- /**
- * @return true iff a variable of type this is assignable from an instance
- * of other
- */
- public boolean isAssignableFrom(JavaClass other) {
- if (this == other) {
- return true;
- } else if (other == null) {
- return false;
- } else {
- return isAssignableFrom((JavaClass) other.superclass);
- // Trivial tail recursion: I have faith in javac.
- }
- }
-
- /**
- * Describe the reference that this thing has to target. This will only
- * be called if target is in the array returned by getChildrenForRootset.
- */
- public String describeReferenceTo(JavaThing target, Snapshot ss) {
- for (int i = 0; i < statics.length; i++) {
- JavaField f = statics[i].getField();
- if (f.hasId()) {
- JavaThing other = statics[i].getValue();
- if (other == target) {
- return "static field " + f.getName();
- }
- }
- }
- return super.describeReferenceTo(target, ss);
- }
-
- /**
- * @return the size of an instance of this class. Gives 0 for an array
- * type.
- */
- public int getInstanceSize() {
- return instanceSize + mySnapshot.getMinimumObjectSize();
- }
-
-
- /**
- * @return The size of all instances of this class. Correctly handles
- * arrays.
- */
- public long getTotalInstanceSize() {
- int count = instances.size();
- if (count == 0 || !isArray()) {
- return count * instanceSize;
- }
-
- // array class and non-zero count, we have to
- // get the size of each instance and sum it
- long result = 0;
- for (int i = 0; i < count; i++) {
- JavaThing t = (JavaThing) instances.elementAt(i);
- result += t.getSize();
- }
- return result;
- }
-
- /**
- * @return the size of this object
- */
- public int getSize() {
- JavaClass cl = mySnapshot.getJavaLangClass();
- if (cl == null) {
- return 0;
- } else {
- return cl.getInstanceSize();
- }
- }
-
- public void visitReferencedObjects(JavaHeapObjectVisitor v) {
- super.visitReferencedObjects(v);
- JavaHeapObject sc = getSuperclass();
- if (sc != null) v.visit(getSuperclass());
-
- JavaThing other;
- other = getLoader();
- if (other instanceof JavaHeapObject) {
- v.visit((JavaHeapObject)other);
- }
- other = getSigners();
- if (other instanceof JavaHeapObject) {
- v.visit((JavaHeapObject)other);
- }
- other = getProtectionDomain();
- if (other instanceof JavaHeapObject) {
- v.visit((JavaHeapObject)other);
- }
-
- for (int i = 0; i < statics.length; i++) {
- JavaField f = statics[i].getField();
- if (!v.exclude(this, f) && f.hasId()) {
- other = statics[i].getValue();
- if (other instanceof JavaHeapObject) {
- v.visit((JavaHeapObject) other);
- }
- }
- }
- }
-
- // package-privates below this point
- final ReadBuffer getReadBuffer() {
- return mySnapshot.getReadBuffer();
- }
-
- final void setNew(JavaHeapObject obj, boolean flag) {
- mySnapshot.setNew(obj, flag);
- }
-
- final boolean isNew(JavaHeapObject obj) {
- return mySnapshot.isNew(obj);
- }
-
- final StackTrace getSiteTrace(JavaHeapObject obj) {
- return mySnapshot.getSiteTrace(obj);
- }
-
- final void addReferenceFromRoot(Root root, JavaHeapObject obj) {
- mySnapshot.addReferenceFromRoot(root, obj);
- }
-
- final Root getRoot(JavaHeapObject obj) {
- return mySnapshot.getRoot(obj);
- }
-
- final Snapshot getSnapshot() {
- return mySnapshot;
- }
-
- void addInstance(JavaHeapObject inst) {
- instances.addElement(inst);
- }
-
- // Internals only below this point
- private void addFields(Vector<JavaField> v) {
- if (superclass != null) {
- ((JavaClass) superclass).addFields(v);
- }
- for (int i = 0; i < fields.length; i++) {
- v.addElement(fields[i]);
- }
- }
-
- private void addSubclassInstances(Vector<JavaHeapObject> v) {
- for (int i = 0; i < subclasses.length; i++) {
- subclasses[i].addSubclassInstances(v);
- }
- for (int i = 0; i < instances.size(); i++) {
- v.addElement(instances.elementAt(i));
- }
- }
-
- private void addSubclass(JavaClass sub) {
- JavaClass newValue[] = new JavaClass[subclasses.length + 1];
- System.arraycopy(subclasses, 0, newValue, 0, subclasses.length);
- newValue[subclasses.length] = sub;
- subclasses = newValue;
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaDouble.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Represents a double (i.e. a double field in an instance).
- *
- * @author Bill Foote
- */
-
-
-public class JavaDouble extends JavaValue {
-
- double value;
-
- public JavaDouble(double value) {
- this.value = value;
- }
-
- public String toString() {
- return Double.toString(value);
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaField.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-
-/**
- *
- * @author Bill Foote
- */
-
-public class JavaField {
-
- private String name;
- private String signature;
-
- public JavaField(String name, String signature) {
- this.name = name;
- this.signature = signature;
- }
-
-
- /**
- * @return true if the type of this field is something that has an ID.
- * int fields, for exampe, don't.
- */
- public boolean hasId() {
- char ch = signature.charAt(0);
- return (ch == '[' || ch == 'L');
- }
-
- public String getName() {
- return name;
- }
-
- public String getSignature() {
- return signature;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaFloat.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Represents a float (i.e. a float field in an instance).
- *
- * @author Bill Foote
- */
-
-
-public class JavaFloat extends JavaValue {
-
- float value;
-
- public JavaFloat(float value) {
- this.value = value;
- }
-
- public String toString() {
- return Float.toString(value);
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaHeapObject.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import jdk.test.lib.hprof.util.Misc;
-
-
-/**
- *
- * @author Bill Foote
- */
-
-/**
- * Represents an object that's allocated out of the Java heap. It occupies
- * memory in the VM, and is the sort of thing that in a JDK 1.1 VM had
- * a handle. It can be a
- * JavaClass, a JavaObjectArray, a JavaValueArray or a JavaObject.
- */
-
-public abstract class JavaHeapObject extends JavaThing {
-
- //
- // Who we refer to. This is heavily optimized for space, because it's
- // well worth trading a bit of speed for less swapping.
- // referers and referersLen go through two phases: Building and
- // resolved. When building, referers might have duplicates, but can
- // be appended to. When resolved, referers has no duplicates or
- // empty slots.
- //
- private JavaThing[] referers = null;
- private int referersLen = 0; // -1 when resolved
-
- public abstract JavaClass getClazz();
- public abstract int getSize();
- public abstract long getId();
-
- /**
- * Do any initialization this thing needs after its data is read in.
- * Subclasses that override this should call super.resolve().
- */
- public void resolve(Snapshot snapshot) {
- StackTrace trace = snapshot.getSiteTrace(this);
- if (trace != null) {
- trace.resolve(snapshot);
- }
- }
-
- //
- // Eliminate duplicates from referers, and size the array exactly.
- // This sets us up to answer queries. See the comments around the
- // referers data member for details.
- //
- void setupReferers() {
- if (referersLen > 1) {
- // Copy referers to map, screening out duplicates
- Map<JavaThing, JavaThing> map = new HashMap<JavaThing, JavaThing>();
- for (int i = 0; i < referersLen; i++) {
- if (map.get(referers[i]) == null) {
- map.put(referers[i], referers[i]);
- }
- }
-
- // Now copy into the array
- referers = new JavaThing[map.size()];
- map.keySet().toArray(referers);
- }
- referersLen = -1;
- }
-
-
- /**
- * @return the id of this thing as hex string
- */
- public String getIdString() {
- return Misc.toHex(getId());
- }
-
- public String toString() {
- return getClazz().getName() + "@" + getIdString();
- }
-
- /**
- * @return the StackTrace of the point of allocation of this object,
- * or null if unknown
- */
- public StackTrace getAllocatedFrom() {
- return getClazz().getSiteTrace(this);
- }
-
- public boolean isNew() {
- return getClazz().isNew(this);
- }
-
- void setNew(boolean flag) {
- getClazz().setNew(this, flag);
- }
-
- /**
- * Tell the visitor about all of the objects we refer to
- */
- public void visitReferencedObjects(JavaHeapObjectVisitor v) {
- v.visit(getClazz());
- }
-
- void addReferenceFrom(JavaHeapObject other) {
- if (referersLen == 0) {
- referers = new JavaThing[1]; // It was null
- } else if (referersLen == referers.length) {
- JavaThing[] copy = new JavaThing[(3 * (referersLen + 1)) / 2];
- System.arraycopy(referers, 0, copy, 0, referersLen);
- referers = copy;
- }
- referers[referersLen++] = other;
- // We just append to referers here. Measurements have shown that
- // around 10% to 30% are duplicates, so it's better to just append
- // blindly and screen out all the duplicates at once.
- }
-
- void addReferenceFromRoot(Root r) {
- getClazz().addReferenceFromRoot(r, this);
- }
-
- /**
- * If the rootset includes this object, return a Root describing one
- * of the reasons why.
- */
- public Root getRoot() {
- return getClazz().getRoot(this);
- }
-
- /**
- * Tell who refers to us.
- *
- * @return an Enumeration of JavaHeapObject instances
- */
- public Enumeration<JavaThing> getReferers() {
- if (referersLen != -1) {
- throw new RuntimeException("not resolved: " + getIdString());
- }
- return new Enumeration<JavaThing>() {
-
- private int num = 0;
-
- public boolean hasMoreElements() {
- return referers != null && num < referers.length;
- }
-
- public JavaThing nextElement() {
- return referers[num++];
- }
- };
- }
-
- /**
- * Given other, which the caller promises is in referers, determines if
- * the reference is only a weak reference.
- */
- public boolean refersOnlyWeaklyTo(Snapshot ss, JavaThing other) {
- return false;
- }
-
- /**
- * Describe the reference that this thing has to target. This will only
- * be called if target is in the array returned by getChildrenForRootset.
- */
- public String describeReferenceTo(JavaThing target, Snapshot ss) {
- return "??";
- }
-
- public boolean isHeapAllocated() {
- return true;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaHeapObjectVisitor.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * A visitor for a JavaThing. @see JavaObject#visitReferencedObjects()
- *
- * @author Bill Foote
- */
-
-
-public interface JavaHeapObjectVisitor {
- public void visit(JavaHeapObject other);
-
- /**
- * Should the given field be excluded from the set of things visited?
- * @return true if it should.
- */
- public boolean exclude(JavaClass clazz, JavaField f);
-
- /**
- * @return true iff exclude might ever return true
- */
- public boolean mightExclude();
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaInt.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Represents an integer (i.e. an int field in an instance).
- *
- * @author Bill Foote
- */
-
-
-public class JavaInt extends JavaValue {
-
- int value;
-
- public JavaInt(int value) {
- this.value = value;
- }
-
- public String toString() {
- return "" + value;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaLazyReadObject.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import java.io.IOException;
-import jdk.test.lib.hprof.parser.ReadBuffer;
-
-/*
- * Base class for lazily read Java heap objects.
- */
-public abstract class JavaLazyReadObject extends JavaHeapObject {
-
- // file offset from which this object data starts
- private final long offset;
-
- protected JavaLazyReadObject(long offset) {
- this.offset = offset;
- }
-
- public final int getSize() {
- return getValueLength() + getClazz().getMinimumObjectSize();
- }
-
- protected final long getOffset() {
- return offset;
- }
-
- // return the length of the data for this object
- protected final int getValueLength() {
- try {
- return readValueLength();
- } catch (IOException exp) {
- System.err.println("lazy read failed at offset " + offset);
- exp.printStackTrace();
- return 0;
- }
- }
-
- // get this object's content as byte array
- protected final byte[] getValue() {
- try {
- return readValue();
- } catch (IOException exp) {
- System.err.println("lazy read failed at offset " + offset);
- exp.printStackTrace();
- return Snapshot.EMPTY_BYTE_ARRAY;
- }
- }
-
- // get ID of this object
- public final long getId() {
- try {
- ReadBuffer buf = getClazz().getReadBuffer();
- int idSize = getClazz().getIdentifierSize();
- if (idSize == 4) {
- return ((long)buf.getInt(offset)) & Snapshot.SMALL_ID_MASK;
- } else {
- return buf.getLong(offset);
- }
- } catch (IOException exp) {
- System.err.println("lazy read failed at offset " + offset);
- exp.printStackTrace();
- return -1;
- }
- }
-
- protected abstract int readValueLength() throws IOException;
- protected abstract byte[] readValue() throws IOException;
-
- // make Integer or Long for given object ID
- protected static Number makeId(long id) {
- if ((id & ~Snapshot.SMALL_ID_MASK) == 0) {
- return (int)id;
- } else {
- return id;
- }
- }
-
- // get ID as long value from Number
- protected static long getIdValue(Number num) {
- long id = num.longValue();
- if (num instanceof Integer) {
- id &= Snapshot.SMALL_ID_MASK;
- }
- return id;
- }
-
- // read object ID from given index from given byte array
- protected final long objectIdAt(int index, byte[] data) {
- int idSize = getClazz().getIdentifierSize();
- if (idSize == 4) {
- return ((long)intAt(index, data)) & Snapshot.SMALL_ID_MASK;
- } else {
- return longAt(index, data);
- }
- }
-
- // utility methods to read primitive types from byte array
- protected static byte byteAt(int index, byte[] value) {
- return value[index];
- }
-
- protected static boolean booleanAt(int index, byte[] value) {
- return (value[index] & 0xff) == 0? false: true;
- }
-
- protected static char charAt(int index, byte[] value) {
- int b1 = ((int) value[index++] & 0xff);
- int b2 = ((int) value[index++] & 0xff);
- return (char) ((b1 << 8) + b2);
- }
-
- protected static short shortAt(int index, byte[] value) {
- int b1 = ((int) value[index++] & 0xff);
- int b2 = ((int) value[index++] & 0xff);
- return (short) ((b1 << 8) + b2);
- }
-
- protected static int intAt(int index, byte[] value) {
- int b1 = ((int) value[index++] & 0xff);
- int b2 = ((int) value[index++] & 0xff);
- int b3 = ((int) value[index++] & 0xff);
- int b4 = ((int) value[index++] & 0xff);
- return ((b1 << 24) + (b2 << 16) + (b3 << 8) + b4);
- }
-
- protected static long longAt(int index, byte[] value) {
- long val = 0;
- for (int j = 0; j < 8; j++) {
- val = val << 8;
- int b = ((int)value[index++]) & 0xff;
- val |= b;
- }
- return val;
- }
-
- protected static float floatAt(int index, byte[] value) {
- int val = intAt(index, value);
- return Float.intBitsToFloat(val);
- }
-
- protected static double doubleAt(int index, byte[] value) {
- long val = longAt(index, value);
- return Double.longBitsToDouble(val);
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaLong.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Represents a long (i.e. a long field in an instance).
- *
- * @author Bill Foote
- */
-
-
-public class JavaLong extends JavaValue {
-
- long value;
-
- public JavaLong(long value) {
- this.value = value;
- }
-
- public String toString() {
- return Long.toString(value);
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaObject.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import java.io.IOException;
-import jdk.test.lib.hprof.parser.ReadBuffer;
-
-/**
- * Represents Java instance
- *
- * @author Bill Foote
- */
-public class JavaObject extends JavaLazyReadObject {
-
- private Object clazz; // Number before resolve
- // JavaClass after resolve
- /**
- * Construct a new JavaObject.
- *
- * @param classID id of the class object
- * @param offset The offset of field data
- */
- public JavaObject(long classID, long offset) {
- super(offset);
- this.clazz = makeId(classID);
- }
-
- public void resolve(Snapshot snapshot) {
- if (clazz instanceof JavaClass) {
- return;
- }
- if (clazz instanceof Number) {
- long classID = getIdValue((Number)clazz);
- clazz = snapshot.findThing(classID);
- if (! (clazz instanceof JavaClass)) {
- warn("Class " + Long.toHexString(classID) + " not found, " +
- "adding fake class!");
- int length;
- ReadBuffer buf = snapshot.getReadBuffer();
- int idSize = snapshot.getIdentifierSize();
- long lenOffset = getOffset() + 2*idSize + 4;
- try {
- length = buf.getInt(lenOffset);
- } catch (IOException exp) {
- throw new RuntimeException(exp);
- }
- clazz = snapshot.addFakeInstanceClass(classID, length);
- }
- } else {
- throw new InternalError("should not reach here");
- }
-
- JavaClass cl = (JavaClass) clazz;
- cl.resolve(snapshot);
-
- // while resolving, parse fields in verbose mode.
- // but, getFields calls parseFields in non-verbose mode
- // to avoid printing warnings repeatedly.
- parseFields(getValue(), true);
-
- cl.addInstance(this);
- super.resolve(snapshot);
- }
-
- /**
- * Are we the same type as other? We are iff our clazz is the
- * same type as other's.
- */
- public boolean isSameTypeAs(JavaThing other) {
- if (!(other instanceof JavaObject)) {
- return false;
- }
- JavaObject oo = (JavaObject) other;
- return getClazz().equals(oo.getClazz());
- }
-
- /**
- * Return our JavaClass object. This may only be called after resolve.
- */
- public JavaClass getClazz() {
- return (JavaClass) clazz;
- }
-
- public JavaThing[] getFields() {
- // pass false to verbose mode so that dereference
- // warnings are not printed.
- return parseFields(getValue(), false);
- }
-
- // returns the value of field of given name
- public JavaThing getField(String name) {
- JavaThing[] flds = getFields();
- JavaField[] instFields = getClazz().getFieldsForInstance();
- for (int i = 0; i < instFields.length; i++) {
- if (instFields[i].getName().equals(name)) {
- return flds[i];
- }
- }
- return null;
- }
-
- public int compareTo(JavaThing other) {
- if (other instanceof JavaObject) {
- JavaObject oo = (JavaObject) other;
- return getClazz().getName().compareTo(oo.getClazz().getName());
- }
- return super.compareTo(other);
- }
-
- public void visitReferencedObjects(JavaHeapObjectVisitor v) {
- super.visitReferencedObjects(v);
- JavaThing[] flds = getFields();
- for (int i = 0; i < flds.length; i++) {
- if (flds[i] != null) {
- if (v.mightExclude()
- && v.exclude(getClazz().getClassForField(i),
- getClazz().getFieldForInstance(i)))
- {
- // skip it
- } else if (flds[i] instanceof JavaHeapObject) {
- v.visit((JavaHeapObject) flds[i]);
- }
- }
- }
- }
-
- public boolean refersOnlyWeaklyTo(Snapshot ss, JavaThing other) {
- if (ss.getWeakReferenceClass() != null) {
- final int referentFieldIndex = ss.getReferentFieldIndex();
- if (ss.getWeakReferenceClass().isAssignableFrom(getClazz())) {
- //
- // REMIND: This introduces a dependency on the JDK
- // implementation that is undesirable.
- JavaThing[] flds = getFields();
- for (int i = 0; i < flds.length; i++) {
- if (i != referentFieldIndex && flds[i] == other) {
- return false;
- }
- }
- return true;
- }
- }
- return false;
- }
-
- /**
- * Describe the reference that this thing has to target. This will only
- * be called if target is in the array returned by getChildrenForRootset.
- */
- public String describeReferenceTo(JavaThing target, Snapshot ss) {
- JavaThing[] flds = getFields();
- for (int i = 0; i < flds.length; i++) {
- if (flds[i] == target) {
- JavaField f = getClazz().getFieldForInstance(i);
- return "field " + f.getName();
- }
- }
- return super.describeReferenceTo(target, ss);
- }
-
- public String toString() {
- if (getClazz().isString()) {
- JavaThing value = getField("value");
- if (value instanceof JavaValueArray) {
- return ((JavaValueArray)value).valueString();
- } else {
- return "null";
- }
- } else {
- return super.toString();
- }
- }
-
- // Internals only below this point
-
- /*
- * Java instance record (HPROF_GC_INSTANCE_DUMP) looks as below:
- *
- * object ID
- * stack trace serial number (int)
- * class ID
- * data length (int)
- * byte[length]
- */
- protected final int readValueLength() throws IOException {
- JavaClass cl = getClazz();
- int idSize = cl.getIdentifierSize();
- long lengthOffset = getOffset() + 2*idSize + 4;
- return cl.getReadBuffer().getInt(lengthOffset);
- }
-
- protected final byte[] readValue() throws IOException {
- JavaClass cl = getClazz();
- int idSize = cl.getIdentifierSize();
- ReadBuffer buf = cl.getReadBuffer();
- long offset = getOffset() + 2*idSize + 4;
- int length = buf.getInt(offset);
- if (length == 0) {
- return Snapshot.EMPTY_BYTE_ARRAY;
- } else {
- byte[] res = new byte[length];
- buf.get(offset + 4, res);
- return res;
- }
- }
-
- private JavaThing[] parseFields(byte[] data, boolean verbose) {
- JavaClass cl = getClazz();
- int target = cl.getNumFieldsForInstance();
- JavaField[] fields = cl.getFields();
- JavaThing[] fieldValues = new JavaThing[target];
- Snapshot snapshot = cl.getSnapshot();
- int idSize = snapshot.getIdentifierSize();
- int fieldNo = 0;
- // In the dump file, the fields are stored in this order:
- // fields of most derived class (immediate class) are stored
- // first and then the super class and so on. In this object,
- // fields are stored in the reverse ("natural") order. i.e.,
- // fields of most super class are stored first.
-
- // target variable is used to compensate for the fact that
- // the dump file starts field values from the leaf working
- // upwards in the inheritance hierarchy, whereas JavaObject
- // starts with the top of the inheritance hierarchy and works down.
- target -= fields.length;
- JavaClass currClass = cl;
- int index = 0;
- for (int i = 0; i < fieldValues.length; i++, fieldNo++) {
- while (fieldNo >= fields.length) {
- currClass = currClass.getSuperclass();
- fields = currClass.getFields();
- fieldNo = 0;
- target -= fields.length;
- }
- JavaField f = fields[fieldNo];
- char sig = f.getSignature().charAt(0);
- switch (sig) {
- case 'L':
- case '[': {
- long id = objectIdAt(index, data);
- index += idSize;
- JavaObjectRef ref = new JavaObjectRef(id);
- fieldValues[target+fieldNo] = ref.dereference(snapshot, f, verbose);
- break;
- }
- case 'Z': {
- byte value = byteAt(index, data);
- index++;
- fieldValues[target+fieldNo] = new JavaBoolean(value != 0);
- break;
- }
- case 'B': {
- byte value = byteAt(index, data);
- index++;
- fieldValues[target+fieldNo] = new JavaByte(value);
- break;
- }
- case 'S': {
- short value = shortAt(index, data);
- index += 2;
- fieldValues[target+fieldNo] = new JavaShort(value);
- break;
- }
- case 'C': {
- char value = charAt(index, data);
- index += 2;
- fieldValues[target+fieldNo] = new JavaChar(value);
- break;
- }
- case 'I': {
- int value = intAt(index, data);
- index += 4;
- fieldValues[target+fieldNo] = new JavaInt(value);
- break;
- }
- case 'J': {
- long value = longAt(index, data);
- index += 8;
- fieldValues[target+fieldNo] = new JavaLong(value);
- break;
- }
- case 'F': {
- float value = floatAt(index, data);
- index += 4;
- fieldValues[target+fieldNo] = new JavaFloat(value);
- break;
- }
- case 'D': {
- double value = doubleAt(index, data);
- index += 8;
- fieldValues[target+fieldNo] = new JavaDouble(value);
- break;
- }
- default:
- throw new RuntimeException("invalid signature: " + sig);
- }
- }
- return fieldValues;
- }
-
- private void warn(String msg) {
- System.out.println("WARNING: " + msg);
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaObjectArray.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import java.io.IOException;
-import jdk.test.lib.hprof.parser.ReadBuffer;
-
-/**
- * @author Bill Foote
- */
-public class JavaObjectArray extends JavaLazyReadObject {
-
- private Object clazz; // Long before resolve, the class after resolve
-
- public JavaObjectArray(long classID, long offset) {
- super(offset);
- this.clazz = makeId(classID);
- }
-
- public JavaClass getClazz() {
- return (JavaClass) clazz;
- }
-
- public void resolve(Snapshot snapshot) {
- if (clazz instanceof JavaClass) {
- return;
- }
- long classID = getIdValue((Number)clazz);
- if (snapshot.isNewStyleArrayClass()) {
- // Modern heap dumps do this
- JavaThing t = snapshot.findThing(classID);
- if (t instanceof JavaClass) {
- clazz = (JavaClass) t;
- }
- }
- if (!(clazz instanceof JavaClass)) {
- JavaThing t = snapshot.findThing(classID);
- if (t != null && t instanceof JavaClass) {
- JavaClass el = (JavaClass) t;
- String nm = el.getName();
- if (!nm.startsWith("[")) {
- nm = "L" + el.getName() + ";";
- }
- clazz = snapshot.getArrayClass(nm);
- }
- }
-
- if (!(clazz instanceof JavaClass)) {
- clazz = snapshot.getOtherArrayType();
- }
- ((JavaClass)clazz).addInstance(this);
- super.resolve(snapshot);
- }
-
- public JavaThing[] getValues() {
- return getElements();
- }
-
- public JavaThing[] getElements() {
- Snapshot snapshot = getClazz().getSnapshot();
- byte[] data = getValue();
- final int idSize = snapshot.getIdentifierSize();
- final int numElements = data.length / idSize;
- JavaThing[] elements = new JavaThing[numElements];
- int index = 0;
- for (int i = 0; i < elements.length; i++) {
- long id = objectIdAt(index, data);
- index += idSize;
- elements[i] = snapshot.findThing(id);
- }
- return elements;
- }
-
- public int compareTo(JavaThing other) {
- if (other instanceof JavaObjectArray) {
- return 0;
- }
- return super.compareTo(other);
- }
-
- public int getLength() {
- return getValueLength() / getClazz().getIdentifierSize();
- }
-
- public void visitReferencedObjects(JavaHeapObjectVisitor v) {
- super.visitReferencedObjects(v);
- JavaThing[] elements = getElements();
- for (int i = 0; i < elements.length; i++) {
- if (elements[i] != null && elements[i] instanceof JavaHeapObject) {
- v.visit((JavaHeapObject) elements[i]);
- }
- }
- }
-
- /**
- * Describe the reference that this thing has to target. This will only
- * be called if target is in the array returned by getChildrenForRootset.
- */
- public String describeReferenceTo(JavaThing target, Snapshot ss) {
- JavaThing[] elements = getElements();
- for (int i = 0; i < elements.length; i++) {
- if (elements[i] == target) {
- return "Element " + i + " of " + this;
- }
- }
- return super.describeReferenceTo(target, ss);
- }
-
- /*
- * Java object array record (HPROF_GC_OBJ_ARRAY_DUMP)
- * looks as below:
- *
- * object ID
- * stack trace serial number (int)
- * array length (int)
- * array class ID
- * array element IDs
- */
- protected final int readValueLength() throws IOException {
- JavaClass cl = getClazz();
- ReadBuffer buf = cl.getReadBuffer();
- int idSize = cl.getIdentifierSize();
- long offset = getOffset() + idSize + 4;
- int len = buf.getInt(offset);
- return len * cl.getIdentifierSize();
- }
-
- protected final byte[] readValue() throws IOException {
- JavaClass cl = getClazz();
- ReadBuffer buf = cl.getReadBuffer();
- int idSize = cl.getIdentifierSize();
- long offset = getOffset() + idSize + 4;
- int len = buf.getInt(offset);
- if (len == 0) {
- return Snapshot.EMPTY_BYTE_ARRAY;
- } else {
- byte[] res = new byte[len * idSize];
- buf.get(offset + 4 + idSize, res);
- return res;
- }
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaObjectRef.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import jdk.test.lib.hprof.util.Misc;
-
-/**
- * A forward reference to an object. This is an intermediate representation
- * for a JavaThing, when we have the thing's ID, but we might not have read
- * the thing yet.
- *
- * @author Bill Foote
- */
-public class JavaObjectRef extends JavaThing {
- private long id;
-
- public JavaObjectRef(long id) {
- this.id = id;
- }
-
- public long getId() {
- return id;
- }
-
- public boolean isHeapAllocated() {
- return true;
- }
-
- public JavaThing dereference(Snapshot snapshot, JavaField field) {
- return dereference(snapshot, field, true);
- }
-
- public JavaThing dereference(Snapshot snapshot, JavaField field, boolean verbose) {
- if (field != null && !field.hasId()) {
- // If this happens, we must be a field that represents an int.
- // (This only happens with .bod-style files)
- return new JavaLong(id);
- }
- if (id == 0) {
- return snapshot.getNullThing();
- }
- JavaThing result = snapshot.findThing(id);
- if (result == null) {
- if (!snapshot.getUnresolvedObjectsOK() && verbose) {
- String msg = "WARNING: Failed to resolve object id "
- + Misc.toHex(id);
- if (field != null) {
- msg += " for field " + field.getName()
- + " (signature " + field.getSignature() + ")";
- }
- System.out.println(msg);
- // Thread.dumpStack();
- }
- result = new HackJavaValue("Unresolved object "
- + Misc.toHex(id), 0);
- }
- return result;
- }
-
- public int getSize() {
- return 0;
- }
-
- public String toString() {
- return "Unresolved object " + Misc.toHex(id);
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaShort.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Represents a short (i.e. a short field in an instance).
- *
- * @author Bill Foote
- */
-
-
-public class JavaShort extends JavaValue {
-
- short value;
-
- public JavaShort(short value) {
- this.value = value;
- }
-
- public String toString() {
- return "" + value;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaStatic.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- *
- * @author Bill Foote
- */
-
-/**
- * Represents the value of a static field of a JavaClass
- */
-
-public class JavaStatic {
-
- private JavaField field;
- private JavaThing value;
-
- public JavaStatic(JavaField field, JavaThing value) {
- this.field = field;
- this.value = value;
- }
-
- public void resolve(JavaClass clazz, Snapshot snapshot) {
- long id = -1;
- if (value instanceof JavaObjectRef) {
- id = ((JavaObjectRef)value).getId();
- }
- value = value.dereference(snapshot, field);
- if (value.isHeapAllocated() &&
- clazz.getLoader() == snapshot.getNullThing()) {
- // static fields are only roots if they are in classes
- // loaded by the root classloader.
- JavaHeapObject ho = (JavaHeapObject) value;
- String s = "Static reference from " + clazz.getName()
- + "." + field.getName();
- snapshot.addRoot(new Root(id, clazz.getId(),
- Root.JAVA_STATIC, s));
- }
- }
-
- public JavaField getField() {
- return field;
- }
-
- public JavaThing getValue() {
- return value;
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaThing.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-
-/**
- *
- * @author Bill Foote
- */
-
-
-/**
- * Represents a java "Thing". A thing is anything that can be the value of
- * a field. This includes JavaHeapObject, JavaObjectRef, and JavaValue.
- */
-
-public abstract class JavaThing {
-
- protected JavaThing() {
- }
-
- /**
- * If this is a forward reference, figure out what it really
- * refers to.
- *
- * @param snapshot The snapshot this is for
- * @param field The field this thing represents. If null, it is
- * assumed this thing is an object (and never a value).
- */
- public JavaThing dereference(Snapshot shapshot, JavaField field) {
- return this;
- }
-
-
- /**
- * Are we the same type as other?
- *
- * @see JavaObject.isSameTypeAs()
- */
- public boolean isSameTypeAs(JavaThing other) {
- return getClass() == other.getClass();
- }
- /**
- * @return true iff this represents a heap-allocated object
- */
- abstract public boolean isHeapAllocated();
-
- /**
- * @return the size of this object, in bytes, including VM overhead
- */
- abstract public int getSize();
-
- /**
- * @return a human-readable string representation of this thing
- */
- abstract public String toString();
-
- /**
- * Compare our string representation to other's
- * @see java.lang.String.compareTo()
- */
- public int compareTo(JavaThing other) {
- return toString().compareTo(other.toString());
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaValue.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Abstract base class for all value types (ints, longs, floats, etc.)
- *
- * @author Bill Foote
- */
-
-
-
-
-public abstract class JavaValue extends JavaThing {
-
- protected JavaValue() {
- }
-
- public boolean isHeapAllocated() {
- return false;
- }
-
- abstract public String toString();
-
- public int getSize() {
- // The size of a value is already accounted for in the class
- // that has the data member.
- return 0;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/JavaValueArray.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,433 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import jdk.test.lib.hprof.parser.ReadBuffer;
-import java.io.IOException;
-
-/**
- * An array of values, that is, an array of ints, boolean, floats or the like.
- *
- * @author Bill Foote
- */
-public class JavaValueArray extends JavaLazyReadObject
- /*imports*/ implements ArrayTypeCodes {
-
- private static String arrayTypeName(byte sig) {
- switch (sig) {
- case 'B':
- return "byte[]";
- case 'Z':
- return "boolean[]";
- case 'C':
- return "char[]";
- case 'S':
- return "short[]";
- case 'I':
- return "int[]";
- case 'F':
- return "float[]";
- case 'J':
- return "long[]";
- case 'D':
- return "double[]";
- default:
- throw new RuntimeException("invalid array element sig: " + sig);
- }
- }
-
- private static int elementSize(byte type) {
- switch (type) {
- case T_BYTE:
- case T_BOOLEAN:
- return 1;
- case T_CHAR:
- case T_SHORT:
- return 2;
- case T_INT:
- case T_FLOAT:
- return 4;
- case T_LONG:
- case T_DOUBLE:
- return 8;
- default:
- throw new RuntimeException("invalid array element type: " + type);
- }
- }
-
- /*
- * Java primitive array record (HPROF_GC_PRIM_ARRAY_DUMP) looks
- * as below:
- *
- * object ID
- * stack trace serial number (int)
- * length of the instance data (int)
- * element type (byte)
- * array data
- */
- protected final int readValueLength() throws IOException {
- JavaClass cl = getClazz();
- ReadBuffer buf = cl.getReadBuffer();
- int idSize = cl.getIdentifierSize();
- long offset = getOffset() + idSize + 4;
- // length of the array
- int len = buf.getInt(offset);
- // typecode of array element type
- byte type = buf.getByte(offset + 4);
- return len * elementSize(type);
- }
-
- protected final byte[] readValue() throws IOException {
- JavaClass cl = getClazz();
- ReadBuffer buf = cl.getReadBuffer();
- int idSize = cl.getIdentifierSize();
- long offset = getOffset() + idSize + 4;
- // length of the array
- int length = buf.getInt(offset);
- // typecode of array element type
- byte type = buf.getByte(offset + 4);
- if (length == 0) {
- return Snapshot.EMPTY_BYTE_ARRAY;
- } else {
- length *= elementSize(type);
- byte[] res = new byte[length];
- buf.get(offset + 5, res);
- return res;
- }
- }
-
- // JavaClass set only after resolve.
- private JavaClass clazz;
-
- // This field contains elementSignature byte and
- // divider to be used to calculate length. Note that
- // length of content byte[] is not same as array length.
- // Actual array length is (byte[].length / divider)
- private int data;
-
- // First 8 bits of data is used for element signature
- private static final int SIGNATURE_MASK = 0x0FF;
-
- // Next 8 bits of data is used for length divider
- private static final int LENGTH_DIVIDER_MASK = 0x0FF00;
-
- // Number of bits to shift to get length divider
- private static final int LENGTH_DIVIDER_SHIFT = 8;
-
- public JavaValueArray(byte elementSignature, long offset) {
- super(offset);
- this.data = (elementSignature & SIGNATURE_MASK);
- }
-
- public JavaClass getClazz() {
- return clazz;
- }
-
- public void visitReferencedObjects(JavaHeapObjectVisitor v) {
- super.visitReferencedObjects(v);
- }
-
- public void resolve(Snapshot snapshot) {
- if (clazz instanceof JavaClass) {
- return;
- }
- byte elementSig = getElementType();
- clazz = snapshot.findClass(arrayTypeName(elementSig));
- if (clazz == null) {
- clazz = snapshot.getArrayClass("" + ((char) elementSig));
- }
- getClazz().addInstance(this);
- super.resolve(snapshot);
- }
-
- public int getLength() {
- int divider = (data & LENGTH_DIVIDER_MASK) >>> LENGTH_DIVIDER_SHIFT;
- if (divider == 0) {
- byte elementSignature = getElementType();
- switch (elementSignature) {
- case 'B':
- case 'Z':
- divider = 1;
- break;
- case 'C':
- case 'S':
- divider = 2;
- break;
- case 'I':
- case 'F':
- divider = 4;
- break;
- case 'J':
- case 'D':
- divider = 8;
- break;
- default:
- throw new RuntimeException("unknown primitive type: " +
- elementSignature);
- }
- data |= (divider << LENGTH_DIVIDER_SHIFT);
- }
- return (getValueLength() / divider);
- }
-
- public Object getElements() {
- final int len = getLength();
- final byte et = getElementType();
- byte[] data = getValue();
- int index = 0;
- switch (et) {
- case 'Z': {
- boolean[] res = new boolean[len];
- for (int i = 0; i < len; i++) {
- res[i] = booleanAt(index, data);
- index++;
- }
- return res;
- }
- case 'B': {
- byte[] res = new byte[len];
- for (int i = 0; i < len; i++) {
- res[i] = byteAt(index, data);
- index++;
- }
- return res;
- }
- case 'C': {
- char[] res = new char[len];
- for (int i = 0; i < len; i++) {
- res[i] = charAt(index, data);
- index += 2;
- }
- return res;
- }
- case 'S': {
- short[] res = new short[len];
- for (int i = 0; i < len; i++) {
- res[i] = shortAt(index, data);
- index += 2;
- }
- return res;
- }
- case 'I': {
- int[] res = new int[len];
- for (int i = 0; i < len; i++) {
- res[i] = intAt(index, data);
- index += 4;
- }
- return res;
- }
- case 'J': {
- long[] res = new long[len];
- for (int i = 0; i < len; i++) {
- res[i] = longAt(index, data);
- index += 8;
- }
- return res;
- }
- case 'F': {
- float[] res = new float[len];
- for (int i = 0; i < len; i++) {
- res[i] = floatAt(index, data);
- index += 4;
- }
- return res;
- }
- case 'D': {
- double[] res = new double[len];
- for (int i = 0; i < len; i++) {
- res[i] = doubleAt(index, data);
- index += 8;
- }
- return res;
- }
- default: {
- throw new RuntimeException("unknown primitive type?");
- }
- }
- }
-
- public byte getElementType() {
- return (byte) (data & SIGNATURE_MASK);
- }
-
- private void checkIndex(int index) {
- if (index < 0 || index >= getLength()) {
- throw new ArrayIndexOutOfBoundsException(index);
- }
- }
-
- private void requireType(char type) {
- if (getElementType() != type) {
- throw new RuntimeException("not of type : " + type);
- }
- }
-
- public boolean getBooleanAt(int index) {
- checkIndex(index);
- requireType('Z');
- return booleanAt(index, getValue());
- }
-
- public byte getByteAt(int index) {
- checkIndex(index);
- requireType('B');
- return byteAt(index, getValue());
- }
-
- public char getCharAt(int index) {
- checkIndex(index);
- requireType('C');
- return charAt(index << 1, getValue());
- }
-
- public short getShortAt(int index) {
- checkIndex(index);
- requireType('S');
- return shortAt(index << 1, getValue());
- }
-
- public int getIntAt(int index) {
- checkIndex(index);
- requireType('I');
- return intAt(index << 2, getValue());
- }
-
- public long getLongAt(int index) {
- checkIndex(index);
- requireType('J');
- return longAt(index << 3, getValue());
- }
-
- public float getFloatAt(int index) {
- checkIndex(index);
- requireType('F');
- return floatAt(index << 2, getValue());
- }
-
- public double getDoubleAt(int index) {
- checkIndex(index);
- requireType('D');
- return doubleAt(index << 3, getValue());
- }
-
- public String valueString() {
- return valueString(true);
- }
-
- public String valueString(boolean bigLimit) {
- // Char arrays deserve special treatment
- StringBuilder result;
- byte[] value = getValue();
- int max = value.length;
- byte elementSignature = getElementType();
- if (elementSignature == 'C') {
- result = new StringBuilder();
- for (int i = 0; i < value.length; ) {
- char val = charAt(i, value);
- result.append(val);
- i += 2;
- }
- } else {
- int limit = 8;
- if (bigLimit) {
- limit = 1000;
- }
- result = new StringBuilder("{");
- int num = 0;
- for (int i = 0; i < value.length; ) {
- if (num > 0) {
- result.append(", ");
- }
- if (num >= limit) {
- result.append("... ");
- break;
- }
- num++;
- switch (elementSignature) {
- case 'Z': {
- boolean val = booleanAt(i, value);
- if (val) {
- result.append("true");
- } else {
- result.append("false");
- }
- i++;
- break;
- }
- case 'B': {
- int val = 0xFF & byteAt(i, value);
- result.append("0x").append(Integer.toString(val, 16));
- i++;
- break;
- }
- case 'S': {
- short val = shortAt(i, value);
- i += 2;
- result.append(val);
- break;
- }
- case 'I': {
- int val = intAt(i, value);
- i += 4;
- result.append(val);
- break;
- }
- case 'J': { // long
- long val = longAt(i, value);
- result.append(val);
- i += 8;
- break;
- }
- case 'F': {
- float val = floatAt(i, value);
- result.append(val);
- i += 4;
- break;
- }
- case 'D': { // double
- double val = doubleAt(i, value);
- result.append(val);
- i += 8;
- break;
- }
- default: {
- throw new RuntimeException("unknown primitive type?");
- }
- }
- }
- result.append('}');
- }
- return result.toString();
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/ReachableExcludes.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-
-/**
- * This represents a set of data members that should be excluded from the
- * reachable objects query. This is useful to exclude observers from the
- * transitive closure of objects reachable from a given object, allowing
- * some kind of real determination of the "size" of that object.
- *
- */
-
-public interface ReachableExcludes {
- /**
- * @return true iff the given field is on the hitlist of excluded
- * fields.
- */
- public boolean isExcluded(String fieldName);
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/ReachableExcludesImpl.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.BufferedReader;
-import java.io.IOException;
-
-import java.util.Hashtable;
-
-/**
- * This represents a set of data members that should be excluded from the
- * reachable objects query.
- * This is useful to exclude observers from the
- * transitive closure of objects reachable from a given object, allowing
- * some kind of real determination of the "size" of that object.
- *
- * @author Bill Foote
- */
-public class ReachableExcludesImpl implements ReachableExcludes {
-
- private File excludesFile;
- private long lastModified;
- private Hashtable<String, String> methods; // Used as a bag
-
- /**
- * Create a new ReachableExcludesImpl over the given file. The file will be
- * re-read whenever the timestamp changes.
- */
- public ReachableExcludesImpl(File excludesFile) {
- this.excludesFile = excludesFile;
- readFile();
- }
-
- private void readFileIfNeeded() {
- if (excludesFile.lastModified() != lastModified) {
- synchronized(this) {
- if (excludesFile.lastModified() != lastModified) {
- readFile();
- }
- }
- }
- }
-
- private void readFile() {
- long lm = excludesFile.lastModified();
- Hashtable<String, String> m = new Hashtable<String, String>();
-
- try (BufferedReader r = new BufferedReader(new InputStreamReader(
- new FileInputStream(excludesFile)))) {
- String method;
- while ((method = r.readLine()) != null) {
- m.put(method, method);
- }
- lastModified = lm;
- methods = m; // We want this to be atomic
- } catch (IOException ex) {
- System.out.println("Error reading " + excludesFile + ": " + ex);
- }
- }
-
- /**
- * @return true iff the given field is on the histlist of excluded
- * fields.
- */
- public boolean isExcluded(String fieldName) {
- readFileIfNeeded();
- return methods.get(fieldName) != null;
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/ReachableObjects.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import java.util.Vector;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
-import jdk.test.lib.hprof.util.ArraySorter;
-import jdk.test.lib.hprof.util.Comparer;
-
-/**
- * @author A. Sundararajan
- */
-
-public class ReachableObjects {
- public ReachableObjects(JavaHeapObject root,
- final ReachableExcludes excludes) {
- this.root = root;
-
- final Hashtable<JavaHeapObject, JavaHeapObject> bag = new Hashtable<JavaHeapObject, JavaHeapObject>();
- final Hashtable<String, String> fieldsExcluded = new Hashtable<String, String>(); //Bag<String>
- final Hashtable<String, String> fieldsUsed = new Hashtable<String, String>(); // Bag<String>
- JavaHeapObjectVisitor visitor = new AbstractJavaHeapObjectVisitor() {
- public void visit(JavaHeapObject t) {
- // Size is zero for things like integer fields
- if (t != null && t.getSize() > 0 && bag.get(t) == null) {
- bag.put(t, t);
- t.visitReferencedObjects(this);
- }
- }
-
- public boolean mightExclude() {
- return excludes != null;
- }
-
- public boolean exclude(JavaClass clazz, JavaField f) {
- if (excludes == null) {
- return false;
- }
- String nm = clazz.getName() + "." + f.getName();
- if (excludes.isExcluded(nm)) {
- fieldsExcluded.put(nm, nm);
- return true;
- } else {
- fieldsUsed.put(nm, nm);
- return false;
- }
- }
- };
- // Put the closure of root and all objects reachable from root into
- // bag (depth first), but don't include root:
- visitor.visit(root);
- bag.remove(root);
-
- // Now grab the elements into a vector, and sort it in decreasing size
- JavaThing[] things = new JavaThing[bag.size()];
- int i = 0;
- for (Enumeration<JavaHeapObject> e = bag.elements(); e.hasMoreElements(); ) {
- things[i++] = (JavaThing) e.nextElement();
- }
- ArraySorter.sort(things, new Comparer() {
- public int compare(Object lhs, Object rhs) {
- JavaThing left = (JavaThing) lhs;
- JavaThing right = (JavaThing) rhs;
- int diff = right.getSize() - left.getSize();
- if (diff != 0) {
- return diff;
- }
- return left.compareTo(right);
- }
- });
- this.reachables = things;
-
- this.totalSize = root.getSize();
- for (i = 0; i < things.length; i++) {
- this.totalSize += things[i].getSize();
- }
-
- excludedFields = getElements(fieldsExcluded);
- usedFields = getElements(fieldsUsed);
- }
-
- public JavaHeapObject getRoot() {
- return root;
- }
-
- public JavaThing[] getReachables() {
- return reachables;
- }
-
- public long getTotalSize() {
- return totalSize;
- }
-
- public String[] getExcludedFields() {
- return excludedFields;
- }
-
- public String[] getUsedFields() {
- return usedFields;
- }
-
- private String[] getElements(Hashtable<?, ?> ht) {
- Object[] keys = ht.keySet().toArray();
- int len = keys.length;
- String[] res = new String[len];
- System.arraycopy(keys, 0, res, 0, len);
- ArraySorter.sortArrayOfStrings(res);
- return res;
- }
-
- private JavaHeapObject root;
- private JavaThing[] reachables;
- private String[] excludedFields;
- private String[] usedFields;
- private long totalSize;
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/ReferenceChain.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- * Represents a chain of references to some target object
- *
- * @author Bill Foote
- */
-
-public class ReferenceChain {
-
- JavaHeapObject obj; // Object referred to
- ReferenceChain next; // Next in chain
-
- public ReferenceChain(JavaHeapObject obj, ReferenceChain next) {
- this.obj = obj;
- this.next = next;
- }
-
- public JavaHeapObject getObj() {
- return obj;
- }
-
- public ReferenceChain getNext() {
- return next;
- }
-
- public int getDepth() {
- int count = 1;
- ReferenceChain tmp = next;
- while (tmp != null) {
- count++;
- tmp = tmp.next;
- }
- return count;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/Root.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import jdk.test.lib.hprof.util.Misc;
-
-/**
- *
- * @author Bill Foote
- */
-
-
-/**
- * Represents a member of the rootset, that is, one of the objects that
- * the GC starts from when marking reachable objects.
- */
-
-public class Root {
-
- private long id; // ID of the JavaThing we refer to
- private long refererId; // Thread or Class responsible for this, or 0
- private int index = -1; // Index in Snapshot.roots
- private int type;
- private String description;
- private JavaHeapObject referer = null;
- private StackTrace stackTrace = null;
-
- // Values for type. Higher values are more interesting -- see getType().
- // See also getTypeName()
- public final static int INVALID_TYPE = 0;
- public final static int UNKNOWN = 1;
- public final static int SYSTEM_CLASS = 2;
-
- public final static int NATIVE_LOCAL = 3;
- public final static int NATIVE_STATIC = 4;
- public final static int THREAD_BLOCK = 5;
- public final static int BUSY_MONITOR = 6;
- public final static int JAVA_LOCAL = 7;
- public final static int NATIVE_STACK = 8;
- public final static int JAVA_STATIC = 9;
-
-
- public Root(long id, long refererId, int type, String description) {
- this(id, refererId, type, description, null);
- }
-
-
- public Root(long id, long refererId, int type, String description,
- StackTrace stackTrace) {
- this.id = id;
- this.refererId = refererId;
- this.type = type;
- this.description = description;
- this.stackTrace = stackTrace;
- }
-
- public long getId() {
- return id;
- }
-
- public String getIdString() {
- return Misc.toHex(id);
- }
-
- public String getDescription() {
- if ("".equals(description)) {
- return getTypeName() + " Reference";
- } else {
- return description;
- }
- }
-
- /**
- * Return type. We guarantee that more interesting roots will have
- * a type that is numerically higher.
- */
- public int getType() {
- return type;
- }
-
- public String getTypeName() {
- switch(type) {
- case INVALID_TYPE: return "Invalid (?!?)";
- case UNKNOWN: return "Unknown";
- case SYSTEM_CLASS: return "System Class";
- case NATIVE_LOCAL: return "JNI Local";
- case NATIVE_STATIC: return "JNI Global";
- case THREAD_BLOCK: return "Thread Block";
- case BUSY_MONITOR: return "Busy Monitor";
- case JAVA_LOCAL: return "Java Local";
- case NATIVE_STACK: return "Native Stack (possibly Java local)";
- case JAVA_STATIC: return "Java Static";
- default: return "??";
- }
- }
-
- /**
- * Given two Root instances, return the one that is most interesting.
- */
- public Root mostInteresting(Root other) {
- if (other.type > this.type) {
- return other;
- } else {
- return this;
- }
- }
-
- /**
- * Get the object that's responsible for this root, if there is one.
- * This will be null, a Thread object, or a Class object.
- */
- public JavaHeapObject getReferer() {
- return referer;
- }
-
- /**
- * @return the stack trace responsible for this root, or null if there
- * is none.
- */
- public StackTrace getStackTrace() {
- return stackTrace;
- }
-
- /**
- * @return The index of this root in Snapshot.roots
- */
- public int getIndex() {
- return index;
- }
-
- void resolve(Snapshot ss) {
- if (refererId != 0) {
- referer = ss.findThing(refererId);
- }
- if (stackTrace != null) {
- stackTrace.resolve(ss);
- }
- }
-
- void setIndex(int i) {
- index = i;
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/Snapshot.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,635 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-import java.lang.ref.SoftReference;
-import java.util.*;
-
-import jdk.test.lib.hprof.parser.ReadBuffer;
-import jdk.test.lib.hprof.util.Misc;
-
-/**
- *
- * @author Bill Foote
- */
-
-/**
- * Represents a snapshot of the Java objects in the VM at one instant.
- * This is the top-level "model" object read out of a single .hprof or .bod
- * file.
- */
-
-public class Snapshot implements AutoCloseable {
-
- public static final long SMALL_ID_MASK = 0x0FFFFFFFFL;
- public static final byte[] EMPTY_BYTE_ARRAY = new byte[0];
-
- private static final JavaField[] EMPTY_FIELD_ARRAY = new JavaField[0];
- private static final JavaStatic[] EMPTY_STATIC_ARRAY = new JavaStatic[0];
-
- // all heap objects
- private Hashtable<Number, JavaHeapObject> heapObjects =
- new Hashtable<Number, JavaHeapObject>();
-
- private Hashtable<Number, JavaClass> fakeClasses =
- new Hashtable<Number, JavaClass>();
-
- // all Roots in this Snapshot
- private Vector<Root> roots = new Vector<Root>();
-
- // name-to-class map
- private Map<String, JavaClass> classes =
- new TreeMap<String, JavaClass>();
-
- // new objects relative to a baseline - lazily initialized
- private volatile Map<JavaHeapObject, Boolean> newObjects;
-
- // allocation site traces for all objects - lazily initialized
- private volatile Map<JavaHeapObject, StackTrace> siteTraces;
-
- // object-to-Root map for all objects
- private Map<JavaHeapObject, Root> rootsMap =
- new HashMap<JavaHeapObject, Root>();
-
- // soft cache of finalizeable objects - lazily initialized
- private SoftReference<Vector<?>> finalizablesCache;
-
- // represents null reference
- private JavaThing nullThing;
-
- // java.lang.ref.Reference class
- private JavaClass weakReferenceClass;
- // index of 'referent' field in java.lang.ref.Reference class
- private int referentFieldIndex;
-
- // java.lang.Class class
- private JavaClass javaLangClass;
- // java.lang.String class
- private JavaClass javaLangString;
- // java.lang.ClassLoader class
- private JavaClass javaLangClassLoader;
-
- // unknown "other" array class
- private volatile JavaClass otherArrayType;
- // Stuff to exclude from reachable query
- private ReachableExcludes reachableExcludes;
- // the underlying heap dump buffer
- private ReadBuffer readBuf;
-
- // True iff some heap objects have isNew set
- private boolean hasNewSet;
- private boolean unresolvedObjectsOK;
-
- // whether object array instances have new style class or
- // old style (element) class.
- private boolean newStyleArrayClass;
-
- // object id size in the heap dump
- private int identifierSize = 4;
-
- // minimum object size - accounts for object header in
- // most Java virtual machines - we assume 2 identifierSize
- // (which is true for Sun's hotspot JVM).
- private int minimumObjectSize;
-
- public Snapshot(ReadBuffer buf) {
- nullThing = new HackJavaValue("<null>", 0);
- readBuf = buf;
- }
-
- public void setSiteTrace(JavaHeapObject obj, StackTrace trace) {
- if (trace != null && trace.getFrames().length != 0) {
- initSiteTraces();
- siteTraces.put(obj, trace);
- }
- }
-
- public StackTrace getSiteTrace(JavaHeapObject obj) {
- if (siteTraces != null) {
- return siteTraces.get(obj);
- } else {
- return null;
- }
- }
-
- public void setNewStyleArrayClass(boolean value) {
- newStyleArrayClass = value;
- }
-
- public boolean isNewStyleArrayClass() {
- return newStyleArrayClass;
- }
-
- public void setIdentifierSize(int size) {
- identifierSize = size;
- minimumObjectSize = 2 * size;
- }
-
- public int getIdentifierSize() {
- return identifierSize;
- }
-
- public int getMinimumObjectSize() {
- return minimumObjectSize;
- }
-
- public void addHeapObject(long id, JavaHeapObject ho) {
- heapObjects.put(makeId(id), ho);
- }
-
- public void addRoot(Root r) {
- r.setIndex(roots.size());
- roots.addElement(r);
- }
-
- public void addClass(long id, JavaClass c) {
- addHeapObject(id, c);
- putInClassesMap(c);
- }
-
- JavaClass addFakeInstanceClass(long classID, int instSize) {
- // Create a fake class name based on ID.
- String name = "unknown-class<@" + Misc.toHex(classID) + ">";
-
- // Create fake fields convering the given instance size.
- // Create as many as int type fields and for the left over
- // size create byte type fields.
- int numInts = instSize / 4;
- int numBytes = instSize % 4;
- JavaField[] fields = new JavaField[numInts + numBytes];
- int i;
- for (i = 0; i < numInts; i++) {
- fields[i] = new JavaField("unknown-field-" + i, "I");
- }
- for (i = 0; i < numBytes; i++) {
- fields[i + numInts] = new JavaField("unknown-field-" +
- i + numInts, "B");
- }
-
- // Create fake instance class
- JavaClass c = new JavaClass(name, 0, 0, 0, 0, fields,
- EMPTY_STATIC_ARRAY, instSize);
- // Add the class
- addFakeClass(makeId(classID), c);
- return c;
- }
-
-
- /**
- * @return true iff it's possible that some JavaThing instances might
- * isNew set
- *
- * @see JavaThing.isNew()
- */
- public boolean getHasNewSet() {
- return hasNewSet;
- }
-
- //
- // Used in the body of resolve()
- //
- private static class MyVisitor extends AbstractJavaHeapObjectVisitor {
- JavaHeapObject t;
- public void visit(JavaHeapObject other) {
- other.addReferenceFrom(t);
- }
- }
-
- // To show heap parsing progress, we print a '.' after this limit
- private static final int DOT_LIMIT = 5000;
-
- /**
- * Called after reading complete, to initialize the structure
- */
- public void resolve(boolean calculateRefs) {
- System.out.println("Resolving " + heapObjects.size() + " objects...");
-
- // First, resolve the classes. All classes must be resolved before
- // we try any objects, because the objects use classes in their
- // resolution.
- javaLangClass = findClass("java.lang.Class");
- if (javaLangClass == null) {
- System.out.println("WARNING: hprof file does not include java.lang.Class!");
- javaLangClass = new JavaClass("java.lang.Class", 0, 0, 0, 0,
- EMPTY_FIELD_ARRAY, EMPTY_STATIC_ARRAY, 0);
- addFakeClass(javaLangClass);
- }
- javaLangString = findClass("java.lang.String");
- if (javaLangString == null) {
- System.out.println("WARNING: hprof file does not include java.lang.String!");
- javaLangString = new JavaClass("java.lang.String", 0, 0, 0, 0,
- EMPTY_FIELD_ARRAY, EMPTY_STATIC_ARRAY, 0);
- addFakeClass(javaLangString);
- }
- javaLangClassLoader = findClass("java.lang.ClassLoader");
- if (javaLangClassLoader == null) {
- System.out.println("WARNING: hprof file does not include java.lang.ClassLoader!");
- javaLangClassLoader = new JavaClass("java.lang.ClassLoader", 0, 0, 0, 0,
- EMPTY_FIELD_ARRAY, EMPTY_STATIC_ARRAY, 0);
- addFakeClass(javaLangClassLoader);
- }
-
- for (JavaHeapObject t : heapObjects.values()) {
- if (t instanceof JavaClass) {
- t.resolve(this);
- }
- }
-
- // Now, resolve everything else.
- for (JavaHeapObject t : heapObjects.values()) {
- if (!(t instanceof JavaClass)) {
- t.resolve(this);
- }
- }
-
- heapObjects.putAll(fakeClasses);
- fakeClasses.clear();
-
- weakReferenceClass = findClass("java.lang.ref.Reference");
- referentFieldIndex = 0;
- if (weakReferenceClass != null) {
- JavaField[] fields = weakReferenceClass.getFieldsForInstance();
- for (int i = 0; i < fields.length; i++) {
- if ("referent".equals(fields[i].getName())) {
- referentFieldIndex = i;
- break;
- }
- }
- }
-
- if (calculateRefs) {
- calculateReferencesToObjects();
- System.out.print("Eliminating duplicate references");
- System.out.flush();
- // This println refers to the *next* step
- }
- int count = 0;
- for (JavaHeapObject t : heapObjects.values()) {
- t.setupReferers();
- ++count;
- if (calculateRefs && count % DOT_LIMIT == 0) {
- System.out.print(".");
- System.out.flush();
- }
- }
- if (calculateRefs) {
- System.out.println("");
- }
-
- // to ensure that Iterator.remove() on getClasses()
- // result will throw exception..
- classes = Collections.unmodifiableMap(classes);
- }
-
- private void calculateReferencesToObjects() {
- System.out.print("Chasing references, expect "
- + (heapObjects.size() / DOT_LIMIT) + " dots");
- System.out.flush();
- int count = 0;
- MyVisitor visitor = new MyVisitor();
- for (JavaHeapObject t : heapObjects.values()) {
- visitor.t = t;
- // call addReferenceFrom(t) on all objects t references:
- t.visitReferencedObjects(visitor);
- ++count;
- if (count % DOT_LIMIT == 0) {
- System.out.print(".");
- System.out.flush();
- }
- }
- System.out.println();
- for (Root r : roots) {
- r.resolve(this);
- JavaHeapObject t = findThing(r.getId());
- if (t != null) {
- t.addReferenceFromRoot(r);
- }
- }
- }
-
- public void markNewRelativeTo(Snapshot baseline) {
- hasNewSet = true;
- for (JavaHeapObject t : heapObjects.values()) {
- boolean isNew;
- long thingID = t.getId();
- if (thingID == 0L || thingID == -1L) {
- isNew = false;
- } else {
- JavaThing other = baseline.findThing(t.getId());
- if (other == null) {
- isNew = true;
- } else {
- isNew = !t.isSameTypeAs(other);
- }
- }
- t.setNew(isNew);
- }
- }
-
- public Enumeration<JavaHeapObject> getThings() {
- return heapObjects.elements();
- }
-
-
- public JavaHeapObject findThing(long id) {
- Number idObj = makeId(id);
- JavaHeapObject jho = heapObjects.get(idObj);
- return jho != null? jho : fakeClasses.get(idObj);
- }
-
- public JavaHeapObject findThing(String id) {
- return findThing(Misc.parseHex(id));
- }
-
- public JavaClass findClass(String name) {
- if (name.startsWith("0x")) {
- return (JavaClass) findThing(name);
- } else {
- return classes.get(name);
- }
- }
-
- /**
- * Return an Iterator of all of the classes in this snapshot.
- **/
- public Iterator<JavaClass> getClasses() {
- // note that because classes is a TreeMap
- // classes are already sorted by name
- return classes.values().iterator();
- }
-
- public JavaClass[] getClassesArray() {
- JavaClass[] res = new JavaClass[classes.size()];
- classes.values().toArray(res);
- return res;
- }
-
- public synchronized Enumeration<?> getFinalizerObjects() {
- Vector<?> obj;
- if (finalizablesCache != null &&
- (obj = finalizablesCache.get()) != null) {
- return obj.elements();
- }
-
- JavaClass clazz = findClass("java.lang.ref.Finalizer");
- JavaObject queue = (JavaObject) clazz.getStaticField("queue");
- JavaThing tmp = queue.getField("head");
- Vector<JavaHeapObject> finalizables = new Vector<JavaHeapObject>();
- if (tmp != getNullThing()) {
- JavaObject head = (JavaObject) tmp;
- while (true) {
- JavaHeapObject referent = (JavaHeapObject) head.getField("referent");
- JavaThing next = head.getField("next");
- if (next == getNullThing() || next.equals(head)) {
- break;
- }
- head = (JavaObject) next;
- finalizables.add(referent);
- }
- }
- finalizablesCache = new SoftReference<Vector<?>>(finalizables);
- return finalizables.elements();
- }
-
- public Enumeration<Root> getRoots() {
- return roots.elements();
- }
-
- public Root[] getRootsArray() {
- Root[] res = new Root[roots.size()];
- roots.toArray(res);
- return res;
- }
-
- public Root getRootAt(int i) {
- return roots.elementAt(i);
- }
-
- public ReferenceChain[]
- rootsetReferencesTo(JavaHeapObject target, boolean includeWeak) {
- Vector<ReferenceChain> fifo = new Vector<ReferenceChain>(); // This is slow... A real fifo would help
- // Must be a fifo to go breadth-first
- Hashtable<JavaHeapObject, JavaHeapObject> visited = new Hashtable<JavaHeapObject, JavaHeapObject>();
- // Objects are added here right after being added to fifo.
- Vector<ReferenceChain> result = new Vector<ReferenceChain>();
- visited.put(target, target);
- fifo.addElement(new ReferenceChain(target, null));
-
- while (fifo.size() > 0) {
- ReferenceChain chain = fifo.elementAt(0);
- fifo.removeElementAt(0);
- JavaHeapObject curr = chain.getObj();
- if (curr.getRoot() != null) {
- result.addElement(chain);
- // Even though curr is in the rootset, we want to explore its
- // referers, because they might be more interesting.
- }
- Enumeration<JavaThing> referers = curr.getReferers();
- while (referers.hasMoreElements()) {
- JavaHeapObject t = (JavaHeapObject) referers.nextElement();
- if (t != null && !visited.containsKey(t)) {
- if (includeWeak || !t.refersOnlyWeaklyTo(this, curr)) {
- visited.put(t, t);
- fifo.addElement(new ReferenceChain(t, chain));
- }
- }
- }
- }
-
- ReferenceChain[] realResult = new ReferenceChain[result.size()];
- for (int i = 0; i < result.size(); i++) {
- realResult[i] = result.elementAt(i);
- }
- return realResult;
- }
-
- public boolean getUnresolvedObjectsOK() {
- return unresolvedObjectsOK;
- }
-
- public void setUnresolvedObjectsOK(boolean v) {
- unresolvedObjectsOK = v;
- }
-
- public JavaClass getWeakReferenceClass() {
- return weakReferenceClass;
- }
-
- public int getReferentFieldIndex() {
- return referentFieldIndex;
- }
-
- public JavaThing getNullThing() {
- return nullThing;
- }
-
- public void setReachableExcludes(ReachableExcludes e) {
- reachableExcludes = e;
- }
-
- public ReachableExcludes getReachableExcludes() {
- return reachableExcludes;
- }
-
- // package privates
- void addReferenceFromRoot(Root r, JavaHeapObject obj) {
- Root root = rootsMap.get(obj);
- if (root == null) {
- rootsMap.put(obj, r);
- } else {
- rootsMap.put(obj, root.mostInteresting(r));
- }
- }
-
- Root getRoot(JavaHeapObject obj) {
- return rootsMap.get(obj);
- }
-
- JavaClass getJavaLangClass() {
- return javaLangClass;
- }
-
- JavaClass getJavaLangString() {
- return javaLangString;
- }
-
- JavaClass getJavaLangClassLoader() {
- return javaLangClassLoader;
- }
-
- JavaClass getOtherArrayType() {
- if (otherArrayType == null) {
- synchronized(this) {
- if (otherArrayType == null) {
- addFakeClass(new JavaClass("[<other>", 0, 0, 0, 0,
- EMPTY_FIELD_ARRAY, EMPTY_STATIC_ARRAY,
- 0));
- otherArrayType = findClass("[<other>");
- }
- }
- }
- return otherArrayType;
- }
-
- JavaClass getArrayClass(String elementSignature) {
- JavaClass clazz;
- synchronized(classes) {
- clazz = findClass("[" + elementSignature);
- if (clazz == null) {
- clazz = new JavaClass("[" + elementSignature, 0, 0, 0, 0,
- EMPTY_FIELD_ARRAY, EMPTY_STATIC_ARRAY, 0);
- addFakeClass(clazz);
- // This is needed because the JDK only creates Class structures
- // for array element types, not the arrays themselves. For
- // analysis, though, we need to pretend that there's a
- // JavaClass for the array type, too.
- }
- }
- return clazz;
- }
-
- ReadBuffer getReadBuffer() {
- return readBuf;
- }
-
- void setNew(JavaHeapObject obj, boolean isNew) {
- initNewObjects();
- if (isNew) {
- newObjects.put(obj, Boolean.TRUE);
- }
- }
-
- boolean isNew(JavaHeapObject obj) {
- if (newObjects != null) {
- return newObjects.get(obj) != null;
- } else {
- return false;
- }
- }
-
- // Internals only below this point
- private Number makeId(long id) {
- if (identifierSize == 4) {
- return (int)id;
- } else {
- return id;
- }
- }
-
- private void putInClassesMap(JavaClass c) {
- String name = c.getName();
- if (classes.containsKey(name)) {
- // more than one class can have the same name
- // if so, create a unique name by appending
- // - and id string to it.
- name += "-" + c.getIdString();
- }
- classes.put(c.getName(), c);
- }
-
- private void addFakeClass(JavaClass c) {
- putInClassesMap(c);
- c.resolve(this);
- }
-
- private void addFakeClass(Number id, JavaClass c) {
- fakeClasses.put(id, c);
- addFakeClass(c);
- }
-
- private synchronized void initNewObjects() {
- if (newObjects == null) {
- synchronized (this) {
- if (newObjects == null) {
- newObjects = new HashMap<JavaHeapObject, Boolean>();
- }
- }
- }
- }
-
- private synchronized void initSiteTraces() {
- if (siteTraces == null) {
- synchronized (this) {
- if (siteTraces == null) {
- siteTraces = new HashMap<JavaHeapObject, StackTrace>();
- }
- }
- }
- }
-
- @Override
- public void close() throws Exception {
- readBuf.close();
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/StackFrame.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- *
- * @author Bill Foote
- */
-
-
-/**
- * Represents a stack frame.
- */
-
-public class StackFrame {
-
- //
- // Values for the lineNumber data member. These are the same
- // as the values used in the JDK 1.2 heap dump file.
- //
- public final static int LINE_NUMBER_UNKNOWN = -1;
- public final static int LINE_NUMBER_COMPILED = -2;
- public final static int LINE_NUMBER_NATIVE = -3;
-
- private String methodName;
- private String methodSignature;
- private String className;
- private String sourceFileName;
- private int lineNumber;
-
- public StackFrame(String methodName, String methodSignature,
- String className, String sourceFileName, int lineNumber) {
- this.methodName = methodName;
- this.methodSignature = methodSignature;
- this.className = className;
- this.sourceFileName = sourceFileName;
- this.lineNumber = lineNumber;
- }
-
- public void resolve(Snapshot snapshot) {
- }
-
- public String getMethodName() {
- return methodName;
- }
-
- public String getMethodSignature() {
- return methodSignature;
- }
-
- public String getClassName() {
- return className;
- }
-
- public String getSourceFileName() {
- return sourceFileName;
- }
-
- public String getLineNumber() {
- switch(lineNumber) {
- case LINE_NUMBER_UNKNOWN:
- return "(unknown)";
- case LINE_NUMBER_COMPILED:
- return "(compiled method)";
- case LINE_NUMBER_NATIVE:
- return "(native method)";
- default:
- return Integer.toString(lineNumber, 10);
- }
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/model/StackTrace.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.model;
-
-/**
- *
- * @author Bill Foote
- */
-
-
-/**
- * Represents a stack trace, that is, an ordered collection of stack frames.
- */
-
-public class StackTrace {
-
- private StackFrame[] frames;
-
- public StackTrace(StackFrame[] frames) {
- this.frames = frames;
- }
-
- /**
- * @param depth. The minimum reasonable depth is 1.
- *
- * @return a (possibly new) StackTrace that is limited to depth.
- */
- public StackTrace traceForDepth(int depth) {
- if (depth >= frames.length) {
- return this;
- } else {
- StackFrame[] f = new StackFrame[depth];
- System.arraycopy(frames, 0, f, 0, depth);
- return new StackTrace(f);
- }
- }
-
- public void resolve(Snapshot snapshot) {
- for (int i = 0; i < frames.length; i++) {
- frames[i].resolve(snapshot);
- }
- }
-
- public StackFrame[] getFrames() {
- return frames;
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/parser/FileReadBuffer.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.parser;
-
-import java.io.IOException;
-import java.io.RandomAccessFile;
-
-/**
- * Implementation of ReadBuffer using a RandomAccessFile
- *
- * @author A. Sundararajan
- */
-class FileReadBuffer implements ReadBuffer {
- // underlying file to read
- private RandomAccessFile file;
-
- FileReadBuffer(RandomAccessFile file) {
- this.file = file;
- }
-
- private void seek(long pos) throws IOException {
- file.getChannel().position(pos);
- }
-
- public synchronized void get(long pos, byte[] buf) throws IOException {
- seek(pos);
- file.read(buf);
- }
-
- public synchronized char getChar(long pos) throws IOException {
- seek(pos);
- return file.readChar();
- }
-
- public synchronized byte getByte(long pos) throws IOException {
- seek(pos);
- return (byte) file.read();
- }
-
- public synchronized short getShort(long pos) throws IOException {
- seek(pos);
- return file.readShort();
- }
-
- public synchronized int getInt(long pos) throws IOException {
- seek(pos);
- return file.readInt();
- }
-
- public synchronized long getLong(long pos) throws IOException {
- seek(pos);
- return file.readLong();
- }
-
- @Override
- public void close() throws Exception {
- file.close();
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/parser/HprofReader.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,899 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.parser;
-
-import java.io.*;
-import java.util.Date;
-import java.util.Hashtable;
-import jdk.test.lib.hprof.model.ArrayTypeCodes;
-import jdk.test.lib.hprof.model.*;
-
-/**
- * Object that's used to read a hprof file.
- *
- * @author Bill Foote
- */
-
-public class HprofReader extends Reader /* imports */ implements ArrayTypeCodes {
-
- final static int MAGIC_NUMBER = 0x4a415641;
- // That's "JAVA", the first part of "JAVA PROFILE ..."
- private final static String[] VERSIONS = {
- " PROFILE 1.0\0",
- " PROFILE 1.0.1\0",
- " PROFILE 1.0.2\0",
- };
-
- private final static int VERSION_JDK12BETA3 = 0;
- private final static int VERSION_JDK12BETA4 = 1;
- private final static int VERSION_JDK6 = 2;
- // These version numbers are indices into VERSIONS. The instance data
- // member version is set to one of these, and it drives decisions when
- // reading the file.
- //
- // Version 1.0.1 added HPROF_GC_PRIM_ARRAY_DUMP, which requires no
- // version-sensitive parsing.
- //
- // Version 1.0.1 changed the type of a constant pool entry from a signature
- // to a typecode.
- //
- // Version 1.0.2 added HPROF_HEAP_DUMP_SEGMENT and HPROF_HEAP_DUMP_END
- // to allow a large heap to be dumped as a sequence of heap dump segments.
- //
- // The HPROF agent in J2SE 1.2 through to 5.0 generate a version 1.0.1
- // file. In Java SE 6.0 the version is either 1.0.1 or 1.0.2 depending on
- // the size of the heap (normally it will be 1.0.1 but for multi-GB
- // heaps the heap dump will not fit in a HPROF_HEAP_DUMP record so the
- // dump is generated as version 1.0.2).
-
- //
- // Record types:
- //
- static final int HPROF_UTF8 = 0x01;
- static final int HPROF_LOAD_CLASS = 0x02;
- static final int HPROF_UNLOAD_CLASS = 0x03;
- static final int HPROF_FRAME = 0x04;
- static final int HPROF_TRACE = 0x05;
- static final int HPROF_ALLOC_SITES = 0x06;
- static final int HPROF_HEAP_SUMMARY = 0x07;
-
- static final int HPROF_START_THREAD = 0x0a;
- static final int HPROF_END_THREAD = 0x0b;
-
- static final int HPROF_HEAP_DUMP = 0x0c;
-
- static final int HPROF_CPU_SAMPLES = 0x0d;
- static final int HPROF_CONTROL_SETTINGS = 0x0e;
- static final int HPROF_LOCKSTATS_WAIT_TIME = 0x10;
- static final int HPROF_LOCKSTATS_HOLD_TIME = 0x11;
-
- static final int HPROF_GC_ROOT_UNKNOWN = 0xff;
- static final int HPROF_GC_ROOT_JNI_GLOBAL = 0x01;
- static final int HPROF_GC_ROOT_JNI_LOCAL = 0x02;
- static final int HPROF_GC_ROOT_JAVA_FRAME = 0x03;
- static final int HPROF_GC_ROOT_NATIVE_STACK = 0x04;
- static final int HPROF_GC_ROOT_STICKY_CLASS = 0x05;
- static final int HPROF_GC_ROOT_THREAD_BLOCK = 0x06;
- static final int HPROF_GC_ROOT_MONITOR_USED = 0x07;
- static final int HPROF_GC_ROOT_THREAD_OBJ = 0x08;
-
- static final int HPROF_GC_CLASS_DUMP = 0x20;
- static final int HPROF_GC_INSTANCE_DUMP = 0x21;
- static final int HPROF_GC_OBJ_ARRAY_DUMP = 0x22;
- static final int HPROF_GC_PRIM_ARRAY_DUMP = 0x23;
-
- static final int HPROF_HEAP_DUMP_SEGMENT = 0x1c;
- static final int HPROF_HEAP_DUMP_END = 0x2c;
-
- private final static int T_CLASS = 2;
-
- private int version; // The version of .hprof being read
-
- private int debugLevel;
- private long currPos; // Current position in the file
-
- private int dumpsToSkip;
- private boolean callStack; // If true, read the call stack of objects
-
- private int identifierSize; // Size, in bytes, of identifiers.
- private Hashtable<Long, String> names;
-
- // Hashtable<Integer, ThreadObject>, used to map the thread sequence number
- // (aka "serial number") to the thread object ID for
- // HPROF_GC_ROOT_THREAD_OBJ. ThreadObject is a trivial inner class,
- // at the end of this file.
- private Hashtable<Integer, ThreadObject> threadObjects;
-
- // Hashtable<Long, String>, maps class object ID to class name
- // (with / converted to .)
- private Hashtable<Long, String> classNameFromObjectID;
-
- // Hashtable<Integer, Integer>, maps class serial # to class object ID
- private Hashtable<Integer, String> classNameFromSerialNo;
-
- // Hashtable<Long, StackFrame> maps stack frame ID to StackFrame.
- // Null if we're not tracking them.
- private Hashtable<Long, StackFrame> stackFrames;
-
- // Hashtable<Integer, StackTrace> maps stack frame ID to StackTrace
- // Null if we're not tracking them.
- private Hashtable<Integer, StackTrace> stackTraces;
-
- private Snapshot snapshot;
-
- public HprofReader(String fileName, PositionDataInputStream in,
- int dumpNumber, boolean callStack, int debugLevel)
- throws IOException {
- super(in);
- RandomAccessFile file = new RandomAccessFile(fileName, "r");
- this.snapshot = new Snapshot(MappedReadBuffer.create(file));
- this.dumpsToSkip = dumpNumber - 1;
- this.callStack = callStack;
- this.debugLevel = debugLevel;
- names = new Hashtable<Long, String>();
- threadObjects = new Hashtable<Integer, ThreadObject>(43);
- classNameFromObjectID = new Hashtable<Long, String>();
- if (callStack) {
- stackFrames = new Hashtable<Long, StackFrame>(43);
- stackTraces = new Hashtable<Integer, StackTrace>(43);
- classNameFromSerialNo = new Hashtable<Integer, String>();
- }
- }
-
- public Snapshot read() throws IOException {
- currPos = 4; // 4 because of the magic number
- version = readVersionHeader();
- identifierSize = in.readInt();
- snapshot.setIdentifierSize(identifierSize);
- if (version >= VERSION_JDK12BETA4) {
- snapshot.setNewStyleArrayClass(true);
- } else {
- snapshot.setNewStyleArrayClass(false);
- }
-
- currPos += 4;
- if (identifierSize != 4 && identifierSize != 8) {
- throw new IOException("I'm sorry, but I can't deal with an identifier size of " + identifierSize + ". I can only deal with 4 or 8.");
- }
- System.out.println("Dump file created " + (new Date(in.readLong())));
- currPos += 8;
-
- for (;;) {
- int type;
- try {
- type = in.readUnsignedByte();
- } catch (EOFException ignored) {
- break;
- }
- in.readInt(); // Timestamp of this record
- // Length of record: readInt() will return negative value for record
- // length >2GB. so store 32bit value in long to keep it unsigned.
- long length = in.readInt() & 0xffffffffL;
- if (debugLevel > 0) {
- System.out.println("Read record type " + type
- + ", length " + length
- + " at position " + toHex(currPos));
- }
- if (length < 0) {
- throw new IOException("Bad record length of " + length
- + " at byte " + toHex(currPos+5)
- + " of file.");
- }
- currPos += 9 + length;
- switch (type) {
- case HPROF_UTF8: {
- long id = readID();
- byte[] chars = new byte[(int)length - identifierSize];
- in.readFully(chars);
- names.put(id, new String(chars));
- break;
- }
- case HPROF_LOAD_CLASS: {
- int serialNo = in.readInt(); // Not used
- long classID = readID();
- int stackTraceSerialNo = in.readInt();
- long classNameID = readID();
- Long classIdI = classID;
- String nm = getNameFromID(classNameID).replace('/', '.');
- classNameFromObjectID.put(classIdI, nm);
- if (classNameFromSerialNo != null) {
- classNameFromSerialNo.put(serialNo, nm);
- }
- break;
- }
-
- case HPROF_HEAP_DUMP: {
- if (dumpsToSkip <= 0) {
- try {
- readHeapDump(length, currPos);
- } catch (EOFException exp) {
- handleEOF(exp, snapshot);
- }
- if (debugLevel > 0) {
- System.out.println(" Finished processing instances in heap dump.");
- }
- return snapshot;
- } else {
- dumpsToSkip--;
- skipBytes(length);
- }
- break;
- }
-
- case HPROF_HEAP_DUMP_END: {
- if (version >= VERSION_JDK6) {
- if (dumpsToSkip <= 0) {
- skipBytes(length); // should be no-op
- return snapshot;
- } else {
- // skip this dump (of the end record for a sequence of dump segments)
- dumpsToSkip--;
- }
- } else {
- // HPROF_HEAP_DUMP_END only recognized in >= 1.0.2
- warn("Ignoring unrecognized record type " + type);
- }
- skipBytes(length); // should be no-op
- break;
- }
-
- case HPROF_HEAP_DUMP_SEGMENT: {
- if (version >= VERSION_JDK6) {
- if (dumpsToSkip <= 0) {
- try {
- // read the dump segment
- readHeapDump(length, currPos);
- } catch (EOFException exp) {
- handleEOF(exp, snapshot);
- }
- } else {
- // all segments comprising the heap dump will be skipped
- skipBytes(length);
- }
- } else {
- // HPROF_HEAP_DUMP_SEGMENT only recognized in >= 1.0.2
- warn("Ignoring unrecognized record type " + type);
- skipBytes(length);
- }
- break;
- }
-
- case HPROF_FRAME: {
- if (stackFrames == null) {
- skipBytes(length);
- } else {
- long id = readID();
- String methodName = getNameFromID(readID());
- String methodSig = getNameFromID(readID());
- String sourceFile = getNameFromID(readID());
- int classSer = in.readInt();
- String className = classNameFromSerialNo.get(classSer);
- int lineNumber = in.readInt();
- if (lineNumber < StackFrame.LINE_NUMBER_NATIVE) {
- warn("Weird stack frame line number: " + lineNumber);
- lineNumber = StackFrame.LINE_NUMBER_UNKNOWN;
- }
- stackFrames.put(id,
- new StackFrame(methodName, methodSig,
- className, sourceFile,
- lineNumber));
- }
- break;
- }
- case HPROF_TRACE: {
- if (stackTraces == null) {
- skipBytes(length);
- } else {
- int serialNo = in.readInt();
- int threadSeq = in.readInt(); // Not used
- StackFrame[] frames = new StackFrame[in.readInt()];
- for (int i = 0; i < frames.length; i++) {
- long fid = readID();
- frames[i] = stackFrames.get(fid);
- if (frames[i] == null) {
- throw new IOException("Stack frame " + toHex(fid) + " not found");
- }
- }
- stackTraces.put(serialNo,
- new StackTrace(frames));
- }
- break;
- }
- case HPROF_UNLOAD_CLASS:
- case HPROF_ALLOC_SITES:
- case HPROF_START_THREAD:
- case HPROF_END_THREAD:
- case HPROF_HEAP_SUMMARY:
- case HPROF_CPU_SAMPLES:
- case HPROF_CONTROL_SETTINGS:
- case HPROF_LOCKSTATS_WAIT_TIME:
- case HPROF_LOCKSTATS_HOLD_TIME:
- {
- // Ignore these record types
- skipBytes(length);
- break;
- }
- default: {
- skipBytes(length);
- warn("Ignoring unrecognized record type " + type);
- }
- }
- }
-
- return snapshot;
- }
-
- private void skipBytes(long length) throws IOException {
- while (length > 0) {
- long skipped = in.skip(length);
- if (skipped == 0) {
- // EOF or other problem, throw exception
- throw new EOFException("Couldn't skip enough bytes");
- }
- length -= skipped;
- }
- }
-
- private int readVersionHeader() throws IOException {
- int candidatesLeft = VERSIONS.length;
- boolean[] matched = new boolean[VERSIONS.length];
- for (int i = 0; i < candidatesLeft; i++) {
- matched[i] = true;
- }
-
- int pos = 0;
- while (candidatesLeft > 0) {
- char c = (char) in.readByte();
- currPos++;
- for (int i = 0; i < VERSIONS.length; i++) {
- if (matched[i]) {
- if (c != VERSIONS[i].charAt(pos)) { // Not matched
- matched[i] = false;
- --candidatesLeft;
- } else if (pos == VERSIONS[i].length() - 1) { // Full match
- return i;
- }
- }
- }
- ++pos;
- }
- throw new IOException("Version string not recognized at byte " + (pos+3));
- }
-
- private void readHeapDump(long bytesLeft, long posAtEnd) throws IOException {
- while (bytesLeft > 0) {
- int type = in.readUnsignedByte();
- if (debugLevel > 0) {
- System.out.println(" Read heap sub-record type " + type
- + " at position "
- + toHex(posAtEnd - bytesLeft));
- }
- bytesLeft--;
- switch(type) {
- case HPROF_GC_ROOT_UNKNOWN: {
- long id = readID();
- bytesLeft -= identifierSize;
- snapshot.addRoot(new Root(id, 0, Root.UNKNOWN, ""));
- break;
- }
- case HPROF_GC_ROOT_THREAD_OBJ: {
- long id = readID();
- int threadSeq = in.readInt();
- int stackSeq = in.readInt();
- bytesLeft -= identifierSize + 8;
- threadObjects.put(threadSeq,
- new ThreadObject(id, stackSeq));
- break;
- }
- case HPROF_GC_ROOT_JNI_GLOBAL: {
- long id = readID();
- long globalRefId = readID(); // Ignored, for now
- bytesLeft -= 2*identifierSize;
- snapshot.addRoot(new Root(id, 0, Root.NATIVE_STATIC, ""));
- break;
- }
- case HPROF_GC_ROOT_JNI_LOCAL: {
- long id = readID();
- int threadSeq = in.readInt();
- int depth = in.readInt();
- bytesLeft -= identifierSize + 8;
- ThreadObject to = getThreadObjectFromSequence(threadSeq);
- StackTrace st = getStackTraceFromSerial(to.stackSeq);
- if (st != null) {
- st = st.traceForDepth(depth+1);
- }
- snapshot.addRoot(new Root(id, to.threadId,
- Root.NATIVE_LOCAL, "", st));
- break;
- }
- case HPROF_GC_ROOT_JAVA_FRAME: {
- long id = readID();
- int threadSeq = in.readInt();
- int depth = in.readInt();
- bytesLeft -= identifierSize + 8;
- ThreadObject to = getThreadObjectFromSequence(threadSeq);
- StackTrace st = getStackTraceFromSerial(to.stackSeq);
- if (st != null) {
- st = st.traceForDepth(depth+1);
- }
- snapshot.addRoot(new Root(id, to.threadId,
- Root.JAVA_LOCAL, "", st));
- break;
- }
- case HPROF_GC_ROOT_NATIVE_STACK: {
- long id = readID();
- int threadSeq = in.readInt();
- bytesLeft -= identifierSize + 4;
- ThreadObject to = getThreadObjectFromSequence(threadSeq);
- StackTrace st = getStackTraceFromSerial(to.stackSeq);
- snapshot.addRoot(new Root(id, to.threadId,
- Root.NATIVE_STACK, "", st));
- break;
- }
- case HPROF_GC_ROOT_STICKY_CLASS: {
- long id = readID();
- bytesLeft -= identifierSize;
- snapshot.addRoot(new Root(id, 0, Root.SYSTEM_CLASS, ""));
- break;
- }
- case HPROF_GC_ROOT_THREAD_BLOCK: {
- long id = readID();
- int threadSeq = in.readInt();
- bytesLeft -= identifierSize + 4;
- ThreadObject to = getThreadObjectFromSequence(threadSeq);
- StackTrace st = getStackTraceFromSerial(to.stackSeq);
- snapshot.addRoot(new Root(id, to.threadId,
- Root.THREAD_BLOCK, "", st));
- break;
- }
- case HPROF_GC_ROOT_MONITOR_USED: {
- long id = readID();
- bytesLeft -= identifierSize;
- snapshot.addRoot(new Root(id, 0, Root.BUSY_MONITOR, ""));
- break;
- }
- case HPROF_GC_CLASS_DUMP: {
- int bytesRead = readClass();
- bytesLeft -= bytesRead;
- break;
- }
- case HPROF_GC_INSTANCE_DUMP: {
- int bytesRead = readInstance();
- bytesLeft -= bytesRead;
- break;
- }
- case HPROF_GC_OBJ_ARRAY_DUMP: {
- long bytesRead = readArray(false);
- bytesLeft -= bytesRead;
- break;
- }
- case HPROF_GC_PRIM_ARRAY_DUMP: {
- long bytesRead = readArray(true);
- bytesLeft -= bytesRead;
- break;
- }
- default: {
- throw new IOException("Unrecognized heap dump sub-record type: " + type);
- }
- }
- }
- if (bytesLeft != 0) {
- warn("Error reading heap dump or heap dump segment: Byte count is " + bytesLeft + " instead of 0");
- skipBytes(bytesLeft);
- }
- if (debugLevel > 0) {
- System.out.println(" Finished heap sub-records.");
- }
- }
-
- private long readID() throws IOException {
- return (identifierSize == 4)?
- (Snapshot.SMALL_ID_MASK & (long)in.readInt()) : in.readLong();
- }
-
- //
- // Read a java value. If result is non-null, it's expected to be an
- // array of one element. We use it to fake multiple return values.
- // @returns the number of bytes read
- //
- private int readValue(JavaThing[] resultArr) throws IOException {
- byte type = in.readByte();
- return 1 + readValueForType(type, resultArr);
- }
-
- private int readValueForType(byte type, JavaThing[] resultArr)
- throws IOException {
- if (version >= VERSION_JDK12BETA4) {
- type = signatureFromTypeId(type);
- }
- return readValueForTypeSignature(type, resultArr);
- }
-
- private int readValueForTypeSignature(byte type, JavaThing[] resultArr)
- throws IOException {
- switch (type) {
- case '[':
- case 'L': {
- long id = readID();
- if (resultArr != null) {
- resultArr[0] = new JavaObjectRef(id);
- }
- return identifierSize;
- }
- case 'Z': {
- int b = in.readByte();
- if (b != 0 && b != 1) {
- warn("Illegal boolean value read");
- }
- if (resultArr != null) {
- resultArr[0] = new JavaBoolean(b != 0);
- }
- return 1;
- }
- case 'B': {
- byte b = in.readByte();
- if (resultArr != null) {
- resultArr[0] = new JavaByte(b);
- }
- return 1;
- }
- case 'S': {
- short s = in.readShort();
- if (resultArr != null) {
- resultArr[0] = new JavaShort(s);
- }
- return 2;
- }
- case 'C': {
- char ch = in.readChar();
- if (resultArr != null) {
- resultArr[0] = new JavaChar(ch);
- }
- return 2;
- }
- case 'I': {
- int val = in.readInt();
- if (resultArr != null) {
- resultArr[0] = new JavaInt(val);
- }
- return 4;
- }
- case 'J': {
- long val = in.readLong();
- if (resultArr != null) {
- resultArr[0] = new JavaLong(val);
- }
- return 8;
- }
- case 'F': {
- float val = in.readFloat();
- if (resultArr != null) {
- resultArr[0] = new JavaFloat(val);
- }
- return 4;
- }
- case 'D': {
- double val = in.readDouble();
- if (resultArr != null) {
- resultArr[0] = new JavaDouble(val);
- }
- return 8;
- }
- default: {
- throw new IOException("Bad value signature: " + type);
- }
- }
- }
-
- private ThreadObject getThreadObjectFromSequence(int threadSeq)
- throws IOException {
- ThreadObject to = threadObjects.get(threadSeq);
- if (to == null) {
- throw new IOException("Thread " + threadSeq +
- " not found for JNI local ref");
- }
- return to;
- }
-
- private String getNameFromID(long id) throws IOException {
- return getNameFromID(Long.valueOf(id));
- }
-
- private String getNameFromID(Long id) throws IOException {
- if (id.longValue() == 0L) {
- return "";
- }
- String result = names.get(id);
- if (result == null) {
- warn("Name not found at " + toHex(id.longValue()));
- return "unresolved name " + toHex(id.longValue());
- }
- return result;
- }
-
- private StackTrace getStackTraceFromSerial(int ser) throws IOException {
- if (stackTraces == null) {
- return null;
- }
- StackTrace result = stackTraces.get(ser);
- if (result == null) {
- warn("Stack trace not found for serial # " + ser);
- }
- return result;
- }
-
- //
- // Handle a HPROF_GC_CLASS_DUMP
- // Return number of bytes read
- //
- private int readClass() throws IOException {
- long id = readID();
- StackTrace stackTrace = getStackTraceFromSerial(in.readInt());
- long superId = readID();
- long classLoaderId = readID();
- long signersId = readID();
- long protDomainId = readID();
- long reserved1 = readID();
- long reserved2 = readID();
- int instanceSize = in.readInt();
- int bytesRead = 7 * identifierSize + 8;
-
- int numConstPoolEntries = in.readUnsignedShort();
- bytesRead += 2;
- for (int i = 0; i < numConstPoolEntries; i++) {
- int index = in.readUnsignedShort(); // unused
- bytesRead += 2;
- bytesRead += readValue(null); // We ignore the values
- }
-
- int numStatics = in.readUnsignedShort();
- bytesRead += 2;
- JavaThing[] valueBin = new JavaThing[1];
- JavaStatic[] statics = new JavaStatic[numStatics];
- for (int i = 0; i < numStatics; i++) {
- long nameId = readID();
- bytesRead += identifierSize;
- byte type = in.readByte();
- bytesRead++;
- bytesRead += readValueForType(type, valueBin);
- String fieldName = getNameFromID(nameId);
- if (version >= VERSION_JDK12BETA4) {
- type = signatureFromTypeId(type);
- }
- String signature = "" + ((char) type);
- JavaField f = new JavaField(fieldName, signature);
- statics[i] = new JavaStatic(f, valueBin[0]);
- }
-
- int numFields = in.readUnsignedShort();
- bytesRead += 2;
- JavaField[] fields = new JavaField[numFields];
- for (int i = 0; i < numFields; i++) {
- long nameId = readID();
- bytesRead += identifierSize;
- byte type = in.readByte();
- bytesRead++;
- String fieldName = getNameFromID(nameId);
- if (version >= VERSION_JDK12BETA4) {
- type = signatureFromTypeId(type);
- }
- String signature = "" + ((char) type);
- fields[i] = new JavaField(fieldName, signature);
- }
- String name = classNameFromObjectID.get(id);
- if (name == null) {
- warn("Class name not found for " + toHex(id));
- name = "unknown-name@" + toHex(id);
- }
- JavaClass c = new JavaClass(id, name, superId, classLoaderId, signersId,
- protDomainId, fields, statics,
- instanceSize);
- snapshot.addClass(id, c);
- snapshot.setSiteTrace(c, stackTrace);
-
- return bytesRead;
- }
-
- private String toHex(long addr) {
- return jdk.test.lib.hprof.util.Misc.toHex(addr);
- }
-
- //
- // Handle a HPROF_GC_INSTANCE_DUMP
- // Return number of bytes read
- //
- private int readInstance() throws IOException {
- long start = in.position();
- long id = readID();
- StackTrace stackTrace = getStackTraceFromSerial(in.readInt());
- long classID = readID();
- int bytesFollowing = in.readInt();
- int bytesRead = (2 * identifierSize) + 8 + bytesFollowing;
- JavaObject jobj = new JavaObject(classID, start);
- skipBytes(bytesFollowing);
- snapshot.addHeapObject(id, jobj);
- snapshot.setSiteTrace(jobj, stackTrace);
- return bytesRead;
- }
-
- //
- // Handle a HPROF_GC_OBJ_ARRAY_DUMP or HPROF_GC_PRIM_ARRAY_DUMP
- // Return number of bytes read
- //
- private long readArray(boolean isPrimitive) throws IOException {
- long start = in.position();
- long id = readID();
- StackTrace stackTrace = getStackTraceFromSerial(in.readInt());
- int num = in.readInt();
- long bytesRead = identifierSize + 8;
- long elementClassID;
- if (isPrimitive) {
- elementClassID = in.readByte();
- bytesRead++;
- } else {
- elementClassID = readID();
- bytesRead += identifierSize;
- }
-
- // Check for primitive arrays:
- byte primitiveSignature = 0x00;
- int elSize = 0;
- if (isPrimitive || version < VERSION_JDK12BETA4) {
- switch ((int)elementClassID) {
- case T_BOOLEAN: {
- primitiveSignature = (byte) 'Z';
- elSize = 1;
- break;
- }
- case T_CHAR: {
- primitiveSignature = (byte) 'C';
- elSize = 2;
- break;
- }
- case T_FLOAT: {
- primitiveSignature = (byte) 'F';
- elSize = 4;
- break;
- }
- case T_DOUBLE: {
- primitiveSignature = (byte) 'D';
- elSize = 8;
- break;
- }
- case T_BYTE: {
- primitiveSignature = (byte) 'B';
- elSize = 1;
- break;
- }
- case T_SHORT: {
- primitiveSignature = (byte) 'S';
- elSize = 2;
- break;
- }
- case T_INT: {
- primitiveSignature = (byte) 'I';
- elSize = 4;
- break;
- }
- case T_LONG: {
- primitiveSignature = (byte) 'J';
- elSize = 8;
- break;
- }
- }
- if (version >= VERSION_JDK12BETA4 && primitiveSignature == 0x00) {
- throw new IOException("Unrecognized typecode: "
- + elementClassID);
- }
- }
- if (primitiveSignature != 0x00) {
- long size = elSize * (long)num;
- bytesRead += size;
- JavaValueArray va = new JavaValueArray(primitiveSignature, start);
- skipBytes(size);
- snapshot.addHeapObject(id, va);
- snapshot.setSiteTrace(va, stackTrace);
- } else {
- long sz = (long)num * identifierSize;
- bytesRead += sz;
- JavaObjectArray arr = new JavaObjectArray(elementClassID, start);
- skipBytes(sz);
- snapshot.addHeapObject(id, arr);
- snapshot.setSiteTrace(arr, stackTrace);
- }
- return bytesRead;
- }
-
- private byte signatureFromTypeId(byte typeId) throws IOException {
- switch (typeId) {
- case T_CLASS: {
- return (byte) 'L';
- }
- case T_BOOLEAN: {
- return (byte) 'Z';
- }
- case T_CHAR: {
- return (byte) 'C';
- }
- case T_FLOAT: {
- return (byte) 'F';
- }
- case T_DOUBLE: {
- return (byte) 'D';
- }
- case T_BYTE: {
- return (byte) 'B';
- }
- case T_SHORT: {
- return (byte) 'S';
- }
- case T_INT: {
- return (byte) 'I';
- }
- case T_LONG: {
- return (byte) 'J';
- }
- default: {
- throw new IOException("Invalid type id of " + typeId);
- }
- }
- }
-
- private void handleEOF(EOFException exp, Snapshot snapshot) {
- if (debugLevel > 0) {
- exp.printStackTrace();
- }
- warn("Unexpected EOF. Will miss information...");
- // we have EOF, we have to tolerate missing references
- snapshot.setUnresolvedObjectsOK(true);
- }
-
- private void warn(String msg) {
- System.out.println("WARNING: " + msg);
- }
-
- //
- // A trivial data-holder class for HPROF_GC_ROOT_THREAD_OBJ.
- //
- private class ThreadObject {
-
- long threadId;
- int stackSeq;
-
- ThreadObject(long threadId, int stackSeq) {
- this.threadId = threadId;
- this.stackSeq = stackSeq;
- }
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/parser/MappedReadBuffer.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.parser;
-
-import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.MappedByteBuffer;
-import java.nio.channels.FileChannel;
-
-/**
- * Implementation of ReadBuffer using mapped file buffer
- *
- * @author A. Sundararajan
- */
-class MappedReadBuffer implements ReadBuffer {
- private MappedByteBuffer buf;
- private RandomAccessFile file;
-
- MappedReadBuffer(RandomAccessFile file, MappedByteBuffer buf) {
- this.file = file;
- this.buf = buf;
- }
-
- /**
- * Factory method to create correct ReadBuffer for a given file.
- *
- * The initial purpose of this method was to choose how to read hprof file for parsing
- * depending on the size of the file and the system property 'jhat.disableFileMap':
- * "If file size is more than 2 GB and when file mapping is configured (default),
- * use mapped file reader".
- *
- * However, it has been discovered a problem with this approach.
- * Creating java.nio.MappedByteBuffer from inside the test leads to hprof file
- * is locked on Windows until test process dies since there is no good way to
- * release this resource.
- *
- * java.nio.MappedByteBuffer will be used only if 'jhat.enableFileMap' is set to true.
- * Per default 'jhat.enableFileMap' is not set.
- */
- static ReadBuffer create(RandomAccessFile file) throws IOException {
- if (canUseFileMap()) {
- MappedByteBuffer buf;
- try {
- FileChannel ch = file.getChannel();
- long size = ch.size();
- buf = ch.map(FileChannel.MapMode.READ_ONLY, 0, size);
- ch.close();
- return new MappedReadBuffer(file, buf);
- } catch (IOException exp) {
- exp.printStackTrace();
- System.err.println("File mapping failed, will use direct read");
- // fall through
- }
- } // else fall through
- return new FileReadBuffer(file);
- }
-
- /**
- * Set system property 'jhat.enableFileMap' to 'true' to enable file mapping.
- */
- private static boolean canUseFileMap() {
- String prop = System.getProperty("jhat.enableFileMap");
- return prop != null && prop.equals("true");
- }
-
- private void seek(long pos) throws IOException {
- assert pos <= Integer.MAX_VALUE : "position overflow";
- buf.position((int)pos);
- }
-
- public synchronized void get(long pos, byte[] res) throws IOException {
- seek(pos);
- buf.get(res);
- }
-
- public synchronized char getChar(long pos) throws IOException {
- seek(pos);
- return buf.getChar();
- }
-
- public synchronized byte getByte(long pos) throws IOException {
- seek(pos);
- return buf.get();
- }
-
- public synchronized short getShort(long pos) throws IOException {
- seek(pos);
- return buf.getShort();
- }
-
- public synchronized int getInt(long pos) throws IOException {
- seek(pos);
- return buf.getInt();
- }
-
- public synchronized long getLong(long pos) throws IOException {
- seek(pos);
- return buf.getLong();
- }
-
- @Override
- public void close() throws Exception {
- file.close();
- }
-
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/parser/PositionDataInputStream.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.parser;
-
-import java.io.DataInputStream;
-import java.io.InputStream;
-
-/**
- * A DataInputStream that keeps track of total bytes read
- * (in effect 'position' in stream) so far.
- *
- */
-public class PositionDataInputStream extends DataInputStream {
- public PositionDataInputStream(InputStream in) {
- super(in instanceof PositionInputStream?
- in : new PositionInputStream(in));
- }
-
- public boolean markSupported() {
- return false;
- }
-
- public void mark(int readLimit) {
- throw new UnsupportedOperationException("mark");
- }
-
- public void reset() {
- throw new UnsupportedOperationException("reset");
- }
-
- public long position() {
- return ((PositionInputStream)in).position();
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/parser/PositionInputStream.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.parser;
-
-import java.io.FilterInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * InputStream that keeps track of total bytes read (in effect
- * 'position' in stream) from the input stream.
- *
- */
-public class PositionInputStream extends FilterInputStream {
- private long position = 0L;
-
- public PositionInputStream(InputStream in) {
- super(in);
- }
-
- public int read() throws IOException {
- int res = super.read();
- if (res != -1) position++;
- return res;
- }
-
- public int read(byte[] b, int off, int len) throws IOException {
- int res = super.read(b, off, len);
- if (res != -1) position += res;
- return res;
- }
-
- public long skip(long n) throws IOException {
- long res = super.skip(n);
- position += res;
- return res;
- }
-
- public boolean markSupported() {
- return false;
- }
-
- public void mark(int readLimit) {
- throw new UnsupportedOperationException("mark");
- }
-
- public void reset() {
- throw new UnsupportedOperationException("reset");
- }
-
- public long position() {
- return position;
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/parser/ReadBuffer.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.parser;
-
-import java.io.IOException;
-
-/**
- * Positionable read only buffer
- *
- * @author A. Sundararajan
- */
-public interface ReadBuffer extends AutoCloseable {
- // read methods - only byte array and int primitive types.
- // read position has to be specified always.
- public void get(long pos, byte[] buf) throws IOException;
- public char getChar(long pos) throws IOException;
- public byte getByte(long pos) throws IOException;
- public short getShort(long pos) throws IOException;
- public int getInt(long pos) throws IOException;
- public long getLong(long pos) throws IOException;
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/parser/Reader.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.parser;
-
-import java.io.*;
-import jdk.test.lib.hprof.model.*;
-
-/**
- * Abstract base class for reading object dump files. A reader need not be
- * thread-safe.
- *
- * @author Bill Foote
- */
-
-
-public abstract class Reader {
- protected PositionDataInputStream in;
-
- protected Reader(PositionDataInputStream in) {
- this.in = in;
- }
-
- /**
- * Read a snapshot from a data input stream. It is assumed that the magic
- * number has already been read.
- */
- abstract public Snapshot read() throws IOException;
-
- /**
- * Read a snapshot from a file.
- *
- * @param heapFile The name of a file containing a heap dump
- * @param callStack If true, read the call stack of allocaation sites
- */
- public static Snapshot readFile(String heapFile, boolean callStack,
- int debugLevel)
- throws IOException {
- int dumpNumber = 1;
- int pos = heapFile.lastIndexOf('#');
- if (pos > -1) {
- String num = heapFile.substring(pos+1, heapFile.length());
- try {
- dumpNumber = Integer.parseInt(num, 10);
- } catch (java.lang.NumberFormatException ex) {
- String msg = "In file name \"" + heapFile
- + "\", a dump number was "
- + "expected after the :, but \""
- + num + "\" was found instead.";
- System.err.println(msg);
- throw new IOException(msg);
- }
- heapFile = heapFile.substring(0, pos);
- }
- try (PositionDataInputStream in = new PositionDataInputStream(
- new BufferedInputStream(new FileInputStream(heapFile)))) {
- int i = in.readInt();
- if (i == HprofReader.MAGIC_NUMBER) {
- Reader r
- = new HprofReader(heapFile, in, dumpNumber,
- callStack, debugLevel);
- return r.read();
- } else {
- throw new IOException("Unrecognized magic number: " + i);
- }
- }
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/util/ArraySorter.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.util;
-import java.util.*;
-
-/**
- * A singleton utility class that sorts an array of objects.
- * <p>
- * Use:
- * <pre>
- *
- * Stuff[] arr = ...;
- * ArraySorter.sort(arr, new Comparer() {
- * public int compare(Object lhs, Object rhs) {
- * return ((String) lhs).compareTo((String) rhs);
- * }
- * });
- * </pre>
- *
- * @author Bill Foote
- */
-
-public class ArraySorter {
-
- /**
- * Sort the given array, using c for comparison
- **/
- static public void sort(Object[] arr, Comparer c) {
- quickSort(arr, c, 0, arr.length-1);
- }
-
-
- /**
- * Sort an array of strings, using String.compareTo()
- **/
- static public void sortArrayOfStrings(Object[] arr) {
- sort(arr, new Comparer() {
- public int compare(Object lhs, Object rhs) {
- return ((String) lhs).compareTo((String) rhs);
- }
- });
- }
-
-
- static private void swap(Object[] arr, int a, int b) {
- Object tmp = arr[a];
- arr[a] = arr[b];
- arr[b] = tmp;
- }
-
- //
- // Sorts arr between from and to, inclusive. This is a quick, off-the-top-
- // of-my-head quicksort: I haven't put any thought into optimizing it.
- // I _did_ put thought into making sure it's safe (it will always
- // terminate). Worst-case it's O(n^2), but it will usually run in
- // in O(n log n). It's well-behaved if the list is already sorted,
- // or nearly so.
- //
- static private void quickSort(Object[] arr, Comparer c, int from, int to) {
- if (to <= from)
- return;
- int mid = (from + to) / 2;
- if (mid != from)
- swap(arr, mid, from);
- Object pivot = arr[from]; // Simple-minded, but reasonable
- int highestBelowPivot = from - 1;
- int low = from+1;
- int high = to;
- // We now move low and high toward each other, maintaining the
- // invariants:
- // arr[i] <= pivot for all i < low
- // arr[i] > pivot for all i > high
- // As long as these invariants hold, and every iteration makes
- // progress, we are safe.
- while (low <= high) {
- int cmp = c.compare(arr[low], pivot);
- if (cmp <= 0) { // arr[low] <= pivot
- if (cmp < 0) {
- highestBelowPivot = low;
- }
- low++;
- } else {
- int c2;
- for (;;) {
- // arr[high] > pivot:
- c2 = c.compare(arr[high], pivot);
- if (c2 > 0) {
- high--;
- if (low > high) {
- break;
- }
- } else {
- break;
- }
- }
- // At this point, low is never == high, BTW
- if (low <= high) {
- swap(arr, low, high);
- if (c2 < 0) {
- highestBelowPivot = low;
- }
- low++;
- high--;
- }
- }
- }
- // At this point, low == high+1
- // Now we just need to sort from from..highestBelowPivot
- // and from high+1..to
- if (highestBelowPivot > from) {
- // pivot == pivot, so ensure algorithm terminates
- swap(arr, from, highestBelowPivot);
- quickSort(arr, c, from, highestBelowPivot-1);
- }
- quickSort(arr, c, high+1, to);
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/util/Comparer.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.util;
-
-/**
- * Base class for comparison of two objects.
- * @see VectorSorter
- *
- * @author Bill Foote
- */
-
-abstract public class Comparer {
-
- /**
- * @return a number <, == or > 0 depending on lhs compared to rhs
- * @see java.lang.String.compareTo
- **/
- abstract public int compare(Object lhs, Object rhs);
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/util/CompositeEnumeration.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.util;
-
-import java.util.Enumeration;
-import java.util.NoSuchElementException;
-import jdk.test.lib.hprof.model.JavaHeapObject;
-
-public class CompositeEnumeration implements Enumeration<JavaHeapObject> {
- Enumeration<JavaHeapObject> e1;
- Enumeration<JavaHeapObject> e2;
-
- public CompositeEnumeration(Enumeration<JavaHeapObject> e1, Enumeration<JavaHeapObject> e2) {
- this.e1 = e1;
- this.e2 = e2;
- }
-
- public boolean hasMoreElements() {
- return e1.hasMoreElements() || e2.hasMoreElements();
- }
-
- public JavaHeapObject nextElement() {
- if (e1.hasMoreElements()) {
- return e1.nextElement();
- }
-
- if (e2.hasMoreElements()) {
- return e2.nextElement();
- }
-
- throw new NoSuchElementException();
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/util/Misc.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.util;
-import java.util.*;
-
-/**
- * Miscellaneous functions I couldn't think of a good place to put.
- *
- * @author Bill Foote
- */
-
-
-public class Misc {
-
- private static char[] digits = { '0', '1', '2', '3', '4', '5', '6', '7',
- '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
-
- public final static String toHex(int addr) {
- char[] buf = new char[8];
- int i = 0;
- for (int s = 28; s >= 0; s -= 4) {
- buf[i++] = digits[(addr >> s) & 0xf];
- }
- return "0x" + new String(buf);
- }
-
- public final static String toHex(long addr) {
- return "0x" + Long.toHexString(addr);
- }
-
- public final static long parseHex(String value) {
- long result = 0;
- if (value.length() < 2 || value.charAt(0) != '0' ||
- value.charAt(1) != 'x') {
- return -1L;
- }
- for(int i = 2; i < value.length(); i++) {
- result *= 16;
- char ch = value.charAt(i);
- if (ch >= '0' && ch <= '9') {
- result += (ch - '0');
- } else if (ch >= 'a' && ch <= 'f') {
- result += (ch - 'a') + 10;
- } else if (ch >= 'A' && ch <= 'F') {
- result += (ch - 'A') + 10;
- } else {
- throw new NumberFormatException("" + ch
- + " is not a valid hex digit");
- }
- }
- return result;
- }
-
- public static String encodeHtml(String str) {
- final int len = str.length();
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < len; i++) {
- char ch = str.charAt(i);
- if (ch == '<') {
- sb.append("<");
- } else if (ch == '>') {
- sb.append(">");
- } else if (ch == '"') {
- sb.append(""");
- } else if (ch == '\'') {
- sb.append("'");
- } else if (ch == '&') {
- sb.append("&");
- } else if (ch < ' ') {
- sb.append("&#").append((int)ch).append(';');
- } else {
- int c = (ch & 0xFFFF);
- if (c > 127) {
- sb.append("&#").append(c).append(';');
- } else {
- sb.append(ch);
- }
- }
- }
- return sb.toString();
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/hprof/util/VectorSorter.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +0,0 @@
-/*
- * Copyright (c) 1997, 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. Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-
-/*
- * The Original Code is HAT. The Initial Developer of the
- * Original Code is Bill Foote, with contributions from others
- * at JavaSoft/Sun.
- */
-
-package jdk.test.lib.hprof.util;
-import java.util.*;
-
-/**
- * A singleton utility class that sorts a vector.
- * <p>
- * Use:
- * <pre>
- *
- * Vector v = <a vector of, say, String objects>;
- * VectorSorter.sort(v, new Comparer() {
- * public int compare(Object lhs, Object rhs) {
- * return ((String) lhs).compareTo((String) rhs);
- * }
- * });
- * </pre>
- *
- * @author Bill Foote
- */
-
-
-public class VectorSorter {
-
- /**
- * Sort the given vector, using c for comparison
- **/
- static public void sort(Vector<Object> v, Comparer c) {
- quickSort(v, c, 0, v.size()-1);
- }
-
-
- /**
- * Sort a vector of strings, using String.compareTo()
- **/
- static public void sortVectorOfStrings(Vector<Object> v) {
- sort(v, new Comparer() {
- public int compare(Object lhs, Object rhs) {
- return ((String) lhs).compareTo((String) rhs);
- }
- });
- }
-
-
- static private void swap(Vector<Object> v, int a, int b) {
- Object tmp = v.elementAt(a);
- v.setElementAt(v.elementAt(b), a);
- v.setElementAt(tmp, b);
- }
-
- //
- // Sorts v between from and to, inclusive. This is a quick, off-the-top-
- // of-my-head quicksort: I haven't put any thought into optimizing it.
- // I _did_ put thought into making sure it's safe (it will always
- // terminate). Worst-case it's O(n^2), but it will usually run in
- // in O(n log n). It's well-behaved if the list is already sorted,
- // or nearly so.
- //
- static private void quickSort(Vector<Object> v, Comparer c, int from, int to) {
- if (to <= from)
- return;
- int mid = (from + to) / 2;
- if (mid != from)
- swap(v, mid, from);
- Object pivot = v.elementAt(from);
- // Simple-minded, but reasonable
- int highestBelowPivot = from - 1;
- int low = from+1;
- int high = to;
- // We now move low and high toward eachother, maintaining the
- // invariants:
- // v[i] <= pivot for all i < low
- // v[i] > pivot for all i > high
- // As long as these invariants hold, and every iteration makes
- // progress, we are safe.
- while (low <= high) {
- int cmp = c.compare(v.elementAt(low), pivot);
- if (cmp <= 0) { // v[low] <= pivot
- if (cmp < 0) {
- highestBelowPivot = low;
- }
- low++;
- } else {
- int c2;
- for (;;) {
- c2 = c.compare(v.elementAt(high), pivot);
- // v[high] > pivot:
- if (c2 > 0) {
- high--;
- if (low > high) {
- break;
- }
- } else {
- break;
- }
- }
- // At this point, low is never == high
- if (low <= high) {
- swap(v, low, high);
- if (c2 < 0) {
- highestBelowPivot = low;
- }
- low++;
- high--;
- }
- }
- }
- // Now we just need to sort from from..highestBelowPivot
- // and from high+1..to
- if (highestBelowPivot > from) {
- // pivot == pivot, so ensure algorithm terminates
- swap(v, from, highestBelowPivot);
- quickSort(v, c, from, highestBelowPivot-1);
- }
- quickSort(v, c, high+1, to);
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/process/OutputAnalyzer.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,436 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib.process;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public final class OutputAnalyzer {
-
- private final String stdout;
- private final String stderr;
- private final int exitValue;
-
- /**
- * Create an OutputAnalyzer, a utility class for verifying output and exit
- * value from a Process
- *
- * @param process Process to analyze
- * @throws IOException If an I/O error occurs.
- */
- public OutputAnalyzer(Process process) throws IOException {
- OutputBuffer output = ProcessTools.getOutput(process);
- exitValue = process.exitValue();
- this.stdout = output.getStdout();
- this.stderr = output.getStderr();
- }
-
- /**
- * Create an OutputAnalyzer, a utility class for verifying output
- *
- * @param buf String buffer to analyze
- */
- public OutputAnalyzer(String buf) {
- this(buf, buf);
- }
-
- /**
- * Create an OutputAnalyzer, a utility class for verifying output
- *
- * @param stdout stdout buffer to analyze
- * @param stderr stderr buffer to analyze
- */
- public OutputAnalyzer(String stdout, String stderr) {
- this.stdout = stdout;
- this.stderr = stderr;
- exitValue = -1;
- }
-
- /**
- * Verify that the stdout contents of output buffer is empty
- *
- * @throws RuntimeException
- * If stdout was not empty
- */
- public void stdoutShouldBeEmpty() {
- if (!getStdout().isEmpty()) {
- reportDiagnosticSummary();
- throw new RuntimeException("stdout was not empty");
- }
- }
-
- /**
- * Verify that the stderr contents of output buffer is empty
- *
- * @throws RuntimeException
- * If stderr was not empty
- */
- public void stderrShouldBeEmpty() {
- if (!getStderr().isEmpty()) {
- reportDiagnosticSummary();
- throw new RuntimeException("stderr was not empty");
- }
- }
-
- /**
- * Verify that the stdout contents of output buffer is not empty
- *
- * @throws RuntimeException
- * If stdout was empty
- */
- public void stdoutShouldNotBeEmpty() {
- if (getStdout().isEmpty()) {
- reportDiagnosticSummary();
- throw new RuntimeException("stdout was empty");
- }
- }
-
- /**
- * Verify that the stderr contents of output buffer is not empty
- *
- * @throws RuntimeException
- * If stderr was empty
- */
- public void stderrShouldNotBeEmpty() {
- if (getStderr().isEmpty()) {
- reportDiagnosticSummary();
- throw new RuntimeException("stderr was empty");
- }
- }
-
- /**
- * Verify that the stdout and stderr contents of output buffer contains the string
- *
- * @param expectedString String that buffer should contain
- * @throws RuntimeException If the string was not found
- */
- public OutputAnalyzer shouldContain(String expectedString) {
- if (!stdout.contains(expectedString) && !stderr.contains(expectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + expectedString + "' missing from stdout/stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout contents of output buffer contains the string
- *
- * @param expectedString String that buffer should contain
- * @throws RuntimeException If the string was not found
- */
- public OutputAnalyzer stdoutShouldContain(String expectedString) {
- if (!stdout.contains(expectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + expectedString + "' missing from stdout \n");
- }
- return this;
- }
-
- /**
- * Verify that the stderr contents of output buffer contains the string
- *
- * @param expectedString String that buffer should contain
- * @throws RuntimeException If the string was not found
- */
- public OutputAnalyzer stderrShouldContain(String expectedString) {
- if (!stderr.contains(expectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + expectedString + "' missing from stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout and stderr contents of output buffer does not contain the string
- *
- * @param expectedString String that the buffer should not contain
- * @throws RuntimeException If the string was found
- */
- public OutputAnalyzer shouldNotContain(String notExpectedString) {
- if (stdout.contains(notExpectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
- }
- if (stderr.contains(notExpectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout contents of output buffer does not contain the string
- *
- * @param expectedString String that the buffer should not contain
- * @throws RuntimeException If the string was found
- */
- public OutputAnalyzer stdoutShouldNotContain(String notExpectedString) {
- if (stdout.contains(notExpectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString + "' found in stdout \n");
- }
- return this;
- }
-
- /**
- * Verify that the stderr contents of output buffer does not contain the string
- *
- * @param expectedString String that the buffer should not contain
- * @throws RuntimeException If the string was found
- */
- public OutputAnalyzer stderrShouldNotContain(String notExpectedString) {
- if (stderr.contains(notExpectedString)) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + notExpectedString + "' found in stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout and stderr contents of output buffer matches
- * the pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was not found
- */
- public OutputAnalyzer shouldMatch(String pattern) {
- Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (!stdoutMatcher.find() && !stderrMatcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' missing from stdout/stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout contents of output buffer matches the
- * pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was not found
- */
- public OutputAnalyzer stdoutShouldMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (!matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' missing from stdout \n");
- }
- return this;
- }
-
- /**
- * Verify that the stderr contents of output buffer matches the
- * pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was not found
- */
- public OutputAnalyzer stderrShouldMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (!matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' missing from stderr \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout and stderr contents of output buffer does not
- * match the pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was found
- */
- public OutputAnalyzer shouldNotMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' found in stdout: '" + matcher.group() + "' \n");
- }
- matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' found in stderr: '" + matcher.group() + "' \n");
- }
- return this;
- }
-
- /**
- * Verify that the stdout contents of output buffer does not match the
- * pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was found
- */
- public OutputAnalyzer stdoutShouldNotMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' found in stdout \n");
- }
- return this;
- }
-
- /**
- * Verify that the stderr contents of output buffer does not match the
- * pattern
- *
- * @param pattern
- * @throws RuntimeException If the pattern was found
- */
- public OutputAnalyzer stderrShouldNotMatch(String pattern) {
- Matcher matcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- if (matcher.find()) {
- reportDiagnosticSummary();
- throw new RuntimeException("'" + pattern
- + "' found in stderr \n");
- }
- return this;
- }
-
- /**
- * Get the captured group of the first string matching the pattern.
- * stderr is searched before stdout.
- *
- * @param pattern The multi-line pattern to match
- * @param group The group to capture
- * @return The matched string or null if no match was found
- */
- public String firstMatch(String pattern, int group) {
- Matcher stderrMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stderr);
- Matcher stdoutMatcher = Pattern.compile(pattern, Pattern.MULTILINE).matcher(stdout);
- if (stderrMatcher.find()) {
- return stderrMatcher.group(group);
- }
- if (stdoutMatcher.find()) {
- return stdoutMatcher.group(group);
- }
- return null;
- }
-
- /**
- * Get the first string matching the pattern.
- * stderr is searched before stdout.
- *
- * @param pattern The multi-line pattern to match
- * @return The matched string or null if no match was found
- */
- public String firstMatch(String pattern) {
- return firstMatch(pattern, 0);
- }
-
- /**
- * Verify the exit value of the process
- *
- * @param expectedExitValue Expected exit value from process
- * @throws RuntimeException If the exit value from the process did not match the expected value
- */
- public OutputAnalyzer shouldHaveExitValue(int expectedExitValue) {
- if (getExitValue() != expectedExitValue) {
- reportDiagnosticSummary();
- throw new RuntimeException("Expected to get exit value of ["
- + expectedExitValue + "]\n");
- }
- return this;
- }
-
-
- /**
- * Report summary that will help to diagnose the problem
- * Currently includes:
- * - standard input produced by the process under test
- * - standard output
- * - exit code
- * Note: the command line is printed by the ProcessTools
- */
- private void reportDiagnosticSummary() {
- String msg =
- " stdout: [" + stdout + "];\n" +
- " stderr: [" + stderr + "]\n" +
- " exitValue = " + getExitValue() + "\n";
-
- System.err.println(msg);
- }
-
-
- /**
- * Get the contents of the output buffer (stdout and stderr)
- *
- * @return Content of the output buffer
- */
- public String getOutput() {
- return stdout + stderr;
- }
-
- /**
- * Get the contents of the stdout buffer
- *
- * @return Content of the stdout buffer
- */
- public String getStdout() {
- return stdout;
- }
-
- /**
- * Get the contents of the stderr buffer
- *
- * @return Content of the stderr buffer
- */
- public String getStderr() {
- return stderr;
- }
-
- /**
- * Get the process exit value
- *
- * @return Process exit value
- */
- public int getExitValue() {
- return exitValue;
- }
-
- /**
- * Get the contents of the output buffer (stdout and stderr) as list of strings.
- * Output will be split by newlines.
- *
- * @return Contents of the output buffer as list of strings
- */
- public List<String> asLines() {
- return asLines(getOutput());
- }
-
- private List<String> asLines(String buffer) {
- return Arrays.asList(buffer.split("(\\r\\n|\\n|\\r)"));
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/process/OutputBuffer.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib.process;
-
-public class OutputBuffer {
- private final String stdout;
- private final String stderr;
-
- /**
- * Create an OutputBuffer, a class for storing and managing stdout and stderr
- * results separately
- *
- * @param stdout stdout result
- * @param stderr stderr result
- */
- public OutputBuffer(String stdout, String stderr) {
- this.stdout = stdout;
- this.stderr = stderr;
- }
-
- /**
- * Returns the stdout result
- *
- * @return stdout result
- */
- public String getStdout() {
- return stdout;
- }
-
- /**
- * Returns the stderr result
- *
- * @return stderr result
- */
- public String getStderr() {
- return stderr;
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/process/ProcessTools.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,590 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib.process;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.concurrent.CountDownLatch;
-import java.util.Map;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import java.util.function.Predicate;
-import java.util.function.Consumer;
-import java.util.stream.Collectors;
-
-import jdk.test.lib.JDKToolFinder;
-import jdk.test.lib.Platform;
-import jdk.test.lib.Utils;
-
-public final class ProcessTools {
- private static final class LineForwarder extends StreamPumper.LinePump {
- private final PrintStream ps;
- private final String prefix;
- LineForwarder(String prefix, PrintStream os) {
- this.ps = os;
- this.prefix = prefix;
- }
- @Override
- protected void processLine(String line) {
- ps.println("[" + prefix + "] " + line);
- }
- }
-
- private ProcessTools() {
- }
-
- /**
- * Pumps stdout and stderr from running the process into a String.
- *
- * @param processHandler ProcessHandler to run.
- * @return Output from process.
- * @throws IOException If an I/O error occurs.
- */
- public static OutputBuffer getOutput(ProcessBuilder processBuilder) throws IOException {
- return getOutput(processBuilder.start());
- }
-
- /**
- * Pumps stdout and stderr the running process into a String.
- *
- * @param process Process to pump.
- * @return Output from process.
- * @throws IOException If an I/O error occurs.
- */
- public static OutputBuffer getOutput(Process process) throws IOException {
- ByteArrayOutputStream stderrBuffer = new ByteArrayOutputStream();
- ByteArrayOutputStream stdoutBuffer = new ByteArrayOutputStream();
- StreamPumper outPumper = new StreamPumper(process.getInputStream(), stdoutBuffer);
- StreamPumper errPumper = new StreamPumper(process.getErrorStream(), stderrBuffer);
- Thread outPumperThread = new Thread(outPumper);
- Thread errPumperThread = new Thread(errPumper);
-
- outPumperThread.setDaemon(true);
- errPumperThread.setDaemon(true);
-
- outPumperThread.start();
- errPumperThread.start();
-
- try {
- process.waitFor();
- outPumperThread.join();
- errPumperThread.join();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- return null;
- }
-
- return new OutputBuffer(stdoutBuffer.toString(), stderrBuffer.toString());
- }
-
- /**
- * <p>Starts a process from its builder.</p>
- * <span>The default redirects of STDOUT and STDERR are started</span>
- * @param name The process name
- * @param processBuilder The process builder
- * @return Returns the initialized process
- * @throws IOException
- */
- public static Process startProcess(String name,
- ProcessBuilder processBuilder)
- throws IOException {
- return startProcess(name, processBuilder, (Consumer<String>)null);
- }
-
- /**
- * <p>Starts a process from its builder.</p>
- * <span>The default redirects of STDOUT and STDERR are started</span>
- * <p>It is possible to monitor the in-streams via the provided {@code consumer}
- * @param name The process name
- * @param consumer {@linkplain Consumer} instance to process the in-streams
- * @param processBuilder The process builder
- * @return Returns the initialized process
- * @throws IOException
- */
- @SuppressWarnings("overloads")
- public static Process startProcess(String name,
- ProcessBuilder processBuilder,
- Consumer<String> consumer)
- throws IOException {
- try {
- return startProcess(name, processBuilder, consumer, null, -1, TimeUnit.NANOSECONDS);
- } catch (InterruptedException | TimeoutException e) {
- // will never happen
- throw new RuntimeException(e);
- }
- }
-
- /**
- * <p>Starts a process from its builder.</p>
- * <span>The default redirects of STDOUT and STDERR are started</span>
- * <p>
- * It is possible to wait for the process to get to a warmed-up state
- * via {@linkplain Predicate} condition on the STDOUT
- * </p>
- * @param name The process name
- * @param processBuilder The process builder
- * @param linePredicate The {@linkplain Predicate} to use on the STDOUT
- * Used to determine the moment the target app is
- * properly warmed-up.
- * It can be null - in that case the warmup is skipped.
- * @param timeout The timeout for the warmup waiting; -1 = no wait; 0 = wait forever
- * @param unit The timeout {@linkplain TimeUnit}
- * @return Returns the initialized {@linkplain Process}
- * @throws IOException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- public static Process startProcess(String name,
- ProcessBuilder processBuilder,
- final Predicate<String> linePredicate,
- long timeout,
- TimeUnit unit)
- throws IOException, InterruptedException, TimeoutException {
- return startProcess(name, processBuilder, null, linePredicate, timeout, unit);
- }
-
- /**
- * <p>Starts a process from its builder.</p>
- * <span>The default redirects of STDOUT and STDERR are started</span>
- * <p>
- * It is possible to wait for the process to get to a warmed-up state
- * via {@linkplain Predicate} condition on the STDOUT and monitor the
- * in-streams via the provided {@linkplain Consumer}
- * </p>
- * @param name The process name
- * @param processBuilder The process builder
- * @param lineConsumer The {@linkplain Consumer} the lines will be forwarded to
- * @param linePredicate The {@linkplain Predicate} to use on the STDOUT
- * Used to determine the moment the target app is
- * properly warmed-up.
- * It can be null - in that case the warmup is skipped.
- * @param timeout The timeout for the warmup waiting; -1 = no wait; 0 = wait forever
- * @param unit The timeout {@linkplain TimeUnit}
- * @return Returns the initialized {@linkplain Process}
- * @throws IOException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- public static Process startProcess(String name,
- ProcessBuilder processBuilder,
- final Consumer<String> lineConsumer,
- final Predicate<String> linePredicate,
- long timeout,
- TimeUnit unit)
- throws IOException, InterruptedException, TimeoutException {
- System.out.println("["+name+"]:" + processBuilder.command().stream().collect(Collectors.joining(" ")));
- Process p = processBuilder.start();
- StreamPumper stdout = new StreamPumper(p.getInputStream());
- StreamPumper stderr = new StreamPumper(p.getErrorStream());
-
- stdout.addPump(new LineForwarder(name, System.out));
- stderr.addPump(new LineForwarder(name, System.err));
- if (lineConsumer != null) {
- StreamPumper.LinePump pump = new StreamPumper.LinePump() {
- @Override
- protected void processLine(String line) {
- lineConsumer.accept(line);
- }
- };
- stdout.addPump(pump);
- stderr.addPump(pump);
- }
-
-
- CountDownLatch latch = new CountDownLatch(1);
- if (linePredicate != null) {
- StreamPumper.LinePump pump = new StreamPumper.LinePump() {
- @Override
- protected void processLine(String line) {
- if (latch.getCount() > 0 && linePredicate.test(line)) {
- latch.countDown();
- }
- }
- };
- stdout.addPump(pump);
- stderr.addPump(pump);
- } else {
- latch.countDown();
- }
- final Future<Void> stdoutTask = stdout.process();
- final Future<Void> stderrTask = stderr.process();
-
- try {
- if (timeout > -1) {
- if (timeout == 0) {
- latch.await();
- } else {
- if (!latch.await(Utils.adjustTimeout(timeout), unit)) {
- throw new TimeoutException();
- }
- }
- }
- } catch (TimeoutException | InterruptedException e) {
- System.err.println("Failed to start a process (thread dump follows)");
- for(Map.Entry<Thread, StackTraceElement[]> s : Thread.getAllStackTraces().entrySet()) {
- printStack(s.getKey(), s.getValue());
- }
-
- if (p.isAlive()) {
- p.destroyForcibly();
- }
-
- stdoutTask.cancel(true);
- stderrTask.cancel(true);
- throw e;
- }
-
- return new ProcessImpl(p, stdoutTask, stderrTask);
- }
-
- /**
- * <p>Starts a process from its builder.</p>
- * <span>The default redirects of STDOUT and STDERR are started</span>
- * <p>
- * It is possible to wait for the process to get to a warmed-up state
- * via {@linkplain Predicate} condition on the STDOUT. The warm-up will
- * wait indefinitely.
- * </p>
- * @param name The process name
- * @param processBuilder The process builder
- * @param linePredicate The {@linkplain Predicate} to use on the STDOUT
- * Used to determine the moment the target app is
- * properly warmed-up.
- * It can be null - in that case the warmup is skipped.
- * @return Returns the initialized {@linkplain Process}
- * @throws IOException
- * @throws InterruptedException
- * @throws TimeoutException
- */
- @SuppressWarnings("overloads")
- public static Process startProcess(String name,
- ProcessBuilder processBuilder,
- final Predicate<String> linePredicate)
- throws IOException, InterruptedException, TimeoutException {
- return startProcess(name, processBuilder, linePredicate, 0, TimeUnit.SECONDS);
- }
-
- /**
- * Get the process id of the current running Java process
- *
- * @return Process id
- */
- public static long getProcessId() throws Exception {
- return ProcessHandle.current().getPid();
- }
-
- /**
- * Get platform specific VM arguments (e.g. -d64 on 64bit Solaris)
- *
- * @return String[] with platform specific arguments, empty if there are
- * none
- */
- public static String[] getPlatformSpecificVMArgs() {
-
- if (Platform.is64bit() && Platform.isSolaris()) {
- return new String[] { "-d64" };
- }
-
- return new String[] {};
- }
-
-
- /**
- * Create ProcessBuilder using the java launcher from the jdk to be tested and
- * with any platform specific arguments prepended
- */
- public static ProcessBuilder createJavaProcessBuilder(String... command) throws Exception {
- return createJavaProcessBuilder(false, command);
- }
-
- /**
- * Create ProcessBuilder using the java launcher from the jdk to be tested,
- * and with any platform specific arguments prepended.
- *
- * @param addTestVmAndJavaOptions If true, adds test.vm.opts and test.java.opts
- * to the java arguments.
- * @param command Arguments to pass to the java command.
- * @return The ProcessBuilder instance representing the java command.
- */
- public static ProcessBuilder createJavaProcessBuilder(boolean addTestVmAndJavaOptions, String... command) throws Exception {
- String javapath = JDKToolFinder.getJDKTool("java");
-
- ArrayList<String> args = new ArrayList<>();
- args.add(javapath);
- Collections.addAll(args, getPlatformSpecificVMArgs());
-
- if (addTestVmAndJavaOptions) {
- // -cp is needed to make sure the same classpath is used whether the test is
- // run in AgentVM mode or OtherVM mode. It was added to the hotspot version
- // of this API as part of 8077608. However, for the jdk version it is only
- // added when addTestVmAndJavaOptions is true in order to minimize
- // disruption to existing JDK tests, which have yet to be tested with -cp
- // being added. At some point -cp should always be added to be consistent
- // with what the hotspot version does.
- args.add("-cp");
- args.add(System.getProperty("java.class.path"));
- Collections.addAll(args, Utils.getTestJavaOpts());
- }
-
- Collections.addAll(args, command);
-
- // Reporting
- StringBuilder cmdLine = new StringBuilder();
- for (String cmd : args)
- cmdLine.append(cmd).append(' ');
- System.out.println("Command line: [" + cmdLine.toString() + "]");
-
- return new ProcessBuilder(args.toArray(new String[args.size()]));
- }
-
- private static void printStack(Thread t, StackTraceElement[] stack) {
- System.out.println("\t" + t +
- " stack: (length = " + stack.length + ")");
- if (t != null) {
- for (StackTraceElement stack1 : stack) {
- System.out.println("\t" + stack1);
- }
- System.out.println();
- }
- }
-
- /**
- * Executes a test jvm process, waits for it to finish and returns the process output.
- * The default jvm options from jtreg, test.vm.opts and test.java.opts, are added.
- * The java from the test.jdk is used to execute the command.
- *
- * The command line will be like:
- * {test.jdk}/bin/java {test.vm.opts} {test.java.opts} cmds
- *
- * The jvm process will have exited before this method returns.
- *
- * @param cmds User specifed arguments.
- * @return The output from the process.
- */
- public static OutputAnalyzer executeTestJvm(String... cmds) throws Exception {
- ProcessBuilder pb = createJavaProcessBuilder(Utils.addTestJavaOpts(cmds));
- return executeProcess(pb);
- }
-
- /**
- * Executes a process, waits for it to finish and returns the process output.
- * The process will have exited before this method returns.
- * @param pb The ProcessBuilder to execute.
- * @return The {@linkplain OutputAnalyzer} instance wrapping the process.
- */
- public static OutputAnalyzer executeProcess(ProcessBuilder pb) throws Exception {
- OutputAnalyzer output = null;
- Process p = null;
- boolean failed = false;
- try {
- p = pb.start();
- output = new OutputAnalyzer(p);
- p.waitFor();
-
- return output;
- } catch (Throwable t) {
- if (p != null) {
- p.destroyForcibly().waitFor();
- }
-
- failed = true;
- System.out.println("executeProcess() failed: " + t);
- throw t;
- } finally {
- if (failed) {
- System.err.println(getProcessLog(pb, output));
- }
- }
- }
-
- /**
- * Executes a process, waits for it to finish and returns the process output.
- *
- * The process will have exited before this method returns.
- *
- * @param cmds The command line to execute.
- * @return The output from the process.
- */
- public static OutputAnalyzer executeProcess(String... cmds) throws Throwable {
- return executeProcess(new ProcessBuilder(cmds));
- }
-
- /**
- * Used to log command line, stdout, stderr and exit code from an executed process.
- * @param pb The executed process.
- * @param output The output from the process.
- */
- public static String getProcessLog(ProcessBuilder pb, OutputAnalyzer output) {
- String stderr = output == null ? "null" : output.getStderr();
- String stdout = output == null ? "null" : output.getStdout();
- String exitValue = output == null ? "null": Integer.toString(output.getExitValue());
- StringBuilder logMsg = new StringBuilder();
- final String nl = System.getProperty("line.separator");
- logMsg.append("--- ProcessLog ---" + nl);
- logMsg.append("cmd: " + getCommandLine(pb) + nl);
- logMsg.append("exitvalue: " + exitValue + nl);
- logMsg.append("stderr: " + stderr + nl);
- logMsg.append("stdout: " + stdout + nl);
-
- return logMsg.toString();
- }
-
- /**
- * @return The full command line for the ProcessBuilder.
- */
- public static String getCommandLine(ProcessBuilder pb) {
- if (pb == null) {
- return "null";
- }
- StringBuilder cmd = new StringBuilder();
- for (String s : pb.command()) {
- cmd.append(s).append(" ");
- }
- return cmd.toString().trim();
- }
-
- /**
- * Executes a process, waits for it to finish, prints the process output
- * to stdout, and returns the process output.
- *
- * The process will have exited before this method returns.
- *
- * @param cmds The command line to execute.
- * @return The {@linkplain OutputAnalyzer} instance wrapping the process.
- */
- public static OutputAnalyzer executeCommand(String... cmds)
- throws Throwable {
- String cmdLine = Arrays.stream(cmds).collect(Collectors.joining(" "));
- System.out.println("Command line: [" + cmdLine + "]");
- OutputAnalyzer analyzer = ProcessTools.executeProcess(cmds);
- System.out.println(analyzer.getOutput());
- return analyzer;
- }
-
- /**
- * Executes a process, waits for it to finish, prints the process output
- * to stdout and returns the process output.
- *
- * The process will have exited before this method returns.
- *
- * @param pb The ProcessBuilder to execute.
- * @return The {@linkplain OutputAnalyzer} instance wrapping the process.
- */
- public static OutputAnalyzer executeCommand(ProcessBuilder pb)
- throws Throwable {
- String cmdLine = pb.command().stream().collect(Collectors.joining(" "));
- System.out.println("Command line: [" + cmdLine + "]");
- OutputAnalyzer analyzer = ProcessTools.executeProcess(pb);
- System.out.println(analyzer.getOutput());
- return analyzer;
- }
-
- private static class ProcessImpl extends Process {
-
- private final Process p;
- private final Future<Void> stdoutTask;
- private final Future<Void> stderrTask;
-
- public ProcessImpl(Process p, Future<Void> stdoutTask, Future<Void> stderrTask) {
- this.p = p;
- this.stdoutTask = stdoutTask;
- this.stderrTask = stderrTask;
- }
-
- @Override
- public OutputStream getOutputStream() {
- return p.getOutputStream();
- }
-
- @Override
- public InputStream getInputStream() {
- return p.getInputStream();
- }
-
- @Override
- public InputStream getErrorStream() {
- return p.getErrorStream();
- }
-
- @Override
- public int waitFor() throws InterruptedException {
- int rslt = p.waitFor();
- waitForStreams();
- return rslt;
- }
-
- @Override
- public int exitValue() {
- return p.exitValue();
- }
-
- @Override
- public void destroy() {
- p.destroy();
- }
-
- @Override
- public long getPid() {
- return p.getPid();
- }
-
- @Override
- public boolean isAlive() {
- return p.isAlive();
- }
-
- @Override
- public Process destroyForcibly() {
- return p.destroyForcibly();
- }
-
- @Override
- public boolean waitFor(long timeout, TimeUnit unit) throws InterruptedException {
- boolean rslt = p.waitFor(timeout, unit);
- if (rslt) {
- waitForStreams();
- }
- return rslt;
- }
-
- private void waitForStreams() throws InterruptedException {
- try {
- stdoutTask.get();
- } catch (ExecutionException e) {
- }
- try {
- stderrTask.get();
- } catch (ExecutionException e) {
- }
- }
- }
-}
--- a/test/lib/share/classes/jdk/test/lib/process/StreamPumper.java Mon Sep 12 15:00:58 2016 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2013, 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.
- */
-
-package jdk.test.lib.process;
-
-import java.io.BufferedInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.io.InputStream;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public final class StreamPumper implements Runnable {
-
- private static final int BUF_SIZE = 256;
-
- /**
- * Pump will be called by the StreamPumper to process the incoming data
- */
- abstract public static class Pump {
- abstract void register(StreamPumper d);
- }
-
- /**
- * OutputStream -> Pump adapter
- */
- final public static class StreamPump extends Pump {
- private final OutputStream out;
- public StreamPump(OutputStream out) {
- this.out = out;
- }
-
- @Override
- void register(StreamPumper sp) {
- sp.addOutputStream(out);
- }
- }
-
- /**
- * Used to process the incoming data line-by-line
- */
- abstract public static class LinePump extends Pump {
- @Override
- final void register(StreamPumper sp) {
- sp.addLineProcessor(this);
- }
-
- abstract protected void processLine(String line);
- }
-
- private final InputStream in;
- private final Set<OutputStream> outStreams = new HashSet<>();
- private final Set<LinePump> linePumps = new HashSet<>();
-
- private final AtomicBoolean processing = new AtomicBoolean(false);
- private final FutureTask<Void> processingTask = new FutureTask<>(this, null);
-
- public StreamPumper(InputStream in) {
- this.in = in;
- }
-
- /**
- * Create a StreamPumper that reads from in and writes to out.
- *
- * @param in The stream to read from.
- * @param out The stream to write to.
- */
- public StreamPumper(InputStream in, OutputStream out) {
- this(in);
- this.addOutputStream(out);
- }
-
- /**
- * Implements Thread.run(). Continuously read from {@code in} and write to
- * {@code out} until {@code in} has reached end of stream. Abort on
- * interruption. Abort on IOExceptions.
- */
- @Override
- public void run() {
- try (BufferedInputStream is = new BufferedInputStream(in)) {
- ByteArrayOutputStream lineBos = new ByteArrayOutputStream();
- byte[] buf = new byte[BUF_SIZE];
- int len = 0;
- int linelen = 0;
-
- while ((len = is.read(buf)) > 0 && !Thread.interrupted()) {
- for(OutputStream out : outStreams) {
- out.write(buf, 0, len);
- }
- if (!linePumps.isEmpty()) {
- int i = 0;
- int lastcrlf = -1;
- while (i < len) {
- if (buf[i] == '\n' || buf[i] == '\r') {
- int bufLinelen = i - lastcrlf - 1;
- if (bufLinelen > 0) {
- lineBos.write(buf, lastcrlf + 1, bufLinelen);
- }
- linelen += bufLinelen;
-
- if (linelen > 0) {
- lineBos.flush();
- final String line = lineBos.toString();
- linePumps.stream().forEach((lp) -> {
- lp.processLine(line);
- });
- lineBos.reset();
- linelen = 0;
- }
- lastcrlf = i;
- }
-
- i++;
- }
- if (lastcrlf == -1) {
- lineBos.write(buf, 0, len);
- linelen += len;
- } else if (lastcrlf < len - 1) {
- lineBos.write(buf, lastcrlf + 1, len - lastcrlf - 1);
- linelen += len - lastcrlf - 1;
- }
- }
- }
-
- } catch (IOException e) {
- e.printStackTrace();
- } finally {
- for(OutputStream out : outStreams) {
- try {
- out.flush();
- } catch (IOException e) {}
- }
- try {
- in.close();
- } catch (IOException e) {}
- }
- }
-
- final void addOutputStream(OutputStream out) {
- outStreams.add(out);
- }
-
- final void addLineProcessor(LinePump lp) {
- linePumps.add(lp);
- }
-
- final public StreamPumper addPump(Pump ... pump) {
- if (processing.get()) {
- throw new IllegalStateException("Can not modify pumper while " +
- "processing is in progress");
- }
- for(Pump p : pump) {
- p.register(this);
- }
- return this;
- }
-
- final public Future<Void> process() {
- if (!processing.compareAndSet(false, true)) {
- throw new IllegalStateException("Can not re-run the processing");
- }
- Thread t = new Thread(new Runnable() {
- @Override
- public void run() {
- processingTask.run();
- }
- });
- t.setDaemon(true);
- t.start();
-
- return processingTask;
- }
-}