--- a/hotspot/make/bsd/makefiles/amd64.make Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/make/bsd/makefiles/amd64.make Thu Mar 03 12:49:44 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2003, 2010, 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
@@ -37,3 +37,11 @@
endif
OPT_CFLAGS/compactingPermGenGen.o = -O1
+
+# The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+# of OPT_CFLAGS. Restore it here.
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/sharedRuntimeTrig.o += -g
+ OPT_CFLAGS/sharedRuntimeTrans.o += -g
+ OPT_CFLAGS/compactingPermGenGen.o += -g
+endif
--- a/hotspot/make/bsd/makefiles/gcc.make Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/make/bsd/makefiles/gcc.make Thu Mar 03 12:49:44 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2015, 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
@@ -330,6 +330,13 @@
), 1)
OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
OPT_CFLAGS/unsafe.o += -O1
+
+ # The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+ # of OPT_CFLAGS. Restore it here.
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/loopTransform.o += -g
+ OPT_CFLAGS/unsafe.o += -g
+ endif
else
$(error "Update compiler workarounds for Clang $(CC_VER_MAJOR).$(CC_VER_MINOR)")
endif
--- a/hotspot/make/linux/makefiles/amd64.make Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/make/linux/makefiles/amd64.make Thu Mar 03 12:49:44 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2003, 2013, 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
@@ -32,3 +32,11 @@
CFLAGS += -D_LP64=1
OPT_CFLAGS/compactingPermGenGen.o = -O1
+
+# The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+# of OPT_CFLAGS. Restore it here.
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/sharedRuntimeTrig.o += -g
+ OPT_CFLAGS/sharedRuntimeTrans.o += -g
+ OPT_CFLAGS/compactingPermGenGen.o += -g
+endif
--- a/hotspot/make/linux/makefiles/gcc.make Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/make/linux/makefiles/gcc.make Thu Mar 03 12:49:44 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2015, 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
@@ -265,6 +265,11 @@
# GCC >= 4.3
# Gcc 4.1.2 does not support this flag, nor does it have problems compiling the file.
OPT_CFLAGS/vmStructs.o += -fno-var-tracking-assignments
+ # The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+ # of OPT_CFLAGS. Restore it here.
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/vmStructs.o += -g
+ endif
endif
# The gcc compiler segv's on ia64 when compiling bytecodeInterpreter.cpp
@@ -277,6 +282,11 @@
ifeq ($(USE_CLANG), true)
ifeq ($(shell expr $(CC_VER_MAJOR) = 4 \& $(CC_VER_MINOR) = 2), 1)
OPT_CFLAGS/loopTransform.o += $(OPT_CFLAGS/NOOPT)
+ # The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+ # of OPT_CFLAGS. Restore it here.
+ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/loopTransform.o += -g
+ endif
endif
else
# Do not allow GCC 4.1.1
--- a/hotspot/make/linux/makefiles/i486.make Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/make/linux/makefiles/i486.make Thu Mar 03 12:49:44 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2010, 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
@@ -32,3 +32,11 @@
CFLAGS += -DVM_LITTLE_ENDIAN
OPT_CFLAGS/compactingPermGenGen.o = -O1
+
+# The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+# of OPT_CFLAGS. Restore it here.
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/sharedRuntimeTrig.o += -g
+ OPT_CFLAGS/sharedRuntimeTrans.o += -g
+ OPT_CFLAGS/compactingPermGenGen.o += -g
+endif
--- a/hotspot/make/linux/makefiles/zeroshark.make Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/make/linux/makefiles/zeroshark.make Thu Mar 03 12:49:44 2016 -0800
@@ -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 2007, 2008 Red Hat, Inc.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
@@ -29,12 +29,6 @@
ifeq ($(USE_CLANG), true)
WARNING_FLAGS += -Wno-undef
endif
-# Suppress some warning flags that are normally turned on for hotspot,
-# because some of the zero code has not been updated accordingly.
-WARNING_FLAGS += -Wno-return-type \
- -Wno-format-nonliteral -Wno-format-security \
- -Wno-maybe-uninitialized
-
# The copied fdlibm routines in sharedRuntimeTrig.o must not be optimized
OPT_CFLAGS/sharedRuntimeTrig.o = $(OPT_CFLAGS/NOOPT)
--- a/hotspot/make/solaris/makefiles/amd64.make Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/make/solaris/makefiles/amd64.make Thu Mar 03 12:49:44 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
# This code is free software; you can redistribute it and/or modify it
@@ -34,6 +34,14 @@
OPT_CFLAGS/generateOptoStub.o = -xO2
# Temporary util SS12u1 C++ compiler is fixed
OPT_CFLAGS/c1_LinearScan.o = -xO2
+
+# The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+# of OPT_CFLAGS. Restore it here.
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/generateOptoStub.o += -g0 -xs
+ OPT_CFLAGS/LinearScan.o += -g0 -xs
+endif
+
else
ifeq ("${Platform_compiler}", "gcc")
--- a/hotspot/make/solaris/makefiles/product.make Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/make/solaris/makefiles/product.make Thu Mar 03 12:49:44 2016 -0800
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1999, 2012, 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
@@ -35,11 +35,21 @@
# for this method for now. (fix this when dtrace bug 6258412 is fixed)
ifndef USE_GCC
OPT_CFLAGS/ciEnv.o = $(OPT_CFLAGS) -xinline=no%__1cFciEnvbFpost_compiled_method_load_event6MpnHnmethod__v_
+# The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+# of OPT_CFLAGS. Restore it here.
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/ciEnv.o += -g0 -xs
+endif
endif
# Need extra inlining to get oop_ps_push_contents functions to perform well enough.
ifndef USE_GCC
OPT_CFLAGS/psPromotionManager.o = $(OPT_CFLAGS) -W2,-Ainline:inc=1000
+# The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+# of OPT_CFLAGS. Restore it here.
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/psPromotionManager.o += -g0 -xs
+endif
endif
# (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files)
@@ -55,6 +65,12 @@
ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1)
# dtrace cannot handle tail call optimization (6672627, 6693876)
OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
+# The -g0 -xs flag is added to OPT_CFLAGS in sparcWorks.make, but lost in case of
+# per-file overrides of OPT_CFLAGS. Restore it here. This is mainly needed
+# to provide a good baseline to compare the new build against.
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/jni.o += -g0 -xs
+endif
endif # COMPILER_NUMERIC_REV >= 509
# Workaround SS11 bug 6345274 (all platforms) (Fixed in SS11 patch and SS12)
--- a/hotspot/make/solaris/makefiles/sparcWorks.make Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/make/solaris/makefiles/sparcWorks.make Thu Mar 03 12:49:44 2016 -0800
@@ -158,9 +158,20 @@
OPT_CCFLAGS/NO_TAIL_CALL_OPT = -Qoption ube -O~yz
OPT_CFLAGS/stubGenerator_x86_32.o = $(OPT_CFLAGS) -xspace
OPT_CFLAGS/stubGenerator_x86_64.o = $(OPT_CFLAGS) -xspace
+# The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+# of OPT_CFLAGS. Restore it here.
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/stubGenerator_x86_32.o += -g0 -xs
+ OPT_CFLAGS/stubGenerator_x86_64.o += -g0 -xs
+endif
endif # Platform_arch == x86
ifeq ("${Platform_arch}", "sparc")
OPT_CFLAGS/stubGenerator_sparc.o = $(OPT_CFLAGS) -xspace
+# The debug flag is added to OPT_CFLAGS, but lost in case of per-file overrides
+# of OPT_CFLAGS. Restore it here.
+ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
+ OPT_CFLAGS/stubGenerator_sparc.o += -g0 -xs
+endif
endif
endif # COMPILER_REV_NUMERIC >= 509
--- a/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -773,7 +773,7 @@
}
BasicType CppInterpreter::result_type_of(Method* method) {
- BasicType t;
+ BasicType t = T_ILLEGAL; // silence compiler warnings
switch (method->result_index()) {
case 0 : t = T_BOOLEAN; break;
case 1 : t = T_CHAR; break;
--- a/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/cpu/zero/vm/interpreterRT_zero.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -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.
* Copyright 2007, 2008, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -62,7 +62,7 @@
}
void InterpreterRuntime::SignatureHandlerGeneratorBase::push(BasicType type) {
- ffi_type *ftype;
+ ffi_type *ftype = NULL;
switch (type) {
case T_VOID:
ftype = &ffi_type_void;
--- a/hotspot/src/os/aix/vm/attachListener_aix.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/os/aix/vm/attachListener_aix.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2015 SAP SE. All rights reserved.
+ * Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016 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
@@ -225,7 +225,7 @@
// We must call bind with the actual socketaddr length. This is obligatory for AS400.
int res = ::bind(listener, (struct sockaddr*)&addr, SUN_LEN(&addr));
if (res == -1) {
- RESTARTABLE(::close(listener), res);
+ ::close(listener);
return -1;
}
@@ -238,7 +238,7 @@
}
}
if (res == -1) {
- RESTARTABLE(::close(listener), res);
+ ::close(listener);
::unlink(initial_path);
return -1;
}
@@ -400,7 +400,7 @@
AixAttachOperation* op = read_request(s);
if (op == NULL) {
int res;
- RESTARTABLE(::close(s), res);
+ ::close(s);
continue;
} else {
return op;
@@ -452,7 +452,7 @@
}
// done
- RESTARTABLE(::close(this->socket()), rc);
+ ::close(this->socket());
// were we externally suspended while we were waiting?
thread->check_and_wait_while_suspended();
--- a/hotspot/src/os/aix/vm/perfMemory_aix.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/os/aix/vm/perfMemory_aix.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -1,6 +1,6 @@
/*
- * Copyright (c) 2001, 2015, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2012, 2013 SAP SE. All rights reserved.
+ * Copyright (c) 2001, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2016 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
@@ -121,7 +121,7 @@
addr += result;
}
- RESTARTABLE(::close(fd), result);
+ result = ::close(fd);
if (PrintMiscellaneous && Verbose) {
if (result == OS_ERR) {
warning("Could not close %s: %s\n", destfile, strerror(errno));
@@ -299,10 +299,13 @@
bool create;
int error;
int fd;
+ int result;
create = false;
- if (lstat(path, &orig_st) != 0) {
+ RESTARTABLE(::lstat(path, &orig_st), result);
+
+ if (result == OS_ERR) {
if (errno == ENOENT && (oflag & O_CREAT) != 0) {
// File doesn't exist, but_we want to create it, add O_EXCL flag
// to make sure no-one creates it (or a symlink) before us
@@ -316,7 +319,7 @@
return OS_ERR;
}
} else {
- // Lstat success, check if existing file is a link.
+ // lstat success, check if existing file is a link.
if ((orig_st.st_mode & S_IFMT) == S_IFLNK) {
// File is a symlink.
errno = ELOOP;
@@ -325,9 +328,9 @@
}
if (use_mode == true) {
- fd = open(path, oflag, mode);
+ RESTARTABLE(::open(path, oflag, mode), fd);
} else {
- fd = open(path, oflag);
+ RESTARTABLE(::open(path, oflag), fd);
}
if (fd == OS_ERR) {
@@ -336,7 +339,8 @@
// Can't do inode checks on before/after if we created the file.
if (create == false) {
- if (fstat(fd, &new_st) != 0) {
+ RESTARTABLE(::fstat(fd, &new_st), result);
+ if (result == OS_ERR) {
// Keep errno from fstat, in case close also fails.
error = errno;
::close(fd);
@@ -384,7 +388,7 @@
RESTARTABLE(::open(dirname, O_RDONLY|O_NOFOLLOW), result);
#else
// workaround (jdk6 coding)
- RESTARTABLE(::open_o_nofollow(dirname, O_RDONLY), result);
+ result = open_o_nofollow(dirname, O_RDONLY);
#endif
if (result == OS_ERR) {
@@ -888,7 +892,7 @@
RESTARTABLE(::open(filename, O_RDWR|O_CREAT|O_NOFOLLOW, S_IREAD|S_IWRITE), result);
#else
// workaround function (jdk6 code)
- RESTARTABLE(::open_o_nofollow(filename, O_RDWR|O_CREAT, S_IREAD|S_IWRITE), result);
+ result = open_o_nofollow(filename, O_RDWR|O_CREAT, S_IREAD|S_IWRITE);
#endif
if (result == OS_ERR) {
@@ -931,7 +935,7 @@
if (PrintMiscellaneous && Verbose) {
warning("could not set shared memory file size: %s\n", strerror(errno));
}
- RESTARTABLE(::close(fd), result);
+ ::close(fd);
return -1;
}
@@ -951,7 +955,7 @@
#ifdef O_NOFOLLOW
RESTARTABLE(::open(filename, oflags), result);
#else
- RESTARTABLE(::open_o_nofollow(filename, oflags), result);
+ open_o_nofollow(filename, oflags);
#endif
if (result == OS_ERR) {
@@ -1006,8 +1010,7 @@
char* dirname = get_user_tmp_dir(user_name);
char* filename = get_sharedmem_filename(dirname, vmid);
-
- // Get the short filename.
+ // get the short filename.
char* short_filename = strrchr(filename, '/');
if (short_filename == NULL) {
short_filename = filename;
@@ -1033,9 +1036,7 @@
mapAddress = (char*)::mmap((char*)0, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
- // attempt to close the file - restart it if it was interrupted,
- // but ignore other failures
- RESTARTABLE(::close(fd), result);
+ result = ::close(fd);
assert(result != OS_ERR, "could not close file");
if (mapAddress == MAP_FAILED) {
@@ -1142,7 +1143,6 @@
// constructs for the file and the shared memory mapping.
if (mode == PerfMemory::PERF_MODE_RO) {
mmap_prot = PROT_READ;
-
// No O_NOFOLLOW defined at buildtime, and it is not documented for open.
#ifdef O_NOFOLLOW
file_flags = O_RDONLY | O_NOFOLLOW;
@@ -1205,21 +1205,28 @@
FREE_C_HEAP_ARRAY(char, filename);
// open the shared memory file for the give vmid
- fd = open_sharedmem_file(rfilename, file_flags, CHECK);
- assert(fd != OS_ERR, "unexpected value");
+ fd = open_sharedmem_file(rfilename, file_flags, THREAD);
+
+ if (fd == OS_ERR) {
+ return;
+ }
+
+ if (HAS_PENDING_EXCEPTION) {
+ ::close(fd);
+ return;
+ }
if (*sizep == 0) {
size = sharedmem_filesize(fd, CHECK);
- assert(size != 0, "unexpected size");
} else {
size = *sizep;
}
+ assert(size > 0, "unexpected size <= 0");
+
mapAddress = (char*)::mmap((char*)0, size, mmap_prot, MAP_SHARED, fd, 0);
- // attempt to close the file - restart if it gets interrupted,
- // but ignore other failures
- RESTARTABLE(::close(fd), result);
+ result = ::close(fd);
assert(result != OS_ERR, "could not close file");
if (mapAddress == MAP_FAILED) {
@@ -1230,7 +1237,7 @@
"Could not map PerfMemory");
}
- // It does not go through os api, the operation has to record from here.
+ // it does not go through os api, the operation has to record from here.
MemTracker::record_virtual_memory_reserve((address)mapAddress, size, CURRENT_PC, mtInternal);
*addr = mapAddress;
@@ -1238,7 +1245,7 @@
if (PerfTraceMemOps) {
tty->print("mapped " SIZE_FORMAT " bytes for vmid %d at "
- INTPTR_FORMAT "\n", size, vmid, (void*)mapAddress);
+ INTPTR_FORMAT "\n", size, vmid, p2i((void*)mapAddress));
}
}
--- a/hotspot/src/os/posix/vm/os_posix.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/os/posix/vm/os_posix.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1999, 2015, 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
@@ -238,14 +238,12 @@
st->cr();
}
-#ifndef PRODUCT
bool os::get_host_name(char* buf, size_t buflen) {
struct utsname name;
uname(&name);
jio_snprintf(buf, buflen, "%s", name.nodename);
return true;
}
-#endif // PRODUCT
bool os::has_allocatable_memory_limit(julong* limit) {
struct rlimit rlim;
--- a/hotspot/src/os/windows/vm/os_windows.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -1531,12 +1531,10 @@
return result;
}
-#ifndef PRODUCT
bool os::get_host_name(char* buf, size_t buflen) {
DWORD size = (DWORD)buflen;
return (GetComputerNameEx(ComputerNameDnsHostname, buf, &size) == TRUE);
}
-#endif // PRODUCT
void os::get_summary_os_info(char* buf, size_t buflen) {
stringStream sst(buf, buflen);
--- a/hotspot/src/os/windows/vm/perfMemory_windows.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/os/windows/vm/perfMemory_windows.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -628,6 +628,7 @@
if (!is_directory_secure(dirname)) {
// the directory is not secure, don't attempt any cleanup
+ os::closedir(dirp);
return;
}
@@ -1445,6 +1446,8 @@
// check that the file system is secure - i.e. it supports ACLs.
if (!is_filesystem_secure(dirname)) {
+ FREE_C_HEAP_ARRAY(char, dirname);
+ FREE_C_HEAP_ARRAY(char, user);
return NULL;
}
@@ -1624,6 +1627,7 @@
//
if (!is_directory_secure(dirname)) {
FREE_C_HEAP_ARRAY(char, dirname);
+ if (luser != user) FREE_C_HEAP_ARRAY(char, luser);
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(),
"Process not found");
}
--- a/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -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 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -65,6 +65,7 @@
frame os::get_sender_for_C_frame(frame* fr) {
ShouldNotCallThis();
+ return frame(NULL, NULL); // silence compile warning.
}
frame os::current_frame() {
@@ -102,6 +103,7 @@
address os::Linux::ucontext_get_pc(const ucontext_t* uc) {
ShouldNotCallThis();
+ return NULL; // silence compile warnings
}
void os::Linux::ucontext_set_pc(ucontext_t * uc, address pc) {
@@ -112,10 +114,12 @@
intptr_t** ret_sp,
intptr_t** ret_fp) {
ShouldNotCallThis();
+ return NULL; // silence compile warnings
}
frame os::fetch_frame_from_context(const void* ucVoid) {
ShouldNotCallThis();
+ return frame(NULL, NULL); // silence compile warnings
}
extern "C" JNIEXPORT int
@@ -262,11 +266,16 @@
}
#endif // !PRODUCT
- const char *fmt = "caught unhandled signal %d";
char buf[64];
- sprintf(buf, fmt, sig);
+ sprintf(buf, "caught unhandled signal %d", sig);
+
+// Silence -Wformat-security warning for fatal()
+PRAGMA_DIAG_PUSH
+PRAGMA_FORMAT_NONLITERAL_IGNORED
fatal(buf);
+PRAGMA_DIAG_POP
+ return true; // silence compiler warnings
}
void os::Linux::init_thread_fpu_state(void) {
@@ -275,6 +284,7 @@
int os::Linux::get_fpu_control_word() {
ShouldNotCallThis();
+ return -1; // silence compile warnings
}
void os::Linux::set_fpu_control_word(int fpu) {
@@ -419,6 +429,7 @@
extern "C" {
int SpinPause() {
+ return -1; // silence compile warnings
}
--- a/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/os_cpu/linux_zero/vm/thread_linux_zero.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright 2007, 2008, 2009, 2010 Red Hat, Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
@@ -110,6 +110,7 @@
void* ucontext,
bool isInJava) {
ShouldNotCallThis();
+ return false; // silence compile warning
}
// These routines are only used on cpu architectures that
--- a/hotspot/src/share/vm/classfile/stringTable.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/classfile/stringTable.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -200,7 +200,6 @@
return string;
}
-
oop StringTable::intern(Handle string_or_null, jchar* name,
int len, TRAPS) {
oop found_string = lookup_shared(name, len);
@@ -214,7 +213,9 @@
// Found
if (found_string != NULL) {
- ensure_string_alive(found_string);
+ if (found_string != string_or_null()) {
+ ensure_string_alive(found_string);
+ }
return found_string;
}
@@ -249,7 +250,9 @@
hashValue, CHECK_NULL);
}
- ensure_string_alive(added_or_found);
+ if (added_or_found != string()) {
+ ensure_string_alive(added_or_found);
+ }
return added_or_found;
}
--- a/hotspot/src/share/vm/classfile/vmSymbols.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/classfile/vmSymbols.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -123,7 +123,7 @@
template(sun_misc_Launcher_ExtClassLoader, "sun/misc/Launcher$ExtClassLoader") \
\
/* Java runtime version access */ \
- template(sun_misc_Version, "sun/misc/Version") \
+ template(java_lang_VersionProps, "java/lang/VersionProps") \
template(java_runtime_name_name, "java_runtime_name") \
template(java_runtime_version_name, "java_runtime_version") \
\
--- a/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/cms/parNewGeneration.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -39,6 +39,7 @@
#include "gc/shared/genOopClosures.inline.hpp"
#include "gc/shared/generation.hpp"
#include "gc/shared/plab.inline.hpp"
+#include "gc/shared/preservedMarks.inline.hpp"
#include "gc/shared/referencePolicy.hpp"
#include "gc/shared/space.hpp"
#include "gc/shared/spaceDecorator.hpp"
@@ -64,6 +65,7 @@
int thread_num_,
ObjToScanQueueSet* work_queue_set_,
Stack<oop, mtGC>* overflow_stacks_,
+ PreservedMarks* preserved_marks_,
size_t desired_plab_sz_,
ParallelTaskTerminator& term_) :
_to_space(to_space_),
@@ -73,6 +75,7 @@
_work_queue(work_queue_set_->queue(thread_num_)),
_to_space_full(false),
_overflow_stack(overflow_stacks_ ? overflow_stacks_ + thread_num_ : NULL),
+ _preserved_marks(preserved_marks_),
_ageTable(false), // false ==> not the global age table, no perf data.
_to_space_alloc_buffer(desired_plab_sz_),
_to_space_closure(young_gen_, this),
@@ -286,6 +289,7 @@
Generation& old_gen,
ObjToScanQueueSet& queue_set,
Stack<oop, mtGC>* overflow_stacks_,
+ PreservedMarksSet& preserved_marks_set,
size_t desired_plab_sz,
ParallelTaskTerminator& term);
@@ -322,6 +326,7 @@
Generation& old_gen,
ObjToScanQueueSet& queue_set,
Stack<oop, mtGC>* overflow_stacks,
+ PreservedMarksSet& preserved_marks_set,
size_t desired_plab_sz,
ParallelTaskTerminator& term)
: ResourceArray(sizeof(ParScanThreadState), num_threads),
@@ -336,7 +341,8 @@
for (int i = 0; i < num_threads; ++i) {
new ((ParScanThreadState*)_data + i)
ParScanThreadState(&to_space, &young_gen, &old_gen, i, &queue_set,
- overflow_stacks, desired_plab_sz, term);
+ overflow_stacks, preserved_marks_set.get(i),
+ desired_plab_sz, term);
}
}
@@ -905,12 +911,16 @@
// Set the correct parallelism (number of queues) in the reference processor
ref_processor()->set_active_mt_degree(active_workers);
+ // Need to initialize the preserved marks before the ThreadStateSet c'tor.
+ _preserved_marks_set.init(active_workers);
+
// Always set the terminator for the active number of workers
// because only those workers go through the termination protocol.
ParallelTaskTerminator _term(active_workers, task_queues());
ParScanThreadStateSet thread_state_set(active_workers,
*to(), *this, *_old_gen, *task_queues(),
- _overflow_stacks, desired_plab_sz(), _term);
+ _overflow_stacks, _preserved_marks_set,
+ desired_plab_sz(), _term);
thread_state_set.reset(active_workers, promotion_failed());
@@ -993,6 +1003,7 @@
} else {
handle_promotion_failed(gch, thread_state_set);
}
+ _preserved_marks_set.reclaim();
// set new iteration safe limit for the survivor spaces
from()->set_concurrent_iteration_safe_limit(from()->top());
to()->set_concurrent_iteration_safe_limit(to()->top());
@@ -1070,15 +1081,6 @@
return forward_ptr;
}
-void ParNewGeneration::preserve_mark_if_necessary(oop obj, markOop m) {
- if (m->must_be_preserved_for_promotion_failure(obj)) {
- // We should really have separate per-worker stacks, rather
- // than use locking of a common pair of stacks.
- MutexLocker ml(ParGCRareEvent_lock);
- preserve_mark(obj, m);
- }
-}
-
// Multiple GC threads may try to promote an object. If the object
// is successfully promoted, a forwarding pointer will be installed in
// the object in the young generation. This method claims the right
@@ -1136,7 +1138,7 @@
_promotion_failed = true;
new_obj = old;
- preserve_mark_if_necessary(old, m);
+ par_scan_state->preserved_marks()->push_if_necessary(old, m);
par_scan_state->register_promotion_failure(sz);
}
--- a/hotspot/src/share/vm/gc/cms/parNewGeneration.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/cms/parNewGeneration.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -30,6 +30,7 @@
#include "gc/shared/copyFailedInfo.hpp"
#include "gc/shared/gcTrace.hpp"
#include "gc/shared/plab.hpp"
+#include "gc/shared/preservedMarks.hpp"
#include "gc/shared/taskqueue.hpp"
#include "memory/padded.hpp"
@@ -65,6 +66,7 @@
private:
ObjToScanQueue *_work_queue;
Stack<oop, mtGC>* const _overflow_stack;
+ PreservedMarks* const _preserved_marks;
PLAB _to_space_alloc_buffer;
@@ -128,6 +130,7 @@
Generation* old_gen_, int thread_num_,
ObjToScanQueueSet* work_queue_set_,
Stack<oop, mtGC>* overflow_stacks_,
+ PreservedMarks* preserved_marks_,
size_t desired_plab_sz_,
ParallelTaskTerminator& term_);
@@ -136,6 +139,8 @@
ObjToScanQueue* work_queue() { return _work_queue; }
+ PreservedMarks* preserved_marks() const { return _preserved_marks; }
+
PLAB* to_space_alloc_buffer() {
return &_to_space_alloc_buffer;
}
@@ -331,10 +336,6 @@
static oop real_forwardee_slow(oop obj);
static void waste_some_time();
- // Preserve the mark of "obj", if necessary, in preparation for its mark
- // word being overwritten with a self-forwarding-pointer.
- void preserve_mark_if_necessary(oop obj, markOop m);
-
void handle_promotion_failed(GenCollectedHeap* gch, ParScanThreadStateSet& thread_state_set);
protected:
--- a/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/g1/concurrentG1RefineThread.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -89,8 +89,6 @@
void ConcurrentG1RefineThread::activate() {
MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag);
if (!is_primary()) {
- log_debug(gc, refine)("G1-Refine-activated worker %d, on threshold %d, current %d",
- _worker_id, _threshold, JavaThread::dirty_card_queue_set().completed_buffers_num());
set_active(true);
} else {
DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
@@ -102,8 +100,6 @@
void ConcurrentG1RefineThread::deactivate() {
MutexLockerEx x(_monitor, Mutex::_no_safepoint_check_flag);
if (!is_primary()) {
- log_debug(gc, refine)("G1-Refine-deactivated worker %d, off threshold %d, current %d",
- _worker_id, _deactivation_threshold, JavaThread::dirty_card_queue_set().completed_buffers_num());
set_active(false);
} else {
DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
@@ -130,9 +126,12 @@
break;
}
+ DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
+ log_debug(gc, refine)("Activated %d, on threshold: %d, current: %d",
+ _worker_id, _threshold, dcqs.completed_buffers_num());
+
{
SuspendibleThreadSetJoiner sts_join;
- DirtyCardQueueSet& dcqs = JavaThread::dirty_card_queue_set();
do {
int curr_buffer_num = (int)dcqs.completed_buffers_num();
@@ -142,24 +141,19 @@
dcqs.set_completed_queue_padding(0);
}
- if (!is_primary() && curr_buffer_num <= _deactivation_threshold) {
- // If the number of the buffer has fallen below our threshold
- // we should deactivate. The predecessor will reactivate this
- // thread should the number of the buffers cross the threshold again.
- deactivate();
- break;
- }
-
// Check if we need to activate the next thread.
if (_next != NULL && !_next->is_active() && curr_buffer_num > _next->_threshold) {
_next->activate();
}
- } while (dcqs.apply_closure_to_completed_buffer(_refine_closure, _worker_id + _worker_id_offset, cg1r()->green_zone()));
+ } while (dcqs.apply_closure_to_completed_buffer(_refine_closure,
+ _worker_id + _worker_id_offset,
+ _deactivation_threshold,
+ false /* during_pause */));
- // We can exit the loop above while being active if there was a yield request.
- if (is_active()) {
- deactivate();
- }
+ deactivate();
+ log_debug(gc, refine)("Deactivated %d, off threshold: %d, current: %d",
+ _worker_id, _deactivation_threshold,
+ dcqs.completed_buffers_num());
}
if (os::supports_vtime()) {
@@ -169,7 +163,7 @@
}
}
- log_debug(gc, refine)("G1-Refine-stop");
+ log_debug(gc, refine)("Stopping %d", _worker_id);
}
void ConcurrentG1RefineThread::stop() {
--- a/hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/g1/dirtyCardQueue.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -228,37 +228,30 @@
return nd;
}
-bool DirtyCardQueueSet::apply_closure_to_completed_buffer_helper(CardTableEntryClosure* cl,
- uint worker_i,
- BufferNode* nd) {
- if (nd != NULL) {
- void **buf = BufferNode::make_buffer_from_node(nd);
- size_t index = nd->index();
- bool b =
- DirtyCardQueue::apply_closure_to_buffer(cl, buf,
- index, _sz,
- true, worker_i);
- if (b) {
- deallocate_buffer(buf);
- return true; // In normal case, go on to next buffer.
- } else {
- enqueue_complete_buffer(buf, index);
- return false;
- }
- } else {
- return false;
- }
-}
-
bool DirtyCardQueueSet::apply_closure_to_completed_buffer(CardTableEntryClosure* cl,
uint worker_i,
int stop_at,
bool during_pause) {
assert(!during_pause || stop_at == 0, "Should not leave any completed buffers during a pause");
BufferNode* nd = get_completed_buffer(stop_at);
- bool res = apply_closure_to_completed_buffer_helper(cl, worker_i, nd);
- if (res) Atomic::inc(&_processed_buffers_rs_thread);
- return res;
+ if (nd == NULL) {
+ return false;
+ } else {
+ void** buf = BufferNode::make_buffer_from_node(nd);
+ size_t index = nd->index();
+ if (DirtyCardQueue::apply_closure_to_buffer(cl,
+ buf, index, _sz,
+ true, worker_i)) {
+ // Done with fully processed buffer.
+ deallocate_buffer(buf);
+ Atomic::inc(&_processed_buffers_rs_thread);
+ return true;
+ } else {
+ // Return partially processed buffer to the queue.
+ enqueue_complete_buffer(buf, index);
+ return false;
+ }
+ }
}
void DirtyCardQueueSet::apply_closure_to_all_completed_buffers(CardTableEntryClosure* cl) {
--- a/hotspot/src/share/vm/gc/g1/dirtyCardQueue.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/g1/dirtyCardQueue.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -133,14 +133,9 @@
// partially completed buffer (with its processed elements set to NULL)
// is returned to the completed buffer set, and this call returns false.
bool apply_closure_to_completed_buffer(CardTableEntryClosure* cl,
- uint worker_i = 0,
- int stop_at = 0,
- bool during_pause = false);
-
- // Helper routine for the above.
- bool apply_closure_to_completed_buffer_helper(CardTableEntryClosure* cl,
- uint worker_i,
- BufferNode* nd);
+ uint worker_i,
+ int stop_at,
+ bool during_pause);
BufferNode* get_completed_buffer(int stop_at);
--- a/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/g1/g1CollectedHeap.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -2777,12 +2777,6 @@
}
void G1CollectedHeap::print_tracing_info() const {
- // We'll overload this to mean "trace GC pause statistics."
- if (TraceYoungGenTime || TraceOldGenTime) {
- // The "G1CollectorPolicy" is keeping track of these stats, so delegate
- // to that.
- g1_policy()->print_tracing_info();
- }
g1_rem_set()->print_summary_info();
concurrent_mark()->print_summary_info();
g1_policy()->print_yg_surv_rate_info();
@@ -2908,7 +2902,6 @@
bool* succeeded,
GCCause::Cause gc_cause) {
assert_heap_not_locked_and_not_at_safepoint();
- g1_policy()->record_stop_world_start();
VM_G1IncCollectionPause op(gc_count_before,
word_size,
false, /* should_initiate_conc_mark */
@@ -3242,10 +3235,6 @@
GCTraceCPUTime tcpu;
- uint active_workers = AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),
- workers()->active_workers(),
- Threads::number_of_non_daemon_threads());
- workers()->set_active_workers(active_workers);
FormatBuffer<> gc_string("Pause ");
if (collector_state()->during_initial_mark_pause()) {
gc_string.append("Initial Mark");
@@ -3256,6 +3245,11 @@
}
GCTraceTime(Info, gc) tm(gc_string, NULL, gc_cause(), true);
+ uint active_workers = AdaptiveSizePolicy::calc_active_workers(workers()->total_workers(),
+ workers()->active_workers(),
+ Threads::number_of_non_daemon_threads());
+ workers()->set_active_workers(active_workers);
+
g1_policy()->note_gc_start(active_workers);
TraceCollectorStats tcs(g1mm()->incremental_collection_counters());
--- a/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -81,10 +81,8 @@
G1CollectorPolicy::G1CollectorPolicy() :
_predictor(G1ConfidencePercent / 100.0),
- _parallel_gc_threads(ParallelGCThreads),
_recent_gc_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
- _stop_world_start(0.0),
_concurrent_mark_remark_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
_concurrent_mark_cleanup_times_ms(new TruncatedSeq(NumPrevPausesForHeuristics)),
@@ -129,7 +127,6 @@
_inc_cset_head(NULL),
_inc_cset_tail(NULL),
_inc_cset_bytes_used_before(0),
- _inc_cset_max_finger(NULL),
_inc_cset_recorded_rs_lengths(0),
_inc_cset_recorded_rs_lengths_diffs(0),
_inc_cset_predicted_elapsed_time_ms(0.0),
@@ -172,9 +169,9 @@
_prev_collection_pause_end_ms = os::elapsedTime() * 1000.0;
clear_ratio_check_data();
- _phase_times = new G1GCPhaseTimes(_parallel_gc_threads);
+ _phase_times = new G1GCPhaseTimes(ParallelGCThreads);
- int index = MIN2(_parallel_gc_threads - 1, 7);
+ int index = MIN2(ParallelGCThreads - 1, 7u);
_rs_length_diff_seq->add(rs_length_diff_defaults[index]);
_cost_per_card_ms_seq->add(cost_per_card_ms_defaults[index]);
@@ -872,8 +869,6 @@
double full_gc_time_sec = end_sec - _full_collection_start_sec;
double full_gc_time_ms = full_gc_time_sec * 1000.0;
- _trace_old_gen_time_data.record_full_collection(full_gc_time_ms);
-
update_recent_gc_times(end_sec, full_gc_time_ms);
collector_state()->set_full_collection(false);
@@ -904,10 +899,6 @@
record_pause(FullGC, _full_collection_start_sec, end_sec);
}
-void G1CollectorPolicy::record_stop_world_start() {
- _stop_world_start = os::elapsedTime();
-}
-
void G1CollectorPolicy::record_collection_pause_start(double start_time_sec) {
// We only need to do this here as the policy will only be applied
// to the GC we're about to start. so, no point is calculating this
@@ -918,10 +909,6 @@
"sanity, used: " SIZE_FORMAT " recalculate_used: " SIZE_FORMAT,
_g1->used(), _g1->recalculate_used());
- double s_w_t_ms = (start_time_sec - _stop_world_start) * 1000.0;
- _trace_young_gen_time_data.record_start_collection(s_w_t_ms);
- _stop_world_start = 0.0;
-
phase_times()->record_cur_collection_start_sec(start_time_sec);
_pending_cards = _g1->pending_card_num();
@@ -973,13 +960,6 @@
collector_state()->set_in_marking_window(false);
}
-void G1CollectorPolicy::record_concurrent_pause() {
- if (_stop_world_start > 0.0) {
- double yield_ms = (os::elapsedTime() - _stop_world_start) * 1000.0;
- _trace_young_gen_time_data.record_yield_time(yield_ms);
- }
-}
-
double G1CollectorPolicy::average_time_ms(G1GCPhaseTimes::GCParPhases phase) const {
return phase_times()->average_time_ms(phase);
}
@@ -1064,7 +1044,6 @@
}
if (update_stats) {
- _trace_young_gen_time_data.record_end_collection(pause_time_ms, phase_times());
// We maintain the invariant that all objects allocated by mutator
// threads will be allocated out of eden regions. So, we can use
// the eden region number allocated since the previous GC to
@@ -1654,11 +1633,6 @@
return expand_bytes;
}
-void G1CollectorPolicy::print_tracing_info() const {
- _trace_young_gen_time_data.print();
- _trace_old_gen_time_data.print();
-}
-
void G1CollectorPolicy::print_yg_surv_rate_info() const {
#ifndef PRODUCT
_short_lived_surv_rate_group->print_surv_rate_summary();
@@ -1869,7 +1843,6 @@
_inc_cset_tail = NULL;
_inc_cset_bytes_used_before = 0;
- _inc_cset_max_finger = 0;
_inc_cset_recorded_rs_lengths = 0;
_inc_cset_recorded_rs_lengths_diffs = 0;
_inc_cset_predicted_elapsed_time_ms = 0.0;
@@ -1981,9 +1954,6 @@
size_t rs_length = hr->rem_set()->occupied();
add_to_incremental_cset_info(hr, rs_length);
- HeapWord* hr_end = hr->end();
- _inc_cset_max_finger = MAX2(_inc_cset_max_finger, hr_end);
-
assert(!hr->in_collection_set(), "invariant");
_g1->register_young_region_with_cset(hr);
assert(hr->next_in_collection_set() == NULL, "invariant");
@@ -2190,12 +2160,6 @@
collector_state()->set_last_gc_was_young(collector_state()->gcs_are_young());
- if (collector_state()->last_gc_was_young()) {
- _trace_young_gen_time_data.increment_young_collection_count();
- } else {
- _trace_young_gen_time_data.increment_mixed_collection_count();
- }
-
// The young list is laid with the survivor regions from the previous
// pause are appended to the RHS of the young list, i.e.
// [Newly Young Regions ++ Survivors from last pause].
@@ -2335,127 +2299,3 @@
double non_young_end_time_sec = os::elapsedTime();
phase_times()->record_non_young_cset_choice_time_ms((non_young_end_time_sec - non_young_start_time_sec) * 1000.0);
}
-
-void TraceYoungGenTimeData::record_start_collection(double time_to_stop_the_world_ms) {
- if(TraceYoungGenTime) {
- _all_stop_world_times_ms.add(time_to_stop_the_world_ms);
- }
-}
-
-void TraceYoungGenTimeData::record_yield_time(double yield_time_ms) {
- if(TraceYoungGenTime) {
- _all_yield_times_ms.add(yield_time_ms);
- }
-}
-
-void TraceYoungGenTimeData::record_end_collection(double pause_time_ms, G1GCPhaseTimes* phase_times) {
- if(TraceYoungGenTime) {
- _total.add(pause_time_ms);
- _other.add(pause_time_ms - phase_times->accounted_time_ms());
- _root_region_scan_wait.add(phase_times->root_region_scan_wait_time_ms());
- _parallel.add(phase_times->cur_collection_par_time_ms());
- _ext_root_scan.add(phase_times->average_time_ms(G1GCPhaseTimes::ExtRootScan));
- _satb_filtering.add(phase_times->average_time_ms(G1GCPhaseTimes::SATBFiltering));
- _update_rs.add(phase_times->average_time_ms(G1GCPhaseTimes::UpdateRS));
- _scan_rs.add(phase_times->average_time_ms(G1GCPhaseTimes::ScanRS));
- _obj_copy.add(phase_times->average_time_ms(G1GCPhaseTimes::ObjCopy));
- _termination.add(phase_times->average_time_ms(G1GCPhaseTimes::Termination));
-
- double parallel_known_time = phase_times->average_time_ms(G1GCPhaseTimes::ExtRootScan) +
- phase_times->average_time_ms(G1GCPhaseTimes::SATBFiltering) +
- phase_times->average_time_ms(G1GCPhaseTimes::UpdateRS) +
- phase_times->average_time_ms(G1GCPhaseTimes::ScanRS) +
- phase_times->average_time_ms(G1GCPhaseTimes::ObjCopy) +
- phase_times->average_time_ms(G1GCPhaseTimes::Termination);
-
- double parallel_other_time = phase_times->cur_collection_par_time_ms() - parallel_known_time;
- _parallel_other.add(parallel_other_time);
- _clear_ct.add(phase_times->cur_clear_ct_time_ms());
- }
-}
-
-void TraceYoungGenTimeData::increment_young_collection_count() {
- if(TraceYoungGenTime) {
- ++_young_pause_num;
- }
-}
-
-void TraceYoungGenTimeData::increment_mixed_collection_count() {
- if(TraceYoungGenTime) {
- ++_mixed_pause_num;
- }
-}
-
-void TraceYoungGenTimeData::print_summary(const char* str,
- const NumberSeq* seq) const {
- double sum = seq->sum();
- tty->print_cr("%-27s = %8.2lf s (avg = %8.2lf ms)",
- str, sum / 1000.0, seq->avg());
-}
-
-void TraceYoungGenTimeData::print_summary_sd(const char* str,
- const NumberSeq* seq) const {
- print_summary(str, seq);
- tty->print_cr("%45s = %5d, std dev = %8.2lf ms, max = %8.2lf ms)",
- "(num", seq->num(), seq->sd(), seq->maximum());
-}
-
-void TraceYoungGenTimeData::print() const {
- if (!TraceYoungGenTime) {
- return;
- }
-
- tty->print_cr("ALL PAUSES");
- print_summary_sd(" Total", &_total);
- tty->cr();
- tty->cr();
- tty->print_cr(" Young GC Pauses: %8d", _young_pause_num);
- tty->print_cr(" Mixed GC Pauses: %8d", _mixed_pause_num);
- tty->cr();
-
- tty->print_cr("EVACUATION PAUSES");
-
- if (_young_pause_num == 0 && _mixed_pause_num == 0) {
- tty->print_cr("none");
- } else {
- print_summary_sd(" Evacuation Pauses", &_total);
- print_summary(" Root Region Scan Wait", &_root_region_scan_wait);
- print_summary(" Parallel Time", &_parallel);
- print_summary(" Ext Root Scanning", &_ext_root_scan);
- print_summary(" SATB Filtering", &_satb_filtering);
- print_summary(" Update RS", &_update_rs);
- print_summary(" Scan RS", &_scan_rs);
- print_summary(" Object Copy", &_obj_copy);
- print_summary(" Termination", &_termination);
- print_summary(" Parallel Other", &_parallel_other);
- print_summary(" Clear CT", &_clear_ct);
- print_summary(" Other", &_other);
- }
- tty->cr();
-
- tty->print_cr("MISC");
- print_summary_sd(" Stop World", &_all_stop_world_times_ms);
- print_summary_sd(" Yields", &_all_yield_times_ms);
-}
-
-void TraceOldGenTimeData::record_full_collection(double full_gc_time_ms) {
- if (TraceOldGenTime) {
- _all_full_gc_times.add(full_gc_time_ms);
- }
-}
-
-void TraceOldGenTimeData::print() const {
- if (!TraceOldGenTime) {
- return;
- }
-
- if (_all_full_gc_times.num() > 0) {
- tty->print("\n%4d full_gcs: total time = %8.2f s",
- _all_full_gc_times.num(),
- _all_full_gc_times.sum() / 1000.0);
- tty->print_cr(" (avg = %8.2fms).", _all_full_gc_times.avg());
- tty->print_cr(" [std. dev = %8.2f ms, max = %8.2f ms]",
- _all_full_gc_times.sd(),
- _all_full_gc_times.maximum());
- }
-}
--- a/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/g1/g1CollectorPolicy.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -45,52 +45,6 @@
class G1IHOPControl;
class G1YoungGenSizer;
-// TraceYoungGenTime collects data on _both_ young and mixed evacuation pauses
-// (the latter may contain non-young regions - i.e. regions that are
-// technically in old) while TraceOldGenTime collects data about full GCs.
-class TraceYoungGenTimeData : public CHeapObj<mtGC> {
- private:
- unsigned _young_pause_num;
- unsigned _mixed_pause_num;
-
- NumberSeq _all_stop_world_times_ms;
- NumberSeq _all_yield_times_ms;
-
- NumberSeq _total;
- NumberSeq _other;
- NumberSeq _root_region_scan_wait;
- NumberSeq _parallel;
- NumberSeq _ext_root_scan;
- NumberSeq _satb_filtering;
- NumberSeq _update_rs;
- NumberSeq _scan_rs;
- NumberSeq _obj_copy;
- NumberSeq _termination;
- NumberSeq _parallel_other;
- NumberSeq _clear_ct;
-
- void print_summary(const char* str, const NumberSeq* seq) const;
- void print_summary_sd(const char* str, const NumberSeq* seq) const;
-
-public:
- TraceYoungGenTimeData() : _young_pause_num(0), _mixed_pause_num(0) {};
- void record_start_collection(double time_to_stop_the_world_ms);
- void record_yield_time(double yield_time_ms);
- void record_end_collection(double pause_time_ms, G1GCPhaseTimes* phase_times);
- void increment_young_collection_count();
- void increment_mixed_collection_count();
- void print() const;
-};
-
-class TraceOldGenTimeData : public CHeapObj<mtGC> {
- private:
- NumberSeq _all_full_gc_times;
-
- public:
- void record_full_collection(double full_gc_time_ms);
- void print() const;
-};
-
class G1CollectorPolicy: public CollectorPolicy {
private:
G1IHOPControl* _ihop_control;
@@ -107,13 +61,6 @@
double get_new_prediction(TruncatedSeq const* seq) const;
size_t get_new_size_prediction(TruncatedSeq const* seq) const;
- // either equal to the number of parallel threads, if ParallelGCThreads
- // has been set, or 1 otherwise
- int _parallel_gc_threads;
-
- // The number of GC threads currently active.
- uintx _no_of_gc_threads;
-
G1MMUTracker* _mmu_tracker;
void initialize_alignments();
@@ -134,11 +81,6 @@
double _ratio_over_threshold_sum;
uint _pauses_since_start;
- TraceYoungGenTimeData _trace_young_gen_time_data;
- TraceOldGenTimeData _trace_old_gen_time_data;
-
- double _stop_world_start;
-
uint _young_list_target_length;
uint _young_list_fixed_length;
@@ -212,9 +154,6 @@
double update_rs_processed_buffers,
double goal_ms);
- uintx no_of_gc_threads() { return _no_of_gc_threads; }
- void set_no_of_gc_threads(uintx v) { _no_of_gc_threads = v; }
-
double _pause_time_target_ms;
size_t _pending_cards;
@@ -389,9 +328,6 @@
// an evacuation pause.
size_t _inc_cset_bytes_used_before;
- // Used to record the highest end of heap region in collection set
- HeapWord* _inc_cset_max_finger;
-
// The RSet lengths recorded for regions in the CSet. It is updated
// by the thread that adds a new region to the CSet. We assume that
// only one thread can be allocating a new CSet region (currently,
@@ -573,9 +509,6 @@
virtual void print_phases();
- void record_stop_world_start();
- void record_concurrent_pause();
-
// Record how much space we copied during a GC. This is typically
// called when a GC alloc region is being retired.
void record_bytes_copied_during_gc(size_t bytes) {
@@ -685,9 +618,6 @@
// Clear ratio tracking data used by expansion_amount().
void clear_ratio_check_data();
- // Print tracing information.
- void print_tracing_info() const;
-
// Print stats on young survival ratio
void print_yg_surv_rate_info() const;
--- a/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/g1/g1ConcurrentMark.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -2662,9 +2662,6 @@
// We take a break if someone is trying to stop the world.
bool G1ConcurrentMark::do_yield_check(uint worker_id) {
if (SuspendibleThreadSet::should_yield()) {
- if (worker_id == 0) {
- _g1h->g1_policy()->record_concurrent_pause();
- }
SuspendibleThreadSet::yield();
return true;
} else {
--- a/hotspot/src/share/vm/gc/g1/g1EvacFailure.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/g1/g1EvacFailure.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -27,25 +27,12 @@
#include "gc/g1/g1OopClosures.hpp"
#include "gc/g1/heapRegionManager.hpp"
+ #include "gc/shared/preservedMarks.hpp"
#include "gc/shared/workgroup.hpp"
#include "utilities/globalDefinitions.hpp"
class G1CollectedHeap;
-class OopAndMarkOop {
- oop _o;
- markOop _m;
- public:
- OopAndMarkOop(oop obj, markOop m) : _o(obj), _m(m) {
- }
-
- void set_mark() {
- _o->set_mark(_m);
- }
-};
-
-typedef Stack<OopAndMarkOop,mtGC> OopAndMarkOopStack;
-
// Task to fixup self-forwarding pointers
// installed as a result of an evacuation failure.
class G1ParRemoveSelfForwardPtrsTask: public AbstractGangTask {
--- a/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/serial/defNewGeneration.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -36,6 +36,7 @@
#include "gc/shared/genCollectedHeap.hpp"
#include "gc/shared/genOopClosures.inline.hpp"
#include "gc/shared/generationSpec.hpp"
+#include "gc/shared/preservedMarks.inline.hpp"
#include "gc/shared/referencePolicy.hpp"
#include "gc/shared/space.inline.hpp"
#include "gc/shared/spaceDecorator.hpp"
@@ -184,6 +185,7 @@
size_t initial_size,
const char* policy)
: Generation(rs, initial_size),
+ _preserved_marks_set(false /* in_c_heap */),
_promo_failure_drain_in_progress(false),
_should_allocate_from_space(false)
{
@@ -602,6 +604,8 @@
age_table()->clear();
to()->clear(SpaceDecorator::Mangle);
+ // The preserved marks should be empty at the start of the GC.
+ _preserved_marks_set.init(1);
gch->rem_set()->prepare_for_younger_refs_iterate(false);
@@ -704,6 +708,8 @@
// Reset the PromotionFailureALot counters.
NOT_PRODUCT(gch->reset_promotion_should_fail();)
}
+ // We should have processed and cleared all the preserved marks.
+ _preserved_marks_set.reclaim();
// set new iteration safe limit for the survivor spaces
from()->set_concurrent_iteration_safe_limit(from()->top());
to()->set_concurrent_iteration_safe_limit(to()->top());
@@ -721,13 +727,6 @@
gc_tracer.report_gc_end(_gc_timer->gc_end(), _gc_timer->time_partitions());
}
-class RemoveForwardPointerClosure: public ObjectClosure {
-public:
- void do_object(oop obj) {
- obj->init_mark();
- }
-};
-
void DefNewGeneration::init_assuming_no_promotion_failure() {
_promotion_failed = false;
_promotion_failed_info.reset();
@@ -735,33 +734,12 @@
}
void DefNewGeneration::remove_forwarding_pointers() {
- RemoveForwardPointerClosure rspc;
+ RemoveForwardedPointerClosure rspc;
eden()->object_iterate(&rspc);
from()->object_iterate(&rspc);
// Now restore saved marks, if any.
- assert(_objs_with_preserved_marks.size() == _preserved_marks_of_objs.size(),
- "should be the same");
- while (!_objs_with_preserved_marks.is_empty()) {
- oop obj = _objs_with_preserved_marks.pop();
- markOop m = _preserved_marks_of_objs.pop();
- obj->set_mark(m);
- }
- _objs_with_preserved_marks.clear(true);
- _preserved_marks_of_objs.clear(true);
-}
-
-void DefNewGeneration::preserve_mark(oop obj, markOop m) {
- assert(_promotion_failed && m->must_be_preserved_for_promotion_failure(obj),
- "Oversaving!");
- _objs_with_preserved_marks.push(obj);
- _preserved_marks_of_objs.push(m);
-}
-
-void DefNewGeneration::preserve_mark_if_necessary(oop obj, markOop m) {
- if (m->must_be_preserved_for_promotion_failure(obj)) {
- preserve_mark(obj, m);
- }
+ _preserved_marks_set.restore();
}
void DefNewGeneration::handle_promotion_failure(oop old) {
@@ -769,7 +747,7 @@
_promotion_failed = true;
_promotion_failed_info.register_copy_failure(old->size());
- preserve_mark_if_necessary(old, old->mark());
+ _preserved_marks_set.get()->push_if_necessary(old, old->mark());
// forward to self
old->forward_to(old);
--- a/hotspot/src/share/vm/gc/serial/defNewGeneration.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/serial/defNewGeneration.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -30,6 +30,7 @@
#include "gc/shared/copyFailedInfo.hpp"
#include "gc/shared/generation.hpp"
#include "gc/shared/generationCounters.hpp"
+#include "gc/shared/preservedMarks.hpp"
#include "utilities/stack.hpp"
class ContiguousSpace;
@@ -87,15 +88,8 @@
// therefore we must remove their forwarding pointers.
void remove_forwarding_pointers();
- // Preserve the mark of "obj", if necessary, in preparation for its mark
- // word being overwritten with a self-forwarding-pointer.
- void preserve_mark_if_necessary(oop obj, markOop m);
- void preserve_mark(oop obj, markOop m); // work routine used by the above
-
- // Together, these keep <object with a preserved mark, mark value> pairs.
- // They should always contain the same number of elements.
- Stack<oop, mtGC> _objs_with_preserved_marks;
- Stack<markOop, mtGC> _preserved_marks_of_objs;
+ // Preserved marks
+ PreservedMarksSet _preserved_marks_set;
// Promotion failure handling
ExtendedOopClosure *_promo_failure_scan_stack_closure;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/gc/shared/preservedMarks.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -0,0 +1,93 @@
+/*
+ * 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 "gc/shared/preservedMarks.inline.hpp"
+#include "memory/allocation.inline.hpp"
+#include "oops/oop.inline.hpp"
+
+void PreservedMarks::restore() {
+ // First, iterate over the stack and restore all marks.
+ StackIterator<OopAndMarkOop, mtGC> iter(_stack);
+ while (!iter.is_empty()) {
+ OopAndMarkOop elem = iter.next();
+ elem.set_mark();
+ }
+
+ // Second, reclaim all the stack memory
+ _stack.clear(true /* clear_cache */);
+}
+
+void RemoveForwardedPointerClosure::do_object(oop obj) {
+ if (obj->is_forwarded()) {
+ obj->init_mark();
+ }
+}
+
+void PreservedMarksSet::init(uint num) {
+ assert(_stacks == NULL && _num == 0, "do not re-initialize");
+ assert(num > 0, "pre-condition");
+ if (_in_c_heap) {
+ _stacks = NEW_C_HEAP_ARRAY(Padded<PreservedMarks>, num, mtGC);
+ } else {
+ _stacks = NEW_RESOURCE_ARRAY(Padded<PreservedMarks>, num);
+ }
+ for (uint i = 0; i < num; i += 1) {
+ ::new (_stacks + i) PreservedMarks();
+ }
+ _num = num;
+
+ assert_empty();
+}
+
+void PreservedMarksSet::restore() {
+ for (uint i = 0; i < _num; i += 1) {
+ get(i)->restore();
+ }
+}
+
+void PreservedMarksSet::reclaim() {
+ assert_empty();
+
+ for (uint i = 0; i < _num; i += 1) {
+ _stacks[i].~Padded<PreservedMarks>();
+ }
+
+ if (_in_c_heap) {
+ FREE_C_HEAP_ARRAY(Padded<PreservedMarks>, _stacks);
+ } else {
+ // the array was resource-allocated, so nothing to do
+ }
+ _stacks = NULL;
+ _num = 0;
+}
+
+#ifndef PRODUCT
+void PreservedMarksSet::assert_empty() {
+ assert(_stacks != NULL && _num > 0, "should have been initialized");
+ for (uint i = 0; i < _num; i += 1) {
+ assert(get(i)->is_empty(), "stack should be empty");
+ }
+}
+#endif // ndef PRODUCT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/gc/shared/preservedMarks.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -0,0 +1,111 @@
+/*
+ * 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.
+ *
+ */
+
+#ifndef SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP
+#define SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP
+
+#include "memory/allocation.hpp"
+#include "memory/padded.hpp"
+#include "oops/oop.hpp"
+#include "utilities/stack.hpp"
+
+class OopAndMarkOop {
+private:
+ oop _o;
+ markOop _m;
+
+public:
+ OopAndMarkOop(oop obj, markOop m) : _o(obj), _m(m) { }
+
+ void set_mark() const {
+ _o->set_mark(_m);
+ }
+};
+typedef Stack<OopAndMarkOop, mtGC> OopAndMarkOopStack;
+
+class PreservedMarks VALUE_OBJ_CLASS_SPEC {
+private:
+ OopAndMarkOopStack _stack;
+
+ inline bool should_preserve_mark(oop obj, markOop m) const;
+ inline void push(oop obj, markOop m);
+
+public:
+ bool is_empty() const { return _stack.is_empty(); }
+ inline void push_if_necessary(oop obj, markOop m);
+ // Iterate over the stack, restore the preserved marks, then reclaim
+ // the memory taken up by stack chunks.
+ void restore();
+ ~PreservedMarks() { assert(is_empty(), "should have been cleared"); }
+};
+
+class RemoveForwardedPointerClosure: public ObjectClosure {
+public:
+ virtual void do_object(oop obj);
+};
+
+class PreservedMarksSet VALUE_OBJ_CLASS_SPEC {
+private:
+ // true -> _stacks will be allocated in the C heap
+ // false -> _stacks will be allocated in the resource arena
+ const bool _in_c_heap;
+
+ // Number of stacks we have allocated (typically, one stack per GC worker).
+ // This should be >= 1 if the stacks have been initialized,
+ // or == 0 if they have not.
+ uint _num;
+
+ // Stack array (typically, one stack per GC worker) of length _num.
+ // This should be != NULL if the stacks have been initialized,
+ // or == NULL if they have not.
+ Padded<PreservedMarks>* _stacks;
+
+public:
+ // Return the i'th stack.
+ PreservedMarks* get(uint i = 0) const {
+ assert(_num > 0 && _stacks != NULL, "stacks should have been initialized");
+ assert(i < _num, "pre-condition");
+ return (_stacks + i);
+ }
+
+ // Allocate stack array.
+ void init(uint num);
+ // Iterate over all stacks, restore all preserved marks, then
+ // reclaim the memory taken up by stack chunks.
+ void restore();
+ // Reclaim stack array.
+ void reclaim();
+
+ // Assert all the stacks are empty.
+ void assert_empty() PRODUCT_RETURN;
+
+ PreservedMarksSet(bool in_c_heap)
+ : _in_c_heap(in_c_heap), _num(0), _stacks(NULL) { }
+
+ ~PreservedMarksSet() {
+ assert(_stacks == NULL && _num == 0, "stacks should have been reclaimed");
+ }
+};
+
+#endif // SHARE_VM_GC_SHARED_PRESERVEDMARKS_HPP
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/gc/shared/preservedMarks.inline.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -0,0 +1,48 @@
+/*
+ * 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 "gc/shared/preservedMarks.hpp"
+#include "oops/markOop.inline.hpp"
+#include "utilities/stack.inline.hpp"
+
+#ifndef SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
+#define SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
+
+inline bool PreservedMarks::should_preserve_mark(oop obj, markOop m) const {
+ return m->must_be_preserved_for_promotion_failure(obj);
+}
+
+inline void PreservedMarks::push(oop obj, markOop m) {
+ assert(should_preserve_mark(obj, m), "pre-condition");
+ OopAndMarkOop elem(obj, m);
+ _stack.push(elem);
+}
+
+inline void PreservedMarks::push_if_necessary(oop obj, markOop m) {
+ if (should_preserve_mark(obj, m)) {
+ push(obj, m);
+ }
+}
+
+#endif // SHARE_VM_GC_SHARED_PRESERVEDMARKS_INLINE_HPP
--- a/hotspot/src/share/vm/gc/shared/referenceProcessor.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/shared/referenceProcessor.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -339,7 +339,7 @@
// all linked Reference objects. Note that it is important to not dirty any
// cards during reference processing since this will cause card table
// verification to fail for G1.
- log_develop_trace(gc, ref)("ReferenceProcessor::enqueue_discovered_reflist list " INTPTR_FORMAT, p2i(refs_list.head()));
+ log_develop_trace(gc, ref)("ReferenceProcessor::enqueue_discovered_reflist list " INTPTR_FORMAT, p2i(&refs_list));
oop obj = NULL;
oop next_d = refs_list.head();
@@ -502,7 +502,7 @@
// Close the reachable set
complete_gc->do_void();
log_develop_trace(gc, ref)(" Dropped " SIZE_FORMAT " dead Refs out of " SIZE_FORMAT " discovered Refs by policy, from list " INTPTR_FORMAT,
- iter.removed(), iter.processed(), p2i(refs_list.head()));
+ iter.removed(), iter.processed(), p2i(&refs_list));
}
// Traverse the list and remove any Refs that are not active, or
@@ -536,7 +536,7 @@
if (iter.processed() > 0) {
log_develop_trace(gc, ref)(" Dropped " SIZE_FORMAT " active Refs out of " SIZE_FORMAT
" Refs in discovered list " INTPTR_FORMAT,
- iter.removed(), iter.processed(), p2i(refs_list.head()));
+ iter.removed(), iter.processed(), p2i(&refs_list));
}
)
}
@@ -575,7 +575,7 @@
if (iter.processed() > 0) {
log_develop_trace(gc, ref)(" Dropped " SIZE_FORMAT " active Refs out of " SIZE_FORMAT
" Refs in discovered list " INTPTR_FORMAT,
- iter.removed(), iter.processed(), p2i(refs_list.head()));
+ iter.removed(), iter.processed(), p2i(&refs_list));
}
)
}
@@ -1198,7 +1198,7 @@
NOT_PRODUCT(
if (iter.processed() > 0) {
log_develop_trace(gc, ref)(" Dropped " SIZE_FORMAT " Refs out of " SIZE_FORMAT " Refs in discovered list " INTPTR_FORMAT,
- iter.removed(), iter.processed(), p2i(refs_list.head()));
+ iter.removed(), iter.processed(), p2i(&refs_list));
}
)
}
--- a/hotspot/src/share/vm/gc/shared/workgroup.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/gc/shared/workgroup.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -29,6 +29,7 @@
#include "runtime/globals.hpp"
#include "runtime/thread.hpp"
#include "gc/shared/gcId.hpp"
+#include "logging/log.hpp"
#include "utilities/debug.hpp"
#include "utilities/globalDefinitions.hpp"
@@ -151,6 +152,7 @@
_active_workers = MAX2(1U, _active_workers);
assert(UseDynamicNumberOfGCThreads || _active_workers == _total_workers,
"Unless dynamic should use total workers");
+ log_info(gc, task)("GC Workers: %d", _active_workers);
}
// Return the Ith worker.
--- a/hotspot/src/share/vm/interpreter/cppInterpreter.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/interpreter/cppInterpreter.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -27,6 +27,7 @@
#include "interpreter/cppInterpreterGenerator.hpp"
#include "interpreter/interpreter.hpp"
#include "interpreter/interpreterRuntime.hpp"
+#include "runtime/logTimer.hpp"
#ifdef CC_INTERP
@@ -42,7 +43,7 @@
// generate interpreter
{ ResourceMark rm;
- TraceTime timer("Interpreter generation", TraceStartupTime);
+ TraceStartupTime timer("Interpreter generation");
int code_size = InterpreterCodeSize;
NOT_PRODUCT(code_size *= 4;) // debug uses extra interpreter code space
_code = new StubQueue(new InterpreterCodeletInterface, code_size, NULL,
--- a/hotspot/src/share/vm/interpreter/templateInterpreter.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/interpreter/templateInterpreter.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -31,6 +31,7 @@
#include "interpreter/templateInterpreterGenerator.hpp"
#include "interpreter/templateTable.hpp"
#include "memory/resourceArea.hpp"
+#include "runtime/logTimer.hpp"
#ifndef CC_INTERP
@@ -48,7 +49,7 @@
// generate interpreter
{ ResourceMark rm;
- TraceTime timer("Interpreter generation", TraceStartupTime);
+ TraceStartupTime timer("Interpreter generation");
int code_size = InterpreterCodeSize;
NOT_PRODUCT(code_size *= 4;) // debug uses extra interpreter code space
#if INCLUDE_JVMTI
--- a/hotspot/src/share/vm/interpreter/templateTable.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/interpreter/templateTable.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -26,8 +26,7 @@
#include "gc/shared/collectedHeap.hpp"
#include "interpreter/interp_masm.hpp"
#include "interpreter/templateTable.hpp"
-#include "runtime/timer.hpp"
-
+#include "runtime/logTimer.hpp"
#ifdef CC_INTERP
@@ -246,7 +245,7 @@
if (_is_initialized) return;
// Initialize table
- TraceTime timer("TemplateTable initialization", TraceStartupTime);
+ TraceStartupTime timer("TemplateTable initialization");
_bs = Universe::heap()->barrier_set();
--- a/hotspot/src/share/vm/logging/logConfiguration.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/logging/logConfiguration.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -82,8 +82,7 @@
void LogConfiguration::initialize(jlong vm_start_time) {
LogFileOutput::set_file_name_parameters(vm_start_time);
- LogDecorations::set_vm_start_time_millis(vm_start_time);
-
+ LogDecorations::initialize(vm_start_time);
assert(_outputs == NULL, "Should not initialize _outputs before this function, initialize called twice?");
_outputs = NEW_C_HEAP_ARRAY(LogOutput*, 2, mtLogging);
_outputs[0] = LogOutput::Stdout;
--- a/hotspot/src/share/vm/logging/logDecorations.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/logging/logDecorations.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -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,12 +29,21 @@
#include "services/management.hpp"
jlong LogDecorations::_vm_start_time_millis = 0;
+const char* LogDecorations::_host_name = "";
LogDecorations::LogDecorations(LogLevelType level, const LogTagSet &tagset, const LogDecorators &decorators)
: _level(level), _tagset(tagset), _millis(-1) {
create_decorations(decorators);
}
+void LogDecorations::initialize(jlong vm_start_time) {
+ char buffer[1024];
+ if (os::get_host_name(buffer, sizeof(buffer))){
+ _host_name = os::strdup_check_oom(buffer);
+ }
+ _vm_start_time_millis = vm_start_time;
+}
+
void LogDecorations::create_decorations(const LogDecorators &decorators) {
char* position = _decorations_buffer;
#define DECORATOR(full_name, abbr) \
@@ -109,3 +118,9 @@
int written = _tagset.label(pos, DecorationsBufferSize - (pos - _decorations_buffer));
ASSERT_AND_RETURN(written, pos)
}
+
+char* LogDecorations::create_hostname_decoration(char* pos) {
+ int written = jio_snprintf(pos, DecorationsBufferSize - (pos - _decorations_buffer), "%s", _host_name);
+ ASSERT_AND_RETURN(written, pos)
+}
+
--- a/hotspot/src/share/vm/logging/logDecorations.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/logging/logDecorations.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -39,6 +39,7 @@
LogTagSet _tagset;
jlong _millis;
static jlong _vm_start_time_millis;
+ static const char* _host_name;
jlong java_millis();
void create_decorations(const LogDecorators& decorators);
@@ -48,15 +49,13 @@
#undef DECORATOR
public:
+ static void initialize(jlong vm_start_time);
+
LogDecorations(LogLevelType level, const LogTagSet& tagset, const LogDecorators& decorators);
const char* decoration(LogDecorators::Decorator decorator) const {
return _decoration_offset[decorator];
}
-
- static void set_vm_start_time_millis(jlong start_time) {
- _vm_start_time_millis = start_time;
- }
};
#endif // SHARE_VM_LOGGING_LOGDECORATIONS_HPP
--- a/hotspot/src/share/vm/logging/logDecorators.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/logging/logDecorators.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -34,6 +34,7 @@
// uptimemillis - Milliseconds since the JVM started
// timenanos - The same value as generated by System.nanoTime()
// uptimenanos - Nanoseconds since the JVM started
+// hostname - The hostname
// pid - The process identifier
// tid - The thread identifier
// level - The level associated with the log message
@@ -45,6 +46,7 @@
DECORATOR(uptimemillis, um) \
DECORATOR(timenanos, tn) \
DECORATOR(uptimenanos, un) \
+ DECORATOR(hostname, hn) \
DECORATOR(pid, p) \
DECORATOR(tid, ti) \
DECORATOR(level, l) \
--- a/hotspot/src/share/vm/logging/logTag.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/logging/logTag.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -34,6 +34,7 @@
LOG_TAG(alloc) \
LOG_TAG(age) \
LOG_TAG(barrier) \
+ LOG_TAG(biasedlocking) \
LOG_TAG(bot) \
LOG_TAG(census) \
LOG_TAG(classhisto) \
@@ -73,6 +74,7 @@
LOG_TAG(scavenge) \
LOG_TAG(scrub) \
LOG_TAG(start) \
+ LOG_TAG(startuptime) \
LOG_TAG(state) \
LOG_TAG(stats) \
LOG_TAG(stringdedup) \
--- a/hotspot/src/share/vm/memory/metaspace.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/memory/metaspace.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -791,7 +791,6 @@
void VirtualSpaceNode::inc_container_count() {
assert_lock_strong(SpaceManager::expand_lock());
_container_count++;
- DEBUG_ONLY(verify_container_count();)
}
void VirtualSpaceNode::dec_container_count() {
@@ -1073,6 +1072,7 @@
VirtualSpaceNode* next_vsl = prev_vsl;
while (next_vsl != NULL) {
VirtualSpaceNode* vsl = next_vsl;
+ DEBUG_ONLY(vsl->verify_container_count();)
next_vsl = vsl->next();
// Don't free the current virtual space since it will likely
// be needed soon.
@@ -1137,19 +1137,19 @@
}
void VirtualSpaceNode::retire(ChunkManager* chunk_manager) {
+ DEBUG_ONLY(verify_container_count();)
for (int i = (int)MediumIndex; i >= (int)ZeroIndex; --i) {
ChunkIndex index = (ChunkIndex)i;
size_t chunk_size = chunk_manager->free_chunks(index)->size();
while (free_words_in_vs() >= chunk_size) {
- DEBUG_ONLY(verify_container_count();)
Metachunk* chunk = get_chunk_vs(chunk_size);
assert(chunk != NULL, "allocation should have been successful");
chunk_manager->return_chunks(index, chunk);
chunk_manager->inc_free_chunks_total(chunk_size);
- DEBUG_ONLY(verify_container_count();)
}
+ DEBUG_ONLY(verify_container_count();)
}
assert(free_words_in_vs() == 0, "should be empty now");
}
--- a/hotspot/src/share/vm/memory/metaspaceShared.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/memory/metaspaceShared.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -40,6 +40,7 @@
#include "memory/metaspaceShared.hpp"
#include "oops/objArrayOop.hpp"
#include "oops/oop.inline.hpp"
+#include "runtime/logTimer.hpp"
#include "runtime/os.hpp"
#include "runtime/signature.hpp"
#include "runtime/vmThread.hpp"
@@ -771,88 +772,89 @@
// Preload classes from a list, populate the shared spaces and dump to a
// file.
void MetaspaceShared::preload_and_dump(TRAPS) {
- TraceTime timer("Dump Shared Spaces", TraceStartupTime);
- ResourceMark rm;
- char class_list_path_str[JVM_MAXPATHLEN];
+ { TraceStartupTime timer("Dump Shared Spaces");
+ ResourceMark rm;
+ char class_list_path_str[JVM_MAXPATHLEN];
- tty->print_cr("Allocated shared space: " SIZE_FORMAT " bytes at " PTR_FORMAT,
- MetaspaceShared::shared_rs()->size(),
- p2i(MetaspaceShared::shared_rs()->base()));
+ tty->print_cr("Allocated shared space: " SIZE_FORMAT " bytes at " PTR_FORMAT,
+ MetaspaceShared::shared_rs()->size(),
+ p2i(MetaspaceShared::shared_rs()->base()));
- // Preload classes to be shared.
- // Should use some os:: method rather than fopen() here. aB.
- const char* class_list_path;
- if (SharedClassListFile == NULL) {
- // Construct the path to the class list (in jre/lib)
- // Walk up two directories from the location of the VM and
- // optionally tack on "lib" (depending on platform)
- os::jvm_path(class_list_path_str, sizeof(class_list_path_str));
- for (int i = 0; i < 3; i++) {
- char *end = strrchr(class_list_path_str, *os::file_separator());
- if (end != NULL) *end = '\0';
- }
- int class_list_path_len = (int)strlen(class_list_path_str);
- if (class_list_path_len >= 3) {
- if (strcmp(class_list_path_str + class_list_path_len - 3, "lib") != 0) {
- if (class_list_path_len < JVM_MAXPATHLEN - 4) {
- jio_snprintf(class_list_path_str + class_list_path_len,
- sizeof(class_list_path_str) - class_list_path_len,
- "%slib", os::file_separator());
- class_list_path_len += 4;
+ // Preload classes to be shared.
+ // Should use some os:: method rather than fopen() here. aB.
+ const char* class_list_path;
+ if (SharedClassListFile == NULL) {
+ // Construct the path to the class list (in jre/lib)
+ // Walk up two directories from the location of the VM and
+ // optionally tack on "lib" (depending on platform)
+ os::jvm_path(class_list_path_str, sizeof(class_list_path_str));
+ for (int i = 0; i < 3; i++) {
+ char *end = strrchr(class_list_path_str, *os::file_separator());
+ if (end != NULL) *end = '\0';
+ }
+ int class_list_path_len = (int)strlen(class_list_path_str);
+ if (class_list_path_len >= 3) {
+ if (strcmp(class_list_path_str + class_list_path_len - 3, "lib") != 0) {
+ if (class_list_path_len < JVM_MAXPATHLEN - 4) {
+ jio_snprintf(class_list_path_str + class_list_path_len,
+ sizeof(class_list_path_str) - class_list_path_len,
+ "%slib", os::file_separator());
+ class_list_path_len += 4;
+ }
}
}
+ if (class_list_path_len < JVM_MAXPATHLEN - 10) {
+ jio_snprintf(class_list_path_str + class_list_path_len,
+ sizeof(class_list_path_str) - class_list_path_len,
+ "%sclasslist", os::file_separator());
+ }
+ class_list_path = class_list_path_str;
+ } else {
+ class_list_path = SharedClassListFile;
}
- if (class_list_path_len < JVM_MAXPATHLEN - 10) {
- jio_snprintf(class_list_path_str + class_list_path_len,
- sizeof(class_list_path_str) - class_list_path_len,
- "%sclasslist", os::file_separator());
- }
- class_list_path = class_list_path_str;
- } else {
- class_list_path = SharedClassListFile;
- }
+
+ int class_count = 0;
+ GrowableArray<Klass*>* class_promote_order = new GrowableArray<Klass*>();
- int class_count = 0;
- GrowableArray<Klass*>* class_promote_order = new GrowableArray<Klass*>();
+ // sun.io.Converters
+ static const char obj_array_sig[] = "[[Ljava/lang/Object;";
+ SymbolTable::new_permanent_symbol(obj_array_sig, THREAD);
- // sun.io.Converters
- static const char obj_array_sig[] = "[[Ljava/lang/Object;";
- SymbolTable::new_permanent_symbol(obj_array_sig, THREAD);
+ // java.util.HashMap
+ static const char map_entry_array_sig[] = "[Ljava/util/Map$Entry;";
+ SymbolTable::new_permanent_symbol(map_entry_array_sig, THREAD);
- // java.util.HashMap
- static const char map_entry_array_sig[] = "[Ljava/util/Map$Entry;";
- SymbolTable::new_permanent_symbol(map_entry_array_sig, THREAD);
+ // Need to allocate the op here:
+ // op.misc_data_space_alloc() will be called during preload_and_dump().
+ ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
+ VM_PopulateDumpSharedSpace op(loader_data, class_promote_order);
- // Need to allocate the op here:
- // op.misc_data_space_alloc() will be called during preload_and_dump().
- ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data();
- VM_PopulateDumpSharedSpace op(loader_data, class_promote_order);
-
- tty->print_cr("Loading classes to share ...");
- _has_error_classes = false;
- class_count += preload_and_dump(class_list_path, class_promote_order,
- THREAD);
- if (ExtraSharedClassListFile) {
- class_count += preload_and_dump(ExtraSharedClassListFile, class_promote_order,
+ tty->print_cr("Loading classes to share ...");
+ _has_error_classes = false;
+ class_count += preload_and_dump(class_list_path, class_promote_order,
THREAD);
- }
- tty->print_cr("Loading classes to share: done.");
+ if (ExtraSharedClassListFile) {
+ class_count += preload_and_dump(ExtraSharedClassListFile, class_promote_order,
+ THREAD);
+ }
+ tty->print_cr("Loading classes to share: done.");
- if (PrintSharedSpaces) {
- tty->print_cr("Shared spaces: preloaded %d classes", class_count);
- }
+ if (PrintSharedSpaces) {
+ tty->print_cr("Shared spaces: preloaded %d classes", class_count);
+ }
- // Rewrite and link classes
- tty->print_cr("Rewriting and linking classes ...");
+ // Rewrite and link classes
+ tty->print_cr("Rewriting and linking classes ...");
- // Link any classes which got missed. This would happen if we have loaded classes that
- // were not explicitly specified in the classlist. E.g., if an interface implemented by class K
- // fails verification, all other interfaces that were not specified in the classlist but
- // are implemented by K are not verified.
- link_and_cleanup_shared_classes(CATCH);
- tty->print_cr("Rewriting and linking classes: done");
+ // Link any classes which got missed. This would happen if we have loaded classes that
+ // were not explicitly specified in the classlist. E.g., if an interface implemented by class K
+ // fails verification, all other interfaces that were not specified in the classlist but
+ // are implemented by K are not verified.
+ link_and_cleanup_shared_classes(CATCH);
+ tty->print_cr("Rewriting and linking classes: done");
- VMThread::execute(&op);
+ VMThread::execute(&op);
+ }
// Since various initialization steps have been undone by this process,
// it is not reasonable to continue running a java process.
exit(0);
--- a/hotspot/src/share/vm/memory/universe.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/memory/universe.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -64,6 +64,7 @@
#include "runtime/init.hpp"
#include "runtime/java.hpp"
#include "runtime/javaCalls.hpp"
+#include "runtime/logTimer.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/synchronizer.hpp"
#include "runtime/thread.inline.hpp"
@@ -626,7 +627,9 @@
guarantee(sizeof(oop) >= sizeof(HeapWord), "HeapWord larger than oop?");
guarantee(sizeof(oop) % sizeof(HeapWord) == 0,
"oop size is not not a multiple of HeapWord size");
- TraceTime timer("Genesis", TraceStartupTime);
+
+ TraceStartupTime timer("Genesis");
+
JavaClasses::compute_hard_coded_offsets();
jint status = Universe::initialize_heap();
--- a/hotspot/src/share/vm/prims/jni.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/prims/jni.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -930,13 +930,7 @@
_arguments->push_oop(Handle((oop *)l, false)); }
inline void set_ap(va_list rap) {
-#ifdef va_copy
va_copy(_ap, rap);
-#elif defined (__va_copy)
- __va_copy(_ap, rap);
-#else
- _ap = rap;
-#endif
}
public:
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -2200,6 +2200,16 @@
}
jint JvmtiExport::load_agent_library(AttachOperation* op, outputStream* st) {
+ // get agent name and options
+ const char* agent = op->arg(0);
+ const char* absParam = op->arg(1);
+ const char* options = op->arg(2);
+
+ return load_agent_library(agent, absParam, options, st);
+}
+
+jint JvmtiExport::load_agent_library(const char *agent, const char *absParam,
+ const char *options, outputStream* st) {
char ebuf[1024];
char buffer[JVM_MAXPATHLEN];
void* library = NULL;
@@ -2207,11 +2217,6 @@
const char *on_attach_symbols[] = AGENT_ONATTACH_SYMBOLS;
size_t num_symbol_entries = ARRAY_SIZE(on_attach_symbols);
- // get agent name and options
- const char* agent = op->arg(0);
- const char* absParam = op->arg(1);
- const char* options = op->arg(2);
-
// The abs paramter should be "true" or "false"
bool is_absolute_path = (absParam != NULL) && (strcmp(absParam,"true")==0);
--- a/hotspot/src/share/vm/prims/jvmtiExport.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/prims/jvmtiExport.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -372,6 +372,7 @@
static void transition_pending_onload_raw_monitors() NOT_JVMTI_RETURN;
// attach support
+ static jint load_agent_library(const char *agent, const char *absParam, const char *options, outputStream* out) NOT_JVMTI_RETURN_(JNI_ERR);
static jint load_agent_library(AttachOperation* op, outputStream* out) NOT_JVMTI_RETURN_(JNI_ERR);
// SetNativeMethodPrefix support
--- a/hotspot/src/share/vm/prims/methodHandles.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/prims/methodHandles.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -40,6 +40,7 @@
#include "prims/jvmtiRedefineClassesTrace.hpp"
#include "runtime/compilationPolicy.hpp"
#include "runtime/javaCalls.hpp"
+#include "runtime/logTimer.hpp"
#include "runtime/reflection.hpp"
#include "runtime/signature.hpp"
#include "runtime/stubRoutines.hpp"
@@ -72,7 +73,7 @@
assert(_adapter_code == NULL, "generate only once");
ResourceMark rm;
- TraceTime timer("MethodHandles adapters generation", TraceStartupTime);
+ TraceStartupTime timer("MethodHandles adapters generation");
_adapter_code = MethodHandlesAdapterBlob::create(adapter_code_size);
CodeBuffer code(_adapter_code);
MethodHandlesAdapterGenerator g(&code);
--- a/hotspot/src/share/vm/runtime/arguments.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/runtime/arguments.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -409,6 +409,7 @@
{ "TraceClassResolution", LogLevel::Info, true, LogTag::_classresolve },
{ "TraceExceptions", LogLevel::Info, true, LogTag::_exceptions },
{ "TraceMonitorInflation", LogLevel::Debug, true, LogTag::_monitorinflation },
+ { "TraceBiasedLocking", LogLevel::Info, true, LogTag::_biasedlocking },
{ NULL, LogLevel::Off, false, LogTag::__NO_TAG }
};
--- a/hotspot/src/share/vm/runtime/biasedLocking.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/runtime/biasedLocking.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -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,6 +23,8 @@
*/
#include "precompiled.hpp"
+#include "logging/log.hpp"
+#include "memory/resourceArea.hpp"
#include "oops/klass.inline.hpp"
#include "oops/markOop.hpp"
#include "oops/oop.inline.hpp"
@@ -60,9 +62,7 @@
// Indicate that future instances should enable it as well
_biased_locking_enabled = true;
- if (TraceBiasedLocking) {
- tty->print_cr("Biased locking enabled");
- }
+ log_info(biasedlocking)("Biased locking enabled");
}
bool allow_nested_vm_operations() const { return false; }
@@ -144,14 +144,14 @@
return info;
}
-
static BiasedLocking::Condition revoke_bias(oop obj, bool allow_rebias, bool is_bulk, JavaThread* requesting_thread) {
markOop mark = obj->mark();
if (!mark->has_bias_pattern()) {
- if (TraceBiasedLocking) {
+ if (log_is_enabled(Info, biasedlocking)) {
ResourceMark rm;
- tty->print_cr(" (Skipping revocation of object of type %s because it's no longer biased)",
- obj->klass()->external_name());
+ log_info(biasedlocking)(" (Skipping revocation of object of type %s "
+ "because it's no longer biased)",
+ obj->klass()->external_name());
}
return BiasedLocking::NOT_BIASED;
}
@@ -160,10 +160,29 @@
markOop biased_prototype = markOopDesc::biased_locking_prototype()->set_age(age);
markOop unbiased_prototype = markOopDesc::prototype()->set_age(age);
- if (TraceBiasedLocking && (Verbose || !is_bulk)) {
+ // Log at "info" level if not bulk, else "trace" level
+ if (!is_bulk) {
ResourceMark rm;
- tty->print_cr("Revoking bias of object " INTPTR_FORMAT " , mark " INTPTR_FORMAT " , type %s , prototype header " INTPTR_FORMAT " , allow rebias %d , requesting thread " INTPTR_FORMAT,
- p2i((void *)obj), (intptr_t) mark, obj->klass()->external_name(), (intptr_t) obj->klass()->prototype_header(), (allow_rebias ? 1 : 0), (intptr_t) requesting_thread);
+ log_info(biasedlocking)("Revoking bias of object " INTPTR_FORMAT " , mark "
+ INTPTR_FORMAT " , type %s , prototype header " INTPTR_FORMAT
+ " , allow rebias %d , requesting thread " INTPTR_FORMAT,
+ p2i((void *)obj),
+ (intptr_t) mark,
+ obj->klass()->external_name(),
+ (intptr_t) obj->klass()->prototype_header(),
+ (allow_rebias ? 1 : 0),
+ (intptr_t) requesting_thread);
+ } else {
+ ResourceMark rm;
+ log_trace(biasedlocking)("Revoking bias of object " INTPTR_FORMAT " , mark "
+ INTPTR_FORMAT " , type %s , prototype header " INTPTR_FORMAT
+ " , allow rebias %d , requesting thread " INTPTR_FORMAT,
+ p2i((void *)obj),
+ (intptr_t) mark,
+ obj->klass()->external_name(),
+ (intptr_t) obj->klass()->prototype_header(),
+ (allow_rebias ? 1 : 0),
+ (intptr_t) requesting_thread);
}
JavaThread* biased_thread = mark->biased_locker();
@@ -174,8 +193,11 @@
if (!allow_rebias) {
obj->set_mark(unbiased_prototype);
}
- if (TraceBiasedLocking && (Verbose || !is_bulk)) {
- tty->print_cr(" Revoked bias of anonymously-biased object");
+ // Log at "info" level if not bulk, else "trace" level
+ if (!is_bulk) {
+ log_info(biasedlocking)(" Revoked bias of anonymously-biased object");
+ } else {
+ log_trace(biasedlocking)(" Revoked bias of anonymously-biased object");
}
return BiasedLocking::BIAS_REVOKED;
}
@@ -198,8 +220,11 @@
} else {
obj->set_mark(unbiased_prototype);
}
- if (TraceBiasedLocking && (Verbose || !is_bulk)) {
- tty->print_cr(" Revoked bias of object biased toward dead thread");
+ // Log at "info" level if not bulk, else "trace" level
+ if (!is_bulk) {
+ log_info(biasedlocking)(" Revoked bias of object biased toward dead thread");
+ } else {
+ log_trace(biasedlocking)(" Revoked bias of object biased toward dead thread");
}
return BiasedLocking::BIAS_REVOKED;
}
@@ -214,21 +239,17 @@
for (int i = 0; i < cached_monitor_info->length(); i++) {
MonitorInfo* mon_info = cached_monitor_info->at(i);
if (mon_info->owner() == obj) {
- if (TraceBiasedLocking && Verbose) {
- tty->print_cr(" mon_info->owner (" PTR_FORMAT ") == obj (" PTR_FORMAT ")",
- p2i((void *) mon_info->owner()),
- p2i((void *) obj));
- }
+ log_trace(biasedlocking)(" mon_info->owner (" PTR_FORMAT ") == obj (" PTR_FORMAT ")",
+ p2i((void *) mon_info->owner()),
+ p2i((void *) obj));
// Assume recursive case and fix up highest lock later
markOop mark = markOopDesc::encode((BasicLock*) NULL);
highest_lock = mon_info->lock();
highest_lock->set_displaced_header(mark);
} else {
- if (TraceBiasedLocking && Verbose) {
- tty->print_cr(" mon_info->owner (" PTR_FORMAT ") != obj (" PTR_FORMAT ")",
- p2i((void *) mon_info->owner()),
- p2i((void *) obj));
- }
+ log_trace(biasedlocking)(" mon_info->owner (" PTR_FORMAT ") != obj (" PTR_FORMAT ")",
+ p2i((void *) mon_info->owner()),
+ p2i((void *) obj));
}
}
if (highest_lock != NULL) {
@@ -240,12 +261,18 @@
// ordering (e.g. ppc).
obj->release_set_mark(markOopDesc::encode(highest_lock));
assert(!obj->mark()->has_bias_pattern(), "illegal mark state: stack lock used bias bit");
- if (TraceBiasedLocking && (Verbose || !is_bulk)) {
- tty->print_cr(" Revoked bias of currently-locked object");
+ // Log at "info" level if not bulk, else "trace" level
+ if (!is_bulk) {
+ log_info(biasedlocking)(" Revoked bias of currently-locked object");
+ } else {
+ log_trace(biasedlocking)(" Revoked bias of currently-locked object");
}
} else {
- if (TraceBiasedLocking && (Verbose || !is_bulk)) {
- tty->print_cr(" Revoked bias of currently-unlocked object");
+ // Log at "info" level if not bulk, else "trace" level
+ if (!is_bulk) {
+ log_info(biasedlocking)(" Revoked bias of currently-unlocked object");
+ } else {
+ log_trace(biasedlocking)(" Revoked bias of currently-unlocked object");
}
if (allow_rebias) {
obj->set_mark(biased_prototype);
@@ -326,12 +353,12 @@
JavaThread* requesting_thread) {
assert(SafepointSynchronize::is_at_safepoint(), "must be done at safepoint");
- if (TraceBiasedLocking) {
- tty->print_cr("* Beginning bulk revocation (kind == %s) because of object "
- INTPTR_FORMAT " , mark " INTPTR_FORMAT " , type %s",
- (bulk_rebias ? "rebias" : "revoke"),
- p2i((void *) o), (intptr_t) o->mark(), o->klass()->external_name());
- }
+ log_info(biasedlocking)("* Beginning bulk revocation (kind == %s) because of object "
+ INTPTR_FORMAT " , mark " INTPTR_FORMAT " , type %s",
+ (bulk_rebias ? "rebias" : "revoke"),
+ p2i((void *) o),
+ (intptr_t) o->mark(),
+ o->klass()->external_name());
jlong cur_time = os::javaTimeMillis();
o->klass()->set_last_biased_lock_bulk_revocation_time(cur_time);
@@ -377,9 +404,9 @@
// adjust the header of the given object to revoke its bias.
revoke_bias(o, attempt_rebias_of_object && klass->prototype_header()->has_bias_pattern(), true, requesting_thread);
} else {
- if (TraceBiasedLocking) {
+ if (log_is_enabled(Info, biasedlocking)) {
ResourceMark rm;
- tty->print_cr("* Disabling biased locking for type %s", klass->external_name());
+ log_info(biasedlocking)("* Disabling biased locking for type %s", klass->external_name());
}
// Disable biased locking for this data type. Not only will this
@@ -407,9 +434,7 @@
revoke_bias(o, false, true, requesting_thread);
}
- if (TraceBiasedLocking) {
- tty->print_cr("* Ending bulk revocation");
- }
+ log_info(biasedlocking)("* Ending bulk revocation");
BiasedLocking::Condition status_code = BiasedLocking::BIAS_REVOKED;
@@ -420,9 +445,7 @@
klass->prototype_header()->bias_epoch());
o->set_mark(new_mark);
status_code = BiasedLocking::BIAS_REVOKED_AND_REBIASED;
- if (TraceBiasedLocking) {
- tty->print_cr(" Rebiased object toward thread " INTPTR_FORMAT, (intptr_t) requesting_thread);
- }
+ log_info(biasedlocking)(" Rebiased object toward thread " INTPTR_FORMAT, (intptr_t) requesting_thread);
}
assert(!o->mark()->has_bias_pattern() ||
@@ -485,16 +508,12 @@
virtual void doit() {
if (_obj != NULL) {
- if (TraceBiasedLocking) {
- tty->print_cr("Revoking bias with potentially per-thread safepoint:");
- }
+ log_info(biasedlocking)("Revoking bias with potentially per-thread safepoint:");
_status_code = revoke_bias((*_obj)(), false, false, _requesting_thread);
clean_up_cached_monitor_info();
return;
} else {
- if (TraceBiasedLocking) {
- tty->print_cr("Revoking bias with global safepoint:");
- }
+ log_info(biasedlocking)("Revoking bias with global safepoint:");
BiasedLocking::revoke_at_safepoint(_objs);
}
}
@@ -608,9 +627,7 @@
// can come in with a CAS to steal the bias of an object that has a
// stale epoch.
ResourceMark rm;
- if (TraceBiasedLocking) {
- tty->print_cr("Revoking bias by walking my own stack:");
- }
+ log_info(biasedlocking)("Revoking bias by walking my own stack:");
BiasedLocking::Condition cond = revoke_bias(obj(), false, false, (JavaThread*) THREAD);
((JavaThread*) THREAD)->set_cached_monitor_info(NULL);
assert(cond == BIAS_REVOKED, "why not?");
--- a/hotspot/src/share/vm/runtime/globals.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/runtime/globals.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -403,25 +403,20 @@
st->cr();
} else if (!is_bool() && !is_ccstr()) {
-
- if (printRanges) {
-
- st->print("%9s %-50s ", _type, _name);
+ st->print("%9s %-50s ", _type, _name);
- CommandLineFlagRangeList::print(_name, st, true);
+ CommandLineFlagRangeList::print(_name, st, true);
- st->print(" %-20s", " ");
- print_kind(st);
+ st->print(" %-20s", " ");
+ print_kind(st);
#ifndef PRODUCT
- if (withComments) {
- st->print("%s", _doc);
- }
+ if (withComments) {
+ st->print("%s", _doc);
+ }
#endif
- st->cr();
-
- }
+ st->cr();
}
}
@@ -1255,8 +1250,6 @@
#endif // PRODUCT
-#define ONLY_PRINT_PRODUCT_FLAGS
-
void CommandLineFlags::printFlags(outputStream* out, bool withComments, bool printRanges) {
// Print the flags sorted by name
// note: this method is called before the thread structure is in place
@@ -1281,9 +1274,6 @@
for (size_t i = 0; i < length; i++) {
if (array[i]->is_unlocked()) {
-#ifdef ONLY_PRINT_PRODUCT_FLAGS
- if (!array[i]->is_notproduct() && !array[i]->is_develop())
-#endif // ONLY_PRINT_PRODUCT_FLAGS
array[i]->print_on(out, withComments, printRanges);
}
}
--- a/hotspot/src/share/vm/runtime/globals.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/runtime/globals.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -1482,18 +1482,12 @@
develop(bool, TraceCompiledIC, false, \
"Trace changes of compiled IC") \
\
- develop(bool, TraceStartupTime, false, \
- "Trace setup time") \
- \
develop(bool, TraceProtectionDomainVerification, false, \
"Trace protection domain verification") \
\
develop(bool, TraceClearedExceptions, false, \
"Print when an exception is forcibly cleared") \
\
- product(bool, TraceBiasedLocking, false, \
- "Trace biased locking in JVM") \
- \
/* gc */ \
\
product(bool, UseSerialGC, false, \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/src/share/vm/runtime/logTimer.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -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.
+ *
+ */
+
+#ifndef SHARE_VM_RUNTIME_LOG_TIMER_HPP
+#define SHARE_VM_RUNTIME_LOG_TIMER_HPP
+
+#include "logging/log.hpp"
+#include "runtime/timer.hpp"
+
+// TraceStartupTime is used for tracing the execution time of a block with logging
+// Usage:
+// { TraceStartupTime t("block time")
+// some_code();
+// }
+//
+
+class TraceStartupTime : public TraceTime {
+ public:
+ TraceStartupTime(const char* s) : TraceTime(s, log_is_enabled(Info, startuptime), LogTag::_startuptime) {}
+};
+
+#endif // SHARE_VM_RUNTIME_LOG_TIMER_HPP
--- a/hotspot/src/share/vm/runtime/os.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/runtime/os.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -152,7 +152,6 @@
static size_t page_size_for_region(size_t region_size, size_t min_pages, bool must_be_aligned);
// Get summary strings for system information in buffer provided
- static bool get_host_name(char* buf, size_t buflen) PRODUCT_RETURN_(return false;); // true if available
static void get_summary_cpu_info(char* buf, size_t buflen);
static void get_summary_os_info(char* buf, size_t buflen);
@@ -595,6 +594,9 @@
// Write to stream
static int log_vsnprintf(char* buf, size_t len, const char* fmt, va_list args) ATTRIBUTE_PRINTF(3, 0);
+ // Get host name in buffer provided
+ static bool get_host_name(char* buf, size_t buflen);
+
// Print out system information; they are called by fatal error handler.
// Output format may be different on different platforms.
static void print_os_info(outputStream* st);
--- a/hotspot/src/share/vm/runtime/stubRoutines.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/runtime/stubRoutines.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -28,9 +28,9 @@
#include "memory/resourceArea.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/interfaceSupport.hpp"
+#include "runtime/logTimer.hpp"
#include "runtime/sharedRuntime.hpp"
#include "runtime/stubRoutines.hpp"
-#include "runtime/timer.hpp"
#include "utilities/copy.hpp"
#ifdef COMPILER2
#include "opto/runtime.hpp"
@@ -183,7 +183,7 @@
void StubRoutines::initialize1() {
if (_code1 == NULL) {
ResourceMark rm;
- TraceTime timer("StubRoutines generation 1", TraceStartupTime);
+ TraceStartupTime timer("StubRoutines generation 1");
_code1 = BufferBlob::create("StubRoutines (1)", code_size1);
if (_code1 == NULL) {
vm_exit_out_of_memory(code_size1, OOM_MALLOC_ERROR, "CodeCache: no room for StubRoutines (1)");
@@ -276,7 +276,7 @@
void StubRoutines::initialize2() {
if (_code2 == NULL) {
ResourceMark rm;
- TraceTime timer("StubRoutines generation 2", TraceStartupTime);
+ TraceStartupTime timer("StubRoutines generation 2");
_code2 = BufferBlob::create("StubRoutines (2)", code_size2);
if (_code2 == NULL) {
vm_exit_out_of_memory(code_size2, OOM_MALLOC_ERROR, "CodeCache: no room for StubRoutines (2)");
--- a/hotspot/src/share/vm/runtime/thread.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/runtime/thread.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -67,6 +67,7 @@
#include "runtime/java.hpp"
#include "runtime/javaCalls.hpp"
#include "runtime/jniPeriodicChecker.hpp"
+#include "runtime/logTimer.hpp"
#include "runtime/memprofiler.hpp"
#include "runtime/mutexLocker.hpp"
#include "runtime/objectMonitor.hpp"
@@ -169,11 +170,10 @@
assert(((uintptr_t) aligned_addr + (uintptr_t) size) <=
((uintptr_t) real_malloc_addr + (uintptr_t) aligned_size),
"JavaThread alignment code overflowed allocated storage");
- if (TraceBiasedLocking) {
- if (aligned_addr != real_malloc_addr) {
- tty->print_cr("Aligned thread " INTPTR_FORMAT " to " INTPTR_FORMAT,
- p2i(real_malloc_addr), p2i(aligned_addr));
- }
+ if (aligned_addr != real_malloc_addr) {
+ log_info(biasedlocking)("Aligned thread " INTPTR_FORMAT " to " INTPTR_FORMAT,
+ p2i(real_malloc_addr),
+ p2i(aligned_addr));
}
((Thread*) aligned_addr)->_real_malloc_address = real_malloc_addr;
return aligned_addr;
@@ -1005,9 +1005,9 @@
char java_runtime_name[128] = "";
char java_runtime_version[128] = "";
-// extract the JRE name from sun.misc.Version.java_runtime_name
+// extract the JRE name from java.lang.VersionProps.java_runtime_name
static const char* get_java_runtime_name(TRAPS) {
- Klass* k = SystemDictionary::find(vmSymbols::sun_misc_Version(),
+ Klass* k = SystemDictionary::find(vmSymbols::java_lang_VersionProps(),
Handle(), Handle(), CHECK_AND_CLEAR_NULL);
fieldDescriptor fd;
bool found = k != NULL &&
@@ -1027,9 +1027,9 @@
}
}
-// extract the JRE version from sun.misc.Version.java_runtime_version
+// extract the JRE version from java.lang.VersionProps.java_runtime_version
static const char* get_java_runtime_version(TRAPS) {
- Klass* k = SystemDictionary::find(vmSymbols::sun_misc_Version(),
+ Klass* k = SystemDictionary::find(vmSymbols::java_lang_VersionProps(),
Handle(), Handle(), CHECK_AND_CLEAR_NULL);
fieldDescriptor fd;
bool found = k != NULL &&
@@ -3341,7 +3341,7 @@
}
void Threads::initialize_java_lang_classes(JavaThread* main_thread, TRAPS) {
- TraceTime timer("Initialize java.lang classes", TraceStartupTime);
+ TraceStartupTime timer("Initialize java.lang classes");
if (EagerXrunInit && Arguments::init_libraries_at_startup()) {
create_vm_init_libraries();
@@ -3388,6 +3388,8 @@
}
void Threads::initialize_jsr292_core_classes(TRAPS) {
+ TraceStartupTime timer("Initialize java.lang.invoke classes");
+
initialize_class(vmSymbols::java_lang_invoke_MethodHandle(), CHECK);
initialize_class(vmSymbols::java_lang_invoke_MemberName(), CHECK);
initialize_class(vmSymbols::java_lang_invoke_MethodHandleNatives(), CHECK);
@@ -3457,7 +3459,7 @@
HOTSPOT_VM_INIT_BEGIN();
// Timing (must come after argument parsing)
- TraceTime timer("Create VM", TraceStartupTime);
+ TraceStartupTime timer("Create VM");
// Initialize the os module after parsing the args
jint os_init_2_result = os::init_2();
@@ -3542,8 +3544,9 @@
JvmtiExport::transition_pending_onload_raw_monitors();
// Create the VMThread
- { TraceTime timer("Start VMThread", TraceStartupTime);
- VMThread::create();
+ { TraceStartupTime timer("Start VMThread");
+
+ VMThread::create();
Thread* vmthread = VMThread::vm_thread();
if (!os::create_thread(vmthread, os::vm_thread)) {
--- a/hotspot/src/share/vm/runtime/timer.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/runtime/timer.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -23,6 +23,7 @@
*/
#include "precompiled.hpp"
+#include "logging/log.hpp"
#include "oops/oop.inline.hpp"
#include "runtime/timer.hpp"
#include "utilities/ostream.hpp"
@@ -114,14 +115,15 @@
}
TraceTime::TraceTime(const char* title,
- bool doit) {
+ bool doit,
+ LogTagType tag) {
_active = doit;
_verbose = true;
+ _tag = tag;
+ _title = title;
if (_active) {
_accum = NULL;
- tty->print("[%s", title);
- tty->flush();
_t.start();
}
}
@@ -129,14 +131,14 @@
TraceTime::TraceTime(const char* title,
elapsedTimer* accumulator,
bool doit,
- bool verbose) {
- _active = doit;
- _verbose = verbose;
+ bool verbose,
+ LogTagType tag) {
+ _active = doit;
+ _verbose = verbose;
+ _tag = tag;
+ _title = title;
+
if (_active) {
- if (_verbose) {
- tty->print("[%s", title);
- tty->flush();
- }
_accum = accumulator;
_t.start();
}
@@ -147,8 +149,15 @@
_t.stop();
if (_accum!=NULL) _accum->add(_t);
if (_verbose) {
- tty->print_cr(", %3.7f secs]", _t.seconds());
- tty->flush();
+ switch (_tag) {
+ case LogTag::_startuptime :
+ log_info(startuptime)("%s, %3.7f secs", _title, _t.seconds());
+ break;
+ case LogTag::__NO_TAG :
+ default :
+ tty->print_cr("[%s, %3.7f secs]", _title, _t.seconds());
+ tty->flush();
+ }
}
}
}
--- a/hotspot/src/share/vm/runtime/timer.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/runtime/timer.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -25,6 +25,7 @@
#ifndef SHARE_VM_RUNTIME_TIMER_HPP
#define SHARE_VM_RUNTIME_TIMER_HPP
+#include "logging/logTag.hpp"
#include "utilities/globalDefinitions.hpp"
// Timers for simple measurement.
@@ -85,14 +86,19 @@
bool _verbose; // report every timing
elapsedTimer _t; // timer
elapsedTimer* _accum; // accumulator
+ const char* _title; // name of timer
+ LogTagType _tag; // stream to print to
+
public:
// Constructors
TraceTime(const char* title,
- bool doit = true);
+ bool doit = true,
+ LogTagType tag = LogTag::__NO_TAG);
TraceTime(const char* title,
elapsedTimer* accumulator,
bool doit = true,
- bool verbose = false);
+ bool verbose = false,
+ LogTagType tag = LogTag::__NO_TAG);
~TraceTime();
// Accessors
--- a/hotspot/src/share/vm/services/diagnosticCommand.cpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/services/diagnosticCommand.cpp Thu Mar 03 12:49:44 2016 -0800
@@ -71,6 +71,7 @@
#endif // INCLUDE_SERVICES
#if INCLUDE_JVMTI
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JVMTIDataDumpDCmd>(full_export, true, false));
+ DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JVMTIAgentLoadDCmd>(full_export, true, false));
#endif // INCLUDE_JVMTI
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ThreadDumpDCmd>(full_export, true, false));
DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassLoaderStatsDCmd>(full_export, true, false));
@@ -254,6 +255,66 @@
}
}
+JVMTIAgentLoadDCmd::JVMTIAgentLoadDCmd(outputStream* output, bool heap) :
+ DCmdWithParser(output, heap),
+ _libpath("library path", "Absolute path of the JVMTI agent to load.",
+ "STRING", true),
+ _option("agent option", "Option string to pass the agent.", "STRING", false) {
+ _dcmdparser.add_dcmd_argument(&_libpath);
+ _dcmdparser.add_dcmd_argument(&_option);
+}
+
+void JVMTIAgentLoadDCmd::execute(DCmdSource source, TRAPS) {
+
+ if (_libpath.value() == NULL) {
+ output()->print_cr("JVMTI.agent_load dcmd needs library path.");
+ return;
+ }
+
+ char *suffix = strrchr(_libpath.value(), '.');
+ bool is_java_agent = (suffix != NULL) && (strncmp(".jar", suffix, 4) == 0);
+
+ if (is_java_agent) {
+ if (_option.value() == NULL) {
+ JvmtiExport::load_agent_library("instrument", "false",
+ _libpath.value(), output());
+ } else {
+ size_t opt_len = strlen(_libpath.value()) + strlen(_option.value()) + 2;
+ if (opt_len > 4096) {
+ output()->print_cr("JVMTI agent attach failed: Options is too long.");
+ return;
+ }
+
+ char *opt = (char *)os::malloc(opt_len, mtInternal);
+ if (opt == NULL) {
+ output()->print_cr("JVMTI agent attach failed: "
+ "Could not allocate %zu bytes for argument.",
+ opt_len);
+ return;
+ }
+
+ jio_snprintf(opt, opt_len, "%s=%s", _libpath.value(), _option.value());
+ JvmtiExport::load_agent_library("instrument", "false", opt, output());
+
+ os::free(opt);
+ }
+ } else {
+ JvmtiExport::load_agent_library(_libpath.value(), "true",
+ _option.value(), output());
+ }
+}
+
+int JVMTIAgentLoadDCmd::num_arguments() {
+ ResourceMark rm;
+ JVMTIAgentLoadDCmd* dcmd = new JVMTIAgentLoadDCmd(NULL, false);
+ if (dcmd != NULL) {
+ DCmdMark mark(dcmd);
+ return dcmd->_dcmdparser.num_arguments();
+ } else {
+ return 0;
+ }
+}
+
void PrintSystemPropertiesDCmd::execute(DCmdSource source, TRAPS) {
// load sun.misc.VMSupport
Symbol* klass = vmSymbols::sun_misc_VMSupport();
--- a/hotspot/src/share/vm/services/diagnosticCommand.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/services/diagnosticCommand.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -174,6 +174,26 @@
virtual void execute(DCmdSource source, TRAPS);
};
+class JVMTIAgentLoadDCmd : public DCmdWithParser {
+protected:
+ DCmdArgument<char*> _libpath;
+ DCmdArgument<char*> _option;
+public:
+ JVMTIAgentLoadDCmd(outputStream* output, bool heap);
+ static const char* name() { return "JVMTI.agent_load"; }
+ static const char* description() {
+ return "Load JVMTI native agent.";
+ }
+ static const char* impact() { return "Low"; }
+ static const JavaPermission permission() {
+ JavaPermission p = {"java.lang.management.ManagementPermission",
+ "control", NULL};
+ return p;
+ }
+ static int num_arguments();
+ virtual void execute(DCmdSource source, TRAPS);
+};
+
class VMDynamicLibrariesDCmd : public DCmd {
public:
VMDynamicLibrariesDCmd(outputStream* output, bool heap);
--- a/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/src/share/vm/utilities/globalDefinitions_visCPP.hpp Thu Mar 03 12:49:44 2016 -0800
@@ -174,6 +174,8 @@
#if _MSC_VER < 1800
// Visual Studio 2013 introduced strtoull(); before, one has to use _strtoui64() instead.
#define strtoull _strtoui64
+// Visual Studio prior to 2013 had no va_copy, but could safely copy va_list by assignement
+#define va_copy(dest, src) dest = src
// Fixes some wrong warnings about 'this' : used in base member initializer list
#pragma warning( disable : 4355 )
#endif
--- a/hotspot/test/TEST.ROOT Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/test/TEST.ROOT Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -30,7 +30,7 @@
keys=cte_test jcmd nmt regression gc stress
groups=TEST.groups [closed/TEST.groups]
-requires.properties=sun.arch.data.model java.version
+requires.properties=sun.arch.data.model
# Tests using jtreg 4.1 b12 features
requiredVersion=4.1 b12
--- a/hotspot/test/gc/g1/plab/TestPLABResize.java Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/test/gc/g1/plab/TestPLABResize.java Thu Mar 03 12:49:44 2016 -0800
@@ -35,6 +35,7 @@
* gc.g1.plab.lib.MemoryConsumer
* gc.g1.plab.lib.PLABUtils
* gc.g1.plab.lib.AppPLABResize
+ * @ignore 8150183
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main gc.g1.plab.TestPLABResize
--- a/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/test/gc/parallel/TestPrintGCDetailsVerbose.java Thu Mar 03 12:49:44 2016 -0800
@@ -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 TestPrintGCDetailsVerbose
* @bug 8016740
- * @summary Tests that jvm with PrintGCDetails and Verbose flags do not crash when ParOldGC has no memory
+ * @summary Tests that jvm with maximally verbose GC logging does not crash when ParOldGC has no memory
* @key gc
- * @requires java.version ~= ".*fastdebug"
* @requires vm.gc=="Parallel" | vm.gc=="null"
* @library /testlibrary
- * @run main/othervm -Xmx50m -XX:+UseParallelOldGC -XX:+PrintGCDetails -XX:+Verbose TestPrintGCDetailsVerbose
+ * @run main/othervm -Xmx50m -XX:+UseParallelGC -Xlog:gc*=trace TestPrintGCDetailsVerbose
*/
public class TestPrintGCDetailsVerbose {
--- a/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/test/runtime/CommandLine/OptionsValidation/TestOptionsWithRanges.java Thu Mar 03 12:49:44 2016 -0800
@@ -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
@@ -75,7 +75,7 @@
int failedTests;
List<JVMOption> allOptions;
- allOptionsAsMap = JVMOptionsUtils.getOptionsWithRangeAsMap();
+ allOptionsAsMap = JVMOptionsUtils.getOptionsWithRangeAsMap(origin -> (!(origin.contains("develop") || origin.contains("notproduct"))));
/* Shared flags can cause JVM to exit with error code 2 */
setAllowedExitCodes("SharedReadWriteSize", 2);
@@ -84,6 +84,13 @@
setAllowedExitCodes("SharedMiscCodeSize", 2);
/*
+ * JDK-8145204
+ * Temporarily remove testing of max range for ParGCArrayScanChunk because
+ * JVM can hang when ParGCArrayScanChunk=4294967296 and ParallelGC is used
+ */
+ excludeTestMaxRange("ParGCArrayScanChunk");
+
+ /*
* Remove CICompilerCount from testing because currently it can hang system
*/
excludeTestMaxRange("CICompilerCount");
--- a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOption.java Thu Mar 03 12:49:44 2016 -0800
@@ -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,6 +37,7 @@
import sun.tools.attach.HotSpotVirtualMachine;
import static optionsvalidation.JVMOptionsUtils.failedMessage;
+import static optionsvalidation.JVMOptionsUtils.GCType;
import static optionsvalidation.JVMOptionsUtils.printOutputContent;
import static optionsvalidation.JVMOptionsUtils.VMType;
@@ -374,17 +375,21 @@
private boolean runJavaWithParam(String optionValue, boolean valid) throws Exception {
int exitCode;
boolean result = true;
- String value = optionValue.substring(optionValue.lastIndexOf("=") + 1);
- String fullOptionString = prependString.toString() + optionValue;
+ String errorMessage = null;
List<String> runJava = new ArrayList<>();
OutputAnalyzer out;
if (VMType != null) {
runJava.add(VMType);
}
+
+ if (GCType != null) {
+ runJava.add(GCType);
+ }
+
runJava.addAll(prepend);
runJava.add(optionValue);
- runJava.add(JVMOptionsUtils.class.getName());
+ runJava.add(JVMStartup.class.getName());
out = new OutputAnalyzer(ProcessTools.createJavaProcessBuilder(runJava.toArray(new String[0])).start());
@@ -392,40 +397,37 @@
if (out.getOutput().contains("A fatal error has been detected by the Java Runtime Environment")) {
/* Always consider "fatal error" in output as fail */
- failedMessage(name, fullOptionString, valid, "JVM output reports a fatal error. JVM exited with code " + exitCode + "!");
- printOutputContent(out);
- result = false;
+ errorMessage = "JVM output reports a fatal error. JVM exited with code " + exitCode + "!";
} else if (valid == true) {
if (!allowedExitCodes.contains(exitCode)) {
- failedMessage(name, fullOptionString, valid, "JVM exited with unexpected error code = " + exitCode);
- printOutputContent(out);
- result = false;
+ errorMessage = "JVM exited with unexpected error code = " + exitCode;
} else if ((exitCode != 0) && (out.getOutput().isEmpty() == true)) {
- failedMessage(name, fullOptionString, valid, "JVM exited with error(exitcode == " + exitCode +
- "), but with empty stdout and stderr. Description of error is needed!");
- result = false;
+ errorMessage = "JVM exited with error(exitcode == " + exitCode + "), but with empty stdout and stderr. " +
+ "Description of error is needed!";
} else if (out.getOutput().contains("is outside the allowed range")) {
- failedMessage(name, fullOptionString, valid, "JVM output contains \"is outside the allowed range\"");
- printOutputContent(out);
- result = false;
+ errorMessage = "JVM output contains \"is outside the allowed range\"";
}
} else {
// valid == false
+ String value = optionValue.substring(optionValue.lastIndexOf("=") + 1);
+ String errorMessageCommandLineValue = getErrorMessageCommandLine(value);
if (exitCode == 0) {
- failedMessage(name, fullOptionString, valid, "JVM successfully exit");
- result = false;
+ errorMessage = "JVM successfully exit";
} else if (exitCode != 1) {
- failedMessage(name, fullOptionString, valid, "JVM exited with code "
- + exitCode + " which not equal to 1");
- result = false;
- } else if (!out.getOutput().contains(getErrorMessageCommandLine(value))) {
- failedMessage(name, fullOptionString, valid, "JVM output does not contain "
- + "expected output \"" + getErrorMessageCommandLine(value) + "\"");
- printOutputContent(out);
- result = false;
+ errorMessage = "JVM exited with code " + exitCode + " which not equal to 1";
+ } else if (!out.getOutput().contains(errorMessageCommandLineValue)) {
+ errorMessage = "JVM output does not contain expected output \"" + errorMessageCommandLineValue + "\"";
}
}
+ if (errorMessage != null) {
+ String fullOptionString = String.format("%s %s %s %s",
+ VMType == null ? "" : VMType, GCType == null ? "" : GCType, prependString.toString(), optionValue).trim().replaceAll(" +", " ");
+ failedMessage(name, fullOptionString, valid, errorMessage);
+ printOutputContent(out);
+ result = false;
+ }
+
System.out.println("");
return result;
--- a/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMOptionsUtils.java Thu Mar 03 12:49:44 2016 -0800
@@ -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,6 +27,8 @@
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
@@ -50,6 +52,9 @@
/* Used to start the JVM with the same type as current */
static String VMType;
+ /* Used to start the JVM with the same GC type as current */
+ static String GCType;
+
private static Map<String, JVMOption> optionsAsMap;
static {
@@ -64,6 +69,27 @@
} else {
VMType = null;
}
+
+ List<GarbageCollectorMXBean> gcMxBeans = ManagementFactory.getGarbageCollectorMXBeans();
+
+ GCType = null;
+
+ for (GarbageCollectorMXBean gcMxBean : gcMxBeans) {
+ switch (gcMxBean.getName()) {
+ case "ConcurrentMarkSweep":
+ GCType = "-XX:+UseConcMarkSweepGC";
+ break;
+ case "MarkSweepCompact":
+ GCType = "-XX:+UseSerialGC";
+ break;
+ case "PS Scavenge":
+ GCType = "-XX:+UseParallelGC";
+ break;
+ case "G1 Old Generation":
+ GCType = "-XX:+UseG1GC";
+ break;
+ }
+ }
}
public static boolean fitsRange(String optionName, BigDecimal number) throws Exception {
@@ -443,6 +469,10 @@
if (VMType != null) {
runJava.add(VMType);
}
+
+ if (GCType != null) {
+ runJava.add(GCType);
+ }
runJava.add(PRINT_FLAGS_RANGES);
runJava.add("-version");
@@ -534,9 +564,4 @@
public static Map<String, JVMOption> getOptionsWithRangeAsMap(String... additionalArgs) throws Exception {
return getOptionsWithRangeAsMap(origin -> true, additionalArgs);
}
-
- /* Simple method to test that java start-up. Used for testing options. */
- public static void main(String[] args) {
- System.out.print("Java start-up!");
- }
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/CommandLine/OptionsValidation/common/optionsvalidation/JVMStartup.java Thu Mar 03 12:49:44 2016 -0800
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+package optionsvalidation;
+
+import java.lang.ref.WeakReference;
+
+class JVMStartup {
+ private static volatile WeakReference<Object> weakRef;
+
+ private static synchronized void createWeakRef() {
+ Object o = new Object();
+ weakRef = new WeakReference<>(o);
+ }
+
+ /* Simple method to test that java start-up. Used for testing options. */
+ public static void main(String[] args) throws Exception {
+ byte[] garbage = new byte[8192];
+ int i = 0;
+ createWeakRef();
+ do {
+ garbage = new byte[8192];
+ i++;
+ /* Initiate GC after 5 iterations */
+ if (i > 5) {
+ System.gc();
+ }
+ } while(weakRef.get() != null);
+ System.out.println("Java start-up!");
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/logging/BiasedLockingTest.java Thu Mar 03 12:49:44 2016 -0800
@@ -0,0 +1,78 @@
+/*
+ * 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 8149383
+ * @summary -Xlog:biasedlocking should have logging from statements in the source code
+ * @library /testlibrary
+ * @modules java.base/sun.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;
+
+public class BiasedLockingTest {
+ static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldContain("Biased locking enabled");
+ output.shouldHaveExitValue(0);
+ }
+
+ static void analyzeOutputOff(ProcessBuilder pb) throws Exception {
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("[biasedlocking]");
+ output.shouldHaveExitValue(0);
+ }
+
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:biasedlocking",
+ "-XX:BiasedLockingStartupDelay=0",
+ InnerClass.class.getName());
+ analyzeOutputOn(pb);
+
+ pb = ProcessTools.createJavaProcessBuilder("-XX:+TraceBiasedLocking",
+ "-XX:BiasedLockingStartupDelay=0",
+ InnerClass.class.getName());
+ analyzeOutputOn(pb);
+
+ pb = ProcessTools.createJavaProcessBuilder("-Xlog:biasedlocking=off",
+ "-XX:BiasedLockingStartupDelay=0",
+ InnerClass.class.getName());
+ analyzeOutputOff(pb);
+
+ pb = ProcessTools.createJavaProcessBuilder("-XX:-TraceBiasedLocking",
+ "-XX:BiasedLockingStartupDelay=0",
+ InnerClass.class.getName());
+ analyzeOutputOff(pb);
+ }
+
+ public static class InnerClass {
+ public static void main(String[] args) {
+ System.out.println("Biased Locking test");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/runtime/logging/StartupTimeTest.java Thu Mar 03 12:49:44 2016 -0800
@@ -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.
+ */
+
+/*
+ * @test
+ * @bug 8148630
+ * @summary -Xlog:startuptime should produce logging from the source code
+ * @library /testlibrary
+ * @modules java.base/sun.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;
+
+public class StartupTimeTest {
+ static void analyzeOutputOn(ProcessBuilder pb) throws Exception {
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldMatch("(Genesis, [0-9]+.[0-9]+ secs)");
+ output.shouldMatch("(Start VMThread, [0-9]+.[0-9]+ secs)");
+ output.shouldMatch("(Create VM, [0-9]+.[0-9]+ secs)");
+ output.shouldHaveExitValue(0);
+ }
+
+ static void analyzeOutputOff(ProcessBuilder pb) throws Exception {
+ OutputAnalyzer output = new OutputAnalyzer(pb.start());
+ output.shouldNotContain("[startuptime]");
+ output.shouldHaveExitValue(0);
+ }
+
+ public static void main(String[] args) throws Exception {
+ ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-Xlog:startuptime",
+ InnerClass.class.getName());
+ analyzeOutputOn(pb);
+
+ pb = ProcessTools.createJavaProcessBuilder("-Xlog:startuptime=off",
+ InnerClass.class.getName());
+ analyzeOutputOff(pb);
+ }
+
+ public static class InnerClass {
+ public static void main(String[] args) throws Exception {
+ System.out.println("Testing startuptime.");
+ }
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java Thu Mar 03 12:49:44 2016 -0800
@@ -0,0 +1,112 @@
+/*
+ * 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.*;
+import java.nio.file.*;
+import jdk.test.lib.*;
+import jdk.test.lib.dcmd.*;
+import org.testng.annotations.Test;
+
+/*
+ * Test to attach JVMTI java agent.
+ *
+ * @test
+ * @bug 8147388
+ * @library /testlibrary
+ * @modules java.base/sun.misc
+ * java.compiler
+ * java.instrument
+ * java.management
+ * jdk.jvmstat/sun.jvmstat.monitor
+ * @build ClassFileInstaller jdk.test.lib.* SimpleJvmtiAgent
+ * @ignore 8150318
+ * @run main ClassFileInstaller SimpleJvmtiAgent
+ * @run testng LoadAgentDcmdTest
+ */
+public class LoadAgentDcmdTest {
+
+ public String getLibInstrumentPath() throws FileNotFoundException {
+ 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'.");
+ }
+
+ Path libpath;
+ if (Platform.isWindows()) {
+ libpath = Paths.get(jdkPath, "bin", "instrument.dll");
+ } else {
+ libpath = Paths.get(jdkPath, "lib", Platform.getOsArch(), "libinstrument.so");
+ }
+
+ if (!libpath.toFile().exists()) {
+ throw new FileNotFoundException(
+ "Could not find " + libpath.toAbsolutePath());
+ }
+
+ return libpath.toAbsolutePath().toString();
+ }
+
+ public void run(CommandExecutor executor) {
+ try{
+ PrintWriter pw = new PrintWriter("MANIFEST.MF");
+ pw.println("Agent-Class: SimpleJvmtiAgent");
+ pw.close();
+
+ ProcessBuilder pb = new ProcessBuilder();
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jar"),
+ "cmf",
+ "MANIFEST.MF",
+ "agent.jar",
+ "SimpleJvmtiAgent.class"});
+ pb.start().waitFor();
+
+ String libpath = getLibInstrumentPath();
+
+ // Test 1: No argument
+ OutputAnalyzer output = executor.execute("JVMTI.agent_load " +
+ libpath + " agent.jar");
+ output.stderrShouldBeEmpty();
+
+ // Test 2: With argument
+ output = executor.execute("JVMTI.agent_load " +
+ libpath + " \"agent.jar=foo=bar\"");
+ output.stderrShouldBeEmpty();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Test
+ public void jmx() throws Throwable {
+ run(new JMXExecutor());
+ }
+
+ @Test
+ public void cli() throws Throwable {
+ run(new PidJcmdExecutor());
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/serviceability/dcmd/jvmti/LoadJavaAgentDcmdTest.java Thu Mar 03 12:49:44 2016 -0800
@@ -0,0 +1,81 @@
+/*
+ * 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.*;
+import jdk.test.lib.*;
+import jdk.test.lib.dcmd.*;
+import org.testng.annotations.Test;
+
+/*
+ * Test to attach JVMTI java agent.
+ *
+ * @test
+ * @bug 8147388
+ * @library /testlibrary
+ * @modules java.base/sun.misc
+ * java.compiler
+ * java.instrument
+ * java.management
+ * jdk.jvmstat/sun.jvmstat.monitor
+ * @build ClassFileInstaller jdk.test.lib.* SimpleJvmtiAgent
+ * @run main ClassFileInstaller SimpleJvmtiAgent
+ * @run testng LoadJavaAgentDcmdTest
+ */
+public class LoadJavaAgentDcmdTest {
+ public void run(CommandExecutor executor) {
+ try{
+ PrintWriter pw = new PrintWriter("MANIFEST.MF");
+ pw.println("Agent-Class: SimpleJvmtiAgent");
+ pw.close();
+
+ ProcessBuilder pb = new ProcessBuilder();
+ pb.command(new String[] { JDKToolFinder.getJDKTool("jar"),
+ "cmf",
+ "MANIFEST.MF",
+ "agent.jar",
+ "SimpleJvmtiAgent.class"});
+ pb.start().waitFor();
+
+ // Test 1: No argument
+ OutputAnalyzer output = executor.execute("JVMTI.agent_load " +
+ "agent.jar");
+ output.stderrShouldBeEmpty();
+
+ // Test 2: With argument
+ output = executor.execute("JVMTI.agent_load " +
+ "\"agent.jar=foo=bar\"");
+ output.stderrShouldBeEmpty();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Test
+ public void jmx() throws Throwable {
+ run(new JMXExecutor());
+ }
+
+ @Test
+ public void cli() throws Throwable {
+ run(new PidJcmdExecutor());
+ }
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/hotspot/test/serviceability/dcmd/jvmti/SimpleJvmtiAgent.java Thu Mar 03 12:49:44 2016 -0800
@@ -0,0 +1,29 @@
+/*
+ * 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.lang.instrument.*;
+
+public class SimpleJvmtiAgent {
+ public static void agentmain(String agentArgs, Instrumentation instrumentation) {
+ System.out.println("attach succeeded (args: \"" + agentArgs + "\")");
+ }
+}
--- a/hotspot/test/serviceability/tmtools/jstat/GcCapacityTest.java Thu Mar 03 12:25:52 2016 -0800
+++ b/hotspot/test/serviceability/tmtools/jstat/GcCapacityTest.java Thu Mar 03 12:49:44 2016 -0800
@@ -27,6 +27,7 @@
* @test
* @summary Test checks the consistency of the output
* displayed with jstat -gccapacity.
+ * @ignore 8149778
* @library /test/lib/share/classes
* @library ../share
* @requires vm.opt.ExplicitGCInvokesConcurrent != true