Print this page
rev 6314 : 8030011: Update Hotspot version string output
Reviewed-by: dholmes, jcoomes, kvn
| Split |
Split |
Close |
| Expand all |
| Collapse all |
--- old/src/share/vm/runtime/vm_version.hpp
+++ new/src/share/vm/runtime/vm_version.hpp
1 1 /*
2 2 * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
19 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 20 * or visit www.oracle.com if you need additional information or have any
21 21 * questions.
22 22 *
23 23 */
24 24
25 25 #ifndef SHARE_VM_RUNTIME_VM_VERSION_HPP
26 26 #define SHARE_VM_RUNTIME_VM_VERSION_HPP
27 27
28 28 #include "memory/allocation.hpp"
29 29 #include "utilities/ostream.hpp"
30 30
31 31 // VM_Version provides information about the VM.
32 32
33 33 class Abstract_VM_Version: AllStatic {
34 34 protected:
35 35 friend class VMStructs;
36 36 static const char* _s_vm_release;
|
↓ open down ↓ |
36 lines elided |
↑ open up ↑ |
37 37 static const char* _s_internal_vm_info_string;
38 38 // These are set by machine-dependent initializations
39 39 static bool _supports_cx8;
40 40 static bool _supports_atomic_getset4;
41 41 static bool _supports_atomic_getset8;
42 42 static bool _supports_atomic_getadd4;
43 43 static bool _supports_atomic_getadd8;
44 44 static unsigned int _logical_processors_per_package;
45 45 static int _vm_major_version;
46 46 static int _vm_minor_version;
47 + static int _vm_micro_version;
47 48 static int _vm_build_number;
48 49 static bool _initialized;
49 50 static int _parallel_worker_threads;
50 51 static bool _parallel_worker_threads_initialized;
51 52 static int _reserve_for_allocation_prefetch;
52 53
53 54 static unsigned int nof_parallel_worker_threads(unsigned int num,
54 55 unsigned int dem,
55 56 unsigned int switch_pt);
56 57 public:
57 58 static void initialize();
58 59
59 60 // Name
60 61 static const char* vm_name();
|
↓ open down ↓ |
4 lines elided |
↑ open up ↑ |
61 62 // Vendor
62 63 static const char* vm_vendor();
63 64 // VM version information string printed by launcher (java -version)
64 65 static const char* vm_info_string();
65 66 static const char* vm_release();
66 67 static const char* vm_platform_string();
67 68 static const char* vm_build_user();
68 69
69 70 static int vm_major_version() { assert(_initialized, "not initialized"); return _vm_major_version; }
70 71 static int vm_minor_version() { assert(_initialized, "not initialized"); return _vm_minor_version; }
72 + static int vm_micro_version() { assert(_initialized, "not initialized"); return _vm_micro_version; }
71 73 static int vm_build_number() { assert(_initialized, "not initialized"); return _vm_build_number; }
72 74
73 75 // Gets the jvm_version_info.jvm_version defined in jvm.h
74 76 static unsigned int jvm_version();
75 77
76 78 // Internal version providing additional build information
77 79 static const char* internal_vm_info_string();
78 80 static const char* jre_release_version();
79 81
80 82 // does HW support an 8-byte compare-exchange operation?
81 83 static bool supports_cx8() {
82 84 #ifdef SUPPORTS_NATIVE_CX8
83 85 return true;
84 86 #else
85 87 return _supports_cx8;
86 88 #endif
87 89 }
88 90 // does HW support atomic get-and-set or atomic get-and-add? Used
89 91 // to guide intrinsification decisions for Unsafe atomic ops
90 92 static bool supports_atomic_getset4() {return _supports_atomic_getset4;}
91 93 static bool supports_atomic_getset8() {return _supports_atomic_getset8;}
92 94 static bool supports_atomic_getadd4() {return _supports_atomic_getadd4;}
93 95 static bool supports_atomic_getadd8() {return _supports_atomic_getadd8;}
94 96
95 97 static unsigned int logical_processors_per_package() {
96 98 return _logical_processors_per_package;
97 99 }
98 100
99 101 // Need a space at the end of TLAB for prefetch instructions
100 102 // which may fault when accessing memory outside of heap.
101 103 static int reserve_for_allocation_prefetch() {
102 104 return _reserve_for_allocation_prefetch;
103 105 }
104 106
105 107 // ARCH specific policy for the BiasedLocking
106 108 static bool use_biased_locking() { return true; }
107 109
108 110 // Number of page sizes efficiently supported by the hardware. Most chips now
109 111 // support two sizes, thus this default implementation. Processor-specific
110 112 // subclasses should define new versions to hide this one as needed. Note
111 113 // that the O/S may support more sizes, but at most this many are used.
112 114 static uint page_size_count() { return 2; }
113 115
114 116 // Returns the number of parallel threads to be used for VM
115 117 // work. If that number has not been calculated, do so and
116 118 // save it. Returns ParallelGCThreads if it is set on the
117 119 // command line.
118 120 static unsigned int parallel_worker_threads();
119 121 // Calculates and returns the number of parallel threads. May
120 122 // be VM version specific.
121 123 static unsigned int calc_parallel_worker_threads();
122 124 };
123 125
124 126 #endif // SHARE_VM_RUNTIME_VM_VERSION_HPP
|
↓ open down ↓ |
44 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX