archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-24 04:54:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Daniel D. Daugherty 2016-01-20 14:11:25 -08:00
commit 8411cfaf4e
3 changed files with 25 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hotspot/src/share/vm/runtime/vm_version.cpp
View file

@ -240,9 +240,14 @@ const char* Abstract_VM_Version::internal_vm_info_string() {
#define FLOAT_ARCH_STR XSTR(FLOAT_ARCH) #define FLOAT_ARCH_STR XSTR(FLOAT_ARCH)
#endif #endif
return VMNAME " (" VM_RELEASE ") for " OS "-" CPU FLOAT_ARCH_STR #define INTERNAL_VERSION_SUFFIX VM_RELEASE ")" \
" JRE (" VERSION_STRING "), built on " __DATE__ " " __TIME__ " for " OS "-" CPU FLOAT_ARCH_STR \
" by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER; " JRE (" VERSION_STRING "), built on " __DATE__ " " __TIME__ \
" by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER
return strcmp(DEBUG_LEVEL, "release") == 0
? VMNAME " (" INTERNAL_VERSION_SUFFIX
: VMNAME " (" DEBUG_LEVEL " " INTERNAL_VERSION_SUFFIX;
} }
const char *Abstract_VM_Version::vm_build_user() { const char *Abstract_VM_Version::vm_build_user() {
@ -253,6 +258,11 @@ const char *Abstract_VM_Version::jdk_debug_level() {
return DEBUG_LEVEL; return DEBUG_LEVEL;
} }
const char *Abstract_VM_Version::printable_jdk_debug_level() {
// Debug level is not printed for "release" builds
return strcmp(DEBUG_LEVEL, "release") == 0 ? "" : DEBUG_LEVEL " ";
}
unsigned int Abstract_VM_Version::jvm_version() { unsigned int Abstract_VM_Version::jvm_version() {
return ((Abstract_VM_Version::vm_major_version() & 0xFF) << 24) | return ((Abstract_VM_Version::vm_major_version() & 0xFF) << 24) |
((Abstract_VM_Version::vm_minor_version() & 0xFF) << 16) | ((Abstract_VM_Version::vm_minor_version() & 0xFF) << 16) |

3
hotspot/src/share/vm/runtime/vm_version.hpp
View file

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -106,6 +106,7 @@ class Abstract_VM_Version: AllStatic {
static const char* internal_vm_info_string(); static const char* internal_vm_info_string();
static const char* jre_release_version(); static const char* jre_release_version();
static const char* jdk_debug_level(); static const char* jdk_debug_level();
static const char* printable_jdk_debug_level();
static uint64_t features() { static uint64_t features() {
return _features; return _features;

14
hotspot/src/share/vm/utilities/vmError.cpp
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -232,11 +232,17 @@ static void report_vm_version(outputStream* st, char* buf, int buflen) {
const char* runtime_name = JDK_Version::runtime_name() != NULL ? const char* runtime_name = JDK_Version::runtime_name() != NULL ?
JDK_Version::runtime_name() : ""; JDK_Version::runtime_name() : "";
const char* runtime_version = JDK_Version::runtime_version() != NULL ? const char* runtime_version = JDK_Version::runtime_version() != NULL ?
JDK_Version::runtime_version() : ""; JDK_Version::runtime_version() : "";
st->print_cr("# JRE version: %s (%s) (build %s)", runtime_name, buf, runtime_version); const char* jdk_debug_level = Abstract_VM_Version::printable_jdk_debug_level() != NULL ?
Abstract_VM_Version::printable_jdk_debug_level() : "";
st->print_cr("# JRE version: %s (%s) (%sbuild %s)", runtime_name, buf,
jdk_debug_level, runtime_version);
// This is the long version with some default settings added // This is the long version with some default settings added
st->print_cr("# Java VM: %s (%s, %s%s%s%s%s, %s, %s)", st->print_cr("# Java VM: %s (%s%s, %s%s%s%s%s, %s, %s)",
Abstract_VM_Version::vm_name(), Abstract_VM_Version::vm_name(),
jdk_debug_level,
Abstract_VM_Version::vm_release(), Abstract_VM_Version::vm_release(),
Abstract_VM_Version::vm_info_string(), Abstract_VM_Version::vm_info_string(),
TieredCompilation ? ", tiered" : "", TieredCompilation ? ", tiered" : "",