author | chegar |
Thu, 17 Oct 2019 20:54:25 +0100 | |
branch | datagramsocketimpl-branch |
changeset 58679 | 9c3209ff7550 |
parent 58678 | 9cf78a70fa4f |
parent 57975 | a333fdeb8de0 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
54485
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
2 |
* Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. |
1 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
5547
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5542
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5542
diff
changeset
|
20 |
* or visit www.oracle.com if you need additional information or have any |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
5542
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
37430
fd743dadef12
8151939: VM_Version_init() print buffer is too small
coleenp
parents:
35534
diff
changeset
|
26 |
#include "logging/log.hpp" |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
43455
diff
changeset
|
27 |
#include "logging/logStream.hpp" |
7397 | 28 |
#include "oops/oop.inline.hpp" |
29 |
#include "runtime/arguments.hpp" |
|
25715
d5a8dbdc5150
8049325: Introduce and clean up umbrella headers for the files in the cpu subdirectories.
goetz
parents:
25337
diff
changeset
|
30 |
#include "runtime/vm_version.hpp" |
1 | 31 |
|
32 |
const char* Abstract_VM_Version::_s_vm_release = Abstract_VM_Version::vm_release(); |
|
33 |
const char* Abstract_VM_Version::_s_internal_vm_info_string = Abstract_VM_Version::internal_vm_info_string(); |
|
35148 | 34 |
|
35 |
uint64_t Abstract_VM_Version::_features = 0; |
|
36 |
const char* Abstract_VM_Version::_features_string = ""; |
|
37 |
||
1 | 38 |
bool Abstract_VM_Version::_supports_cx8 = false; |
13886
8d82c4dfa722
7023898: Intrinsify AtomicLongFieldUpdater.getAndIncrement()
roland
parents:
11720
diff
changeset
|
39 |
bool Abstract_VM_Version::_supports_atomic_getset4 = false; |
8d82c4dfa722
7023898: Intrinsify AtomicLongFieldUpdater.getAndIncrement()
roland
parents:
11720
diff
changeset
|
40 |
bool Abstract_VM_Version::_supports_atomic_getset8 = false; |
8d82c4dfa722
7023898: Intrinsify AtomicLongFieldUpdater.getAndIncrement()
roland
parents:
11720
diff
changeset
|
41 |
bool Abstract_VM_Version::_supports_atomic_getadd4 = false; |
8d82c4dfa722
7023898: Intrinsify AtomicLongFieldUpdater.getAndIncrement()
roland
parents:
11720
diff
changeset
|
42 |
bool Abstract_VM_Version::_supports_atomic_getadd8 = false; |
1 | 43 |
unsigned int Abstract_VM_Version::_logical_processors_per_package = 1U; |
25633
4cd9c4622c8c
8049717: expose L1_data_cache_line_size for diagnostic/sanity checks
dcubed
parents:
25337
diff
changeset
|
44 |
unsigned int Abstract_VM_Version::_L1_data_cache_line_size = 0; |
57804 | 45 |
unsigned int Abstract_VM_Version::_data_cache_line_flush_size = 0; |
1 | 46 |
|
54485
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
47 |
VirtualizationType Abstract_VM_Version::_detected_virtualization = NoDetectedVirtualization; |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
48 |
|
33957
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
49 |
#ifndef HOTSPOT_VERSION_STRING |
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
50 |
#error HOTSPOT_VERSION_STRING must be defined |
1 | 51 |
#endif |
24238 | 52 |
|
48327 | 53 |
#ifndef VERSION_FEATURE |
54 |
#error VERSION_FEATURE must be defined |
|
24238 | 55 |
#endif |
48327 | 56 |
#ifndef VERSION_INTERIM |
57 |
#error VERSION_INTERIM must be defined |
|
24238 | 58 |
#endif |
48327 | 59 |
#ifndef VERSION_UPDATE |
60 |
#error VERSION_UPDATE must be defined |
|
24238 | 61 |
#endif |
33959
36f534ca18c0
8087202: Add support for PATCH field and remove unused fields of new version string
amurillo
parents:
33957
diff
changeset
|
62 |
#ifndef VERSION_PATCH |
36f534ca18c0
8087202: Add support for PATCH field and remove unused fields of new version string
amurillo
parents:
33957
diff
changeset
|
63 |
#error VERSION_PATCH must be defined |
36f534ca18c0
8087202: Add support for PATCH field and remove unused fields of new version string
amurillo
parents:
33957
diff
changeset
|
64 |
#endif |
33957
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
65 |
#ifndef VERSION_BUILD |
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
66 |
#error VERSION_BUILD must be defined |
24238 | 67 |
#endif |
68 |
||
33957
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
69 |
#ifndef VERSION_STRING |
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
70 |
#error VERSION_STRING must be defined |
1 | 71 |
#endif |
72 |
||
33977
a27f0d8a7861
8139986: Store debug level in java.vm.debug and conditionally print in "java -version"
amurillo
parents:
33976
diff
changeset
|
73 |
#ifndef DEBUG_LEVEL |
a27f0d8a7861
8139986: Store debug level in java.vm.debug and conditionally print in "java -version"
amurillo
parents:
33976
diff
changeset
|
74 |
#error DEBUG_LEVEL must be defined |
a27f0d8a7861
8139986: Store debug level in java.vm.debug and conditionally print in "java -version"
amurillo
parents:
33976
diff
changeset
|
75 |
#endif |
a27f0d8a7861
8139986: Store debug level in java.vm.debug and conditionally print in "java -version"
amurillo
parents:
33976
diff
changeset
|
76 |
|
35183
30271b37bd14
8145400: ProjectCreator broken after JEP 223 changes
ctornqvi
parents:
35075
diff
changeset
|
77 |
#define VM_RELEASE HOTSPOT_VERSION_STRING |
1 | 78 |
|
33957
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
79 |
// HOTSPOT_VERSION_STRING equals the JDK VERSION_STRING (unless overridden |
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
80 |
// in a standalone build). |
48327 | 81 |
int Abstract_VM_Version::_vm_major_version = VERSION_FEATURE; |
82 |
int Abstract_VM_Version::_vm_minor_version = VERSION_INTERIM; |
|
83 |
int Abstract_VM_Version::_vm_security_version = VERSION_UPDATE; |
|
33959
36f534ca18c0
8087202: Add support for PATCH field and remove unused fields of new version string
amurillo
parents:
33957
diff
changeset
|
84 |
int Abstract_VM_Version::_vm_patch_version = VERSION_PATCH; |
33957
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
85 |
int Abstract_VM_Version::_vm_build_number = VERSION_BUILD; |
1 | 86 |
|
87 |
#if defined(_LP64) |
|
88 |
#define VMLP "64-Bit " |
|
89 |
#else |
|
90 |
#define VMLP "" |
|
91 |
#endif |
|
92 |
||
13975
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
93 |
#ifndef VMTYPE |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
94 |
#ifdef TIERED |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
95 |
#define VMTYPE "Server" |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
96 |
#else // TIERED |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
97 |
#ifdef ZERO |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
98 |
#define VMTYPE "Zero" |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
99 |
#else // ZERO |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
100 |
#define VMTYPE COMPILER1_PRESENT("Client") \ |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
101 |
COMPILER2_PRESENT("Server") |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
102 |
#endif // ZERO |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
103 |
#endif // TIERED |
2f7431485cfa
7189254: Change makefiles for more flexibility to override defaults
jprovino
parents:
13886
diff
changeset
|
104 |
#endif |
1 | 105 |
|
106 |
#ifndef HOTSPOT_VM_DISTRO |
|
107 |
#error HOTSPOT_VM_DISTRO must be defined |
|
108 |
#endif |
|
40015
524230a0f4ca
8140723: Remove source code conditionalized on JAVASE_EMBEDDED
dholmes
parents:
40012
diff
changeset
|
109 |
#define VMNAME HOTSPOT_VM_DISTRO " " VMLP VMTYPE " VM" |
1 | 110 |
|
111 |
const char* Abstract_VM_Version::vm_name() { |
|
112 |
return VMNAME; |
|
113 |
} |
|
114 |
||
115 |
||
116 |
const char* Abstract_VM_Version::vm_vendor() { |
|
117 |
#ifdef VENDOR |
|
50680
dd2ebc050e6e
8200115: System property java.vm.vendor value includes quotation marks
erikj
parents:
49166
diff
changeset
|
118 |
return VENDOR; |
1 | 119 |
#else |
25057 | 120 |
return "Oracle Corporation"; |
1 | 121 |
#endif |
122 |
} |
|
123 |
||
124 |
||
125 |
const char* Abstract_VM_Version::vm_info_string() { |
|
126 |
switch (Arguments::mode()) { |
|
127 |
case Arguments::_int: |
|
128 |
return UseSharedSpaces ? "interpreted mode, sharing" : "interpreted mode"; |
|
129 |
case Arguments::_mixed: |
|
42650 | 130 |
if (UseSharedSpaces) { |
43455
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
131 |
if (UseAOT) { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
132 |
return "mixed mode, aot, sharing"; |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
133 |
#ifdef TIERED |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
134 |
} else if(is_client_compilation_mode_vm()) { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
135 |
return "mixed mode, emulated-client, sharing"; |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
136 |
#endif |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
137 |
} else { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
138 |
return "mixed mode, sharing"; |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
139 |
} |
42650 | 140 |
} else { |
141 |
if (UseAOT) { |
|
142 |
return "mixed mode, aot"; |
|
43455
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
143 |
#ifdef TIERED |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
144 |
} else if(is_client_compilation_mode_vm()) { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
145 |
return "mixed mode, emulated-client"; |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
146 |
#endif |
42650 | 147 |
} else { |
148 |
return "mixed mode"; |
|
149 |
} |
|
150 |
} |
|
1 | 151 |
case Arguments::_comp: |
43455
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
152 |
#ifdef TIERED |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
153 |
if (is_client_compilation_mode_vm()) { |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
154 |
return UseSharedSpaces ? "compiled mode, emulated-client, sharing" : "compiled mode, emulated-client"; |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
155 |
} |
96560cffef4d
8166002: Emulate client build on platforms with reduced virtual address space
jcm
parents:
42664
diff
changeset
|
156 |
#endif |
1 | 157 |
return UseSharedSpaces ? "compiled mode, sharing" : "compiled mode"; |
158 |
}; |
|
159 |
ShouldNotReachHere(); |
|
160 |
return ""; |
|
161 |
} |
|
162 |
||
163 |
// NOTE: do *not* use stringStream. this function is called by |
|
164 |
// fatal error handler. if the crash is in native thread, |
|
165 |
// stringStream cannot get resource allocated and will SEGV. |
|
166 |
const char* Abstract_VM_Version::vm_release() { |
|
167 |
return VM_RELEASE; |
|
168 |
} |
|
169 |
||
11720
b20268d74484
7132779: build-infra merge: Enable ccache to work for most developer builds.
ohrstrom
parents:
10738
diff
changeset
|
170 |
// NOTE: do *not* use stringStream. this function is called by |
b20268d74484
7132779: build-infra merge: Enable ccache to work for most developer builds.
ohrstrom
parents:
10738
diff
changeset
|
171 |
// fatal error handlers. if the crash is in native thread, |
b20268d74484
7132779: build-infra merge: Enable ccache to work for most developer builds.
ohrstrom
parents:
10738
diff
changeset
|
172 |
// stringStream cannot get resource allocated and will SEGV. |
b20268d74484
7132779: build-infra merge: Enable ccache to work for most developer builds.
ohrstrom
parents:
10738
diff
changeset
|
173 |
const char* Abstract_VM_Version::jre_release_version() { |
33957
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
174 |
return VERSION_STRING; |
11720
b20268d74484
7132779: build-infra merge: Enable ccache to work for most developer builds.
ohrstrom
parents:
10738
diff
changeset
|
175 |
} |
b20268d74484
7132779: build-infra merge: Enable ccache to work for most developer builds.
ohrstrom
parents:
10738
diff
changeset
|
176 |
|
1 | 177 |
#define OS LINUX_ONLY("linux") \ |
178 |
WINDOWS_ONLY("windows") \ |
|
10565 | 179 |
SOLARIS_ONLY("solaris") \ |
22827 | 180 |
AIX_ONLY("aix") \ |
10565 | 181 |
BSD_ONLY("bsd") |
1 | 182 |
|
29474
81a5c5330d08
8072383: resolve conflicts between open and closed ports
dlong
parents:
29180
diff
changeset
|
183 |
#ifndef CPU |
4013 | 184 |
#ifdef ZERO |
185 |
#define CPU ZERO_LIBARCH |
|
35075
ca79cbf3f106
8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
asmundak
parents:
33977
diff
changeset
|
186 |
#elif defined(PPC64) |
ca79cbf3f106
8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
asmundak
parents:
33977
diff
changeset
|
187 |
#if defined(VM_LITTLE_ENDIAN) |
ca79cbf3f106
8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
asmundak
parents:
33977
diff
changeset
|
188 |
#define CPU "ppc64le" |
ca79cbf3f106
8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
asmundak
parents:
33977
diff
changeset
|
189 |
#else |
ca79cbf3f106
8073139: PPC64: User-visible arch directory and os.arch value on ppc64le cause issues with Java tooling
asmundak
parents:
33977
diff
changeset
|
190 |
#define CPU "ppc64" |
42062 | 191 |
#endif // PPC64 |
4013 | 192 |
#else |
42062 | 193 |
#define CPU AARCH64_ONLY("aarch64") \ |
1 | 194 |
AMD64_ONLY("amd64") \ |
42062 | 195 |
IA32_ONLY("x86") \ |
196 |
IA64_ONLY("ia64") \ |
|
197 |
S390_ONLY("s390") \ |
|
1 | 198 |
SPARC_ONLY("sparc") |
42062 | 199 |
#endif // !ZERO |
200 |
#endif // !CPU |
|
1 | 201 |
|
202 |
const char *Abstract_VM_Version::vm_platform_string() { |
|
203 |
return OS "-" CPU; |
|
204 |
} |
|
205 |
||
206 |
const char* Abstract_VM_Version::internal_vm_info_string() { |
|
207 |
#ifndef HOTSPOT_BUILD_USER |
|
208 |
#define HOTSPOT_BUILD_USER unknown |
|
209 |
#endif |
|
210 |
||
211 |
#ifndef HOTSPOT_BUILD_COMPILER |
|
212 |
#ifdef _MSC_VER |
|
25052
66e77563d9e7
8043492: ad_x86_64_misc.obj : error LNK2011: precompiled object not linked in; image may not run
ctornqvi
parents:
24424
diff
changeset
|
213 |
#if _MSC_VER == 1600 |
16358
ebf30634b326
8010116: Abstract_VM_Version::internal_vm_info_string() should recognize VS2010 and VS2012
kmo
parents:
15432
diff
changeset
|
214 |
#define HOTSPOT_BUILD_COMPILER "MS VC++ 10.0 (VS2010)" |
ebf30634b326
8010116: Abstract_VM_Version::internal_vm_info_string() should recognize VS2010 and VS2012
kmo
parents:
15432
diff
changeset
|
215 |
#elif _MSC_VER == 1700 |
ebf30634b326
8010116: Abstract_VM_Version::internal_vm_info_string() should recognize VS2010 and VS2012
kmo
parents:
15432
diff
changeset
|
216 |
#define HOTSPOT_BUILD_COMPILER "MS VC++ 11.0 (VS2012)" |
25052
66e77563d9e7
8043492: ad_x86_64_misc.obj : error LNK2011: precompiled object not linked in; image may not run
ctornqvi
parents:
24424
diff
changeset
|
217 |
#elif _MSC_VER == 1800 |
66e77563d9e7
8043492: ad_x86_64_misc.obj : error LNK2011: precompiled object not linked in; image may not run
ctornqvi
parents:
24424
diff
changeset
|
218 |
#define HOTSPOT_BUILD_COMPILER "MS VC++ 12.0 (VS2013)" |
49166
2879dad8d4ec
8198312: VS2017: Upgrade HOTSPOT_BUILD_COMPILER in vm_version.cpp
lfoltan
parents:
48327
diff
changeset
|
219 |
#elif _MSC_VER == 1900 |
2879dad8d4ec
8198312: VS2017: Upgrade HOTSPOT_BUILD_COMPILER in vm_version.cpp
lfoltan
parents:
48327
diff
changeset
|
220 |
#define HOTSPOT_BUILD_COMPILER "MS VC++ 14.0 (VS2015)" |
52101
5fcf63f0d86c
8211714: Need to update vm_version.cpp to recognise VS2017 minor versions
kevinw
parents:
51898
diff
changeset
|
221 |
#elif _MSC_VER == 1911 |
5fcf63f0d86c
8211714: Need to update vm_version.cpp to recognise VS2017 minor versions
kevinw
parents:
51898
diff
changeset
|
222 |
#define HOTSPOT_BUILD_COMPILER "MS VC++ 15.3 (VS2017)" |
49166
2879dad8d4ec
8198312: VS2017: Upgrade HOTSPOT_BUILD_COMPILER in vm_version.cpp
lfoltan
parents:
48327
diff
changeset
|
223 |
#elif _MSC_VER == 1912 |
2879dad8d4ec
8198312: VS2017: Upgrade HOTSPOT_BUILD_COMPILER in vm_version.cpp
lfoltan
parents:
48327
diff
changeset
|
224 |
#define HOTSPOT_BUILD_COMPILER "MS VC++ 15.5 (VS2017)" |
51898
293c2728644c
8211124: HotSpot update for vm_version.cpp to recognise updated VS2017
kevinw
parents:
50680
diff
changeset
|
225 |
#elif _MSC_VER == 1913 |
293c2728644c
8211124: HotSpot update for vm_version.cpp to recognise updated VS2017
kevinw
parents:
50680
diff
changeset
|
226 |
#define HOTSPOT_BUILD_COMPILER "MS VC++ 15.6 (VS2017)" |
52101
5fcf63f0d86c
8211714: Need to update vm_version.cpp to recognise VS2017 minor versions
kevinw
parents:
51898
diff
changeset
|
227 |
#elif _MSC_VER == 1914 |
5fcf63f0d86c
8211714: Need to update vm_version.cpp to recognise VS2017 minor versions
kevinw
parents:
51898
diff
changeset
|
228 |
#define HOTSPOT_BUILD_COMPILER "MS VC++ 15.7 (VS2017)" |
5fcf63f0d86c
8211714: Need to update vm_version.cpp to recognise VS2017 minor versions
kevinw
parents:
51898
diff
changeset
|
229 |
#elif _MSC_VER == 1915 |
5fcf63f0d86c
8211714: Need to update vm_version.cpp to recognise VS2017 minor versions
kevinw
parents:
51898
diff
changeset
|
230 |
#define HOTSPOT_BUILD_COMPILER "MS VC++ 15.8 (VS2017)" |
1 | 231 |
#else |
232 |
#define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER) |
|
233 |
#endif |
|
234 |
#elif defined(__SUNPRO_CC) |
|
53723
f31dad87f661
8218562: handle HOTSPOT_BUILD_COMPILER for clang/xlclang and cleanup HOTSPOT_BUILD_COMPILER settings
mbaesken
parents:
52904
diff
changeset
|
235 |
#if __SUNPRO_CC == 0x580 |
1 | 236 |
#define HOTSPOT_BUILD_COMPILER "Workshop 5.8" |
237 |
#elif __SUNPRO_CC == 0x590 |
|
238 |
#define HOTSPOT_BUILD_COMPILER "Workshop 5.9" |
|
5542
be05c5ffe905
6951319: enable solaris builds using Sun Studio 12 update 1
jcoomes
parents:
4013
diff
changeset
|
239 |
#elif __SUNPRO_CC == 0x5100 |
be05c5ffe905
6951319: enable solaris builds using Sun Studio 12 update 1
jcoomes
parents:
4013
diff
changeset
|
240 |
#define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1" |
19328
544e1a8278a8
8023287: HOTSPOT_BUILD_COMPILER needs to support "Sun Studio 12u3"
dcubed
parents:
16358
diff
changeset
|
241 |
#elif __SUNPRO_CC == 0x5120 |
544e1a8278a8
8023287: HOTSPOT_BUILD_COMPILER needs to support "Sun Studio 12u3"
dcubed
parents:
16358
diff
changeset
|
242 |
#define HOTSPOT_BUILD_COMPILER "Sun Studio 12u3" |
35485
9ee1d7aba342
8146855: Update hotspot sources to recognize Solaris Studio 12u4 compiler
dholmes
parents:
35183
diff
changeset
|
243 |
#elif __SUNPRO_CC == 0x5130 |
9ee1d7aba342
8146855: Update hotspot sources to recognize Solaris Studio 12u4 compiler
dholmes
parents:
35183
diff
changeset
|
244 |
#define HOTSPOT_BUILD_COMPILER "Sun Studio 12u4" |
1 | 245 |
#else |
246 |
#define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC) |
|
247 |
#endif |
|
53723
f31dad87f661
8218562: handle HOTSPOT_BUILD_COMPILER for clang/xlclang and cleanup HOTSPOT_BUILD_COMPILER settings
mbaesken
parents:
52904
diff
changeset
|
248 |
#elif defined(__clang_version__) |
f31dad87f661
8218562: handle HOTSPOT_BUILD_COMPILER for clang/xlclang and cleanup HOTSPOT_BUILD_COMPILER settings
mbaesken
parents:
52904
diff
changeset
|
249 |
#define HOTSPOT_BUILD_COMPILER "clang " __VERSION__ |
1 | 250 |
#elif defined(__GNUC__) |
251 |
#define HOTSPOT_BUILD_COMPILER "gcc " __VERSION__ |
|
252 |
#else |
|
253 |
#define HOTSPOT_BUILD_COMPILER "unknown compiler" |
|
254 |
#endif |
|
255 |
#endif |
|
256 |
||
8107
78e5bd944384
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
7397
diff
changeset
|
257 |
#ifndef FLOAT_ARCH |
78e5bd944384
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
7397
diff
changeset
|
258 |
#if defined(__SOFTFP__) |
14572
62c896e036da
8003591: Abstract_VM_Version::internal_vm_info_string needs to stringify FLOAT_ARCH for ease of use
dholmes
parents:
13977
diff
changeset
|
259 |
#define FLOAT_ARCH_STR "-sflt" |
8107
78e5bd944384
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
7397
diff
changeset
|
260 |
#else |
14572
62c896e036da
8003591: Abstract_VM_Version::internal_vm_info_string needs to stringify FLOAT_ARCH for ease of use
dholmes
parents:
13977
diff
changeset
|
261 |
#define FLOAT_ARCH_STR "" |
8107
78e5bd944384
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
7397
diff
changeset
|
262 |
#endif |
14572
62c896e036da
8003591: Abstract_VM_Version::internal_vm_info_string needs to stringify FLOAT_ARCH for ease of use
dholmes
parents:
13977
diff
changeset
|
263 |
#else |
62c896e036da
8003591: Abstract_VM_Version::internal_vm_info_string needs to stringify FLOAT_ARCH for ease of use
dholmes
parents:
13977
diff
changeset
|
264 |
#define FLOAT_ARCH_STR XSTR(FLOAT_ARCH) |
8107
78e5bd944384
7016023: Enable building ARM and PPC from src/closed repository
bobv
parents:
7397
diff
changeset
|
265 |
#endif |
1 | 266 |
|
35453
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
267 |
#define INTERNAL_VERSION_SUFFIX VM_RELEASE ")" \ |
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
268 |
" for " OS "-" CPU FLOAT_ARCH_STR \ |
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
269 |
" JRE (" VERSION_STRING "), built on " __DATE__ " " __TIME__ \ |
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
270 |
" by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER |
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
271 |
|
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
272 |
return strcmp(DEBUG_LEVEL, "release") == 0 |
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
273 |
? VMNAME " (" INTERNAL_VERSION_SUFFIX |
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
274 |
: VMNAME " (" DEBUG_LEVEL " " INTERNAL_VERSION_SUFFIX; |
1 | 275 |
} |
276 |
||
8114
340b5b8b544b
7003401: Implement VM error-reporting functionality on erroneous termination
kamg
parents:
8107
diff
changeset
|
277 |
const char *Abstract_VM_Version::vm_build_user() { |
340b5b8b544b
7003401: Implement VM error-reporting functionality on erroneous termination
kamg
parents:
8107
diff
changeset
|
278 |
return HOTSPOT_BUILD_USER; |
340b5b8b544b
7003401: Implement VM error-reporting functionality on erroneous termination
kamg
parents:
8107
diff
changeset
|
279 |
} |
340b5b8b544b
7003401: Implement VM error-reporting functionality on erroneous termination
kamg
parents:
8107
diff
changeset
|
280 |
|
33977
a27f0d8a7861
8139986: Store debug level in java.vm.debug and conditionally print in "java -version"
amurillo
parents:
33976
diff
changeset
|
281 |
const char *Abstract_VM_Version::jdk_debug_level() { |
a27f0d8a7861
8139986: Store debug level in java.vm.debug and conditionally print in "java -version"
amurillo
parents:
33976
diff
changeset
|
282 |
return DEBUG_LEVEL; |
a27f0d8a7861
8139986: Store debug level in java.vm.debug and conditionally print in "java -version"
amurillo
parents:
33976
diff
changeset
|
283 |
} |
a27f0d8a7861
8139986: Store debug level in java.vm.debug and conditionally print in "java -version"
amurillo
parents:
33976
diff
changeset
|
284 |
|
35453
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
285 |
const char *Abstract_VM_Version::printable_jdk_debug_level() { |
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
286 |
// Debug level is not printed for "release" builds |
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
287 |
return strcmp(DEBUG_LEVEL, "release") == 0 ? "" : DEBUG_LEVEL " "; |
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
288 |
} |
d164ee5260a6
8146653: Debug version missing in hs_err files and on internal version after Verona
amurillo
parents:
35232
diff
changeset
|
289 |
|
1 | 290 |
unsigned int Abstract_VM_Version::jvm_version() { |
291 |
return ((Abstract_VM_Version::vm_major_version() & 0xFF) << 24) | |
|
292 |
((Abstract_VM_Version::vm_minor_version() & 0xFF) << 16) | |
|
33957
39113ae98993
8085822: JEP 223: New Version-String Scheme (initial integration)
ihse
parents:
30585
diff
changeset
|
293 |
((Abstract_VM_Version::vm_security_version() & 0xFF) << 8) | |
1 | 294 |
(Abstract_VM_Version::vm_build_number() & 0xFF); |
295 |
} |
|
296 |
||
297 |
void VM_Version_init() { |
|
298 |
VM_Version::initialize(); |
|
299 |
||
37430
fd743dadef12
8151939: VM_Version_init() print buffer is too small
coleenp
parents:
35534
diff
changeset
|
300 |
if (log_is_enabled(Info, os, cpu)) { |
fd743dadef12
8151939: VM_Version_init() print buffer is too small
coleenp
parents:
35534
diff
changeset
|
301 |
char buf[1024]; |
fd743dadef12
8151939: VM_Version_init() print buffer is too small
coleenp
parents:
35534
diff
changeset
|
302 |
ResourceMark rm; |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
43455
diff
changeset
|
303 |
LogStream ls(Log(os, cpu)::info()); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
43455
diff
changeset
|
304 |
os::print_cpu_info(&ls, buf, sizeof(buf)); |
1 | 305 |
} |
306 |
} |
|
54485
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
307 |
|
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
308 |
bool Abstract_VM_Version::print_matching_lines_from_file(const char* filename, outputStream* st, const char* keywords_to_match[]) { |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
309 |
char line[500]; |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
310 |
FILE* fp = fopen(filename, "r"); |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
311 |
if (fp == NULL) { |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
312 |
return false; |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
313 |
} |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
314 |
|
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
315 |
st->print_cr("Virtualization information:"); |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
316 |
while (fgets(line, sizeof(line), fp) != NULL) { |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
317 |
int i = 0; |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
318 |
while (keywords_to_match[i] != NULL) { |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
319 |
if (strncmp(line, keywords_to_match[i], strlen(keywords_to_match[i])) == 0) { |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
320 |
st->print("%s", line); |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
321 |
break; |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
322 |
} |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
323 |
i++; |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
324 |
} |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
325 |
} |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
326 |
fclose(fp); |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
327 |
return true; |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
328 |
} |
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
329 |
|
ddc19ea5059c
8219241: Provide basic virtualization related info in the hs_error file on linux/windows x86_64
mbaesken
parents:
53723
diff
changeset
|
330 |