author | ccheung |
Fri, 29 Sep 2017 10:11:01 -0700 | |
changeset 47564 | 25ef5e64fd71 |
parent 47216 | 71c04702a3d5 |
child 47673 | 6126617b8508 |
permissions | -rw-r--r-- |
1 | 1 |
/* |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
42876
diff
changeset
|
2 |
* Copyright (c) 1997, 2017, 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:
4736
diff
changeset
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
f4b087cbb361
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
4736
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:
4736
diff
changeset
|
21 |
* questions. |
1 | 22 |
* |
23 |
*/ |
|
24 |
||
7397 | 25 |
#include "precompiled.hpp" |
26 |
#include "classfile/classFileStream.hpp" |
|
27 |
#include "classfile/classLoader.hpp" |
|
30764 | 28 |
#include "classfile/classLoaderData.inline.hpp" |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
29 |
#include "classfile/classLoaderExt.hpp" |
7397 | 30 |
#include "classfile/javaClasses.hpp" |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
31 |
#include "classfile/jimage.hpp" |
36508 | 32 |
#include "classfile/moduleEntry.hpp" |
33 |
#include "classfile/modules.hpp" |
|
34 |
#include "classfile/packageEntry.hpp" |
|
34666 | 35 |
#include "classfile/klassFactory.hpp" |
7397 | 36 |
#include "classfile/systemDictionary.hpp" |
37 |
#include "classfile/vmSymbols.hpp" |
|
38 |
#include "compiler/compileBroker.hpp" |
|
30764 | 39 |
#include "gc/shared/collectedHeap.inline.hpp" |
40 |
#include "gc/shared/generation.hpp" |
|
7397 | 41 |
#include "interpreter/bytecodeStream.hpp" |
42 |
#include "interpreter/oopMapCache.hpp" |
|
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46560
diff
changeset
|
43 |
#include "logging/log.hpp" |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46560
diff
changeset
|
44 |
#include "logging/logStream.hpp" |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
45 |
#include "logging/logTag.hpp" |
7397 | 46 |
#include "memory/allocation.inline.hpp" |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
47 |
#include "memory/filemap.hpp" |
7397 | 48 |
#include "memory/oopFactory.hpp" |
37248 | 49 |
#include "memory/resourceArea.hpp" |
7397 | 50 |
#include "memory/universe.inline.hpp" |
51 |
#include "oops/instanceKlass.hpp" |
|
52 |
#include "oops/instanceRefKlass.hpp" |
|
35498
392b50de06c6
8146401: Clean up oop.hpp: add inline directives and fix header files
goetz
parents:
34666
diff
changeset
|
53 |
#include "oops/objArrayOop.inline.hpp" |
7397 | 54 |
#include "oops/oop.inline.hpp" |
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7910
diff
changeset
|
55 |
#include "oops/symbol.hpp" |
46560
388aa8d67c80
8181449: Fix debug.hpp / globalDefinitions.hpp dependency inversion
kbarrett
parents:
46495
diff
changeset
|
56 |
#include "prims/jvm.h" |
7397 | 57 |
#include "prims/jvm_misc.hpp" |
58 |
#include "runtime/arguments.hpp" |
|
59 |
#include "runtime/compilationPolicy.hpp" |
|
60 |
#include "runtime/handles.hpp" |
|
61 |
#include "runtime/handles.inline.hpp" |
|
62 |
#include "runtime/init.hpp" |
|
63 |
#include "runtime/interfaceSupport.hpp" |
|
64 |
#include "runtime/java.hpp" |
|
65 |
#include "runtime/javaCalls.hpp" |
|
25468
5331df506290
8048241: Introduce umbrella header os.inline.hpp and clean up includes
goetz
parents:
25057
diff
changeset
|
66 |
#include "runtime/os.hpp" |
7397 | 67 |
#include "runtime/threadCritical.hpp" |
68 |
#include "runtime/timer.hpp" |
|
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
69 |
#include "runtime/vm_version.hpp" |
7397 | 70 |
#include "services/management.hpp" |
71 |
#include "services/threadService.hpp" |
|
72 |
#include "utilities/events.hpp" |
|
73 |
#include "utilities/hashtable.inline.hpp" |
|
27683
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27025
diff
changeset
|
74 |
#include "utilities/macros.hpp" |
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27025
diff
changeset
|
75 |
#if INCLUDE_CDS |
30764 | 76 |
#include "classfile/sharedClassUtil.hpp" |
27683
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27025
diff
changeset
|
77 |
#include "classfile/sharedPathsMiscInfo.hpp" |
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27025
diff
changeset
|
78 |
#endif |
1d5707553fff
8064580: Move INCLUDE_CDS include section to the end of the include list
stefank
parents:
27025
diff
changeset
|
79 |
|
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
80 |
// Entry points in zip.dll for loading zip/jar file entries |
1 | 81 |
|
82 |
typedef void * * (JNICALL *ZipOpen_t)(const char *name, char **pmsg); |
|
83 |
typedef void (JNICALL *ZipClose_t)(jzfile *zip); |
|
84 |
typedef jzentry* (JNICALL *FindEntry_t)(jzfile *zip, const char *name, jint *sizeP, jint *nameLen); |
|
85 |
typedef jboolean (JNICALL *ReadEntry_t)(jzfile *zip, jzentry *entry, unsigned char *buf, char *namebuf); |
|
86 |
typedef jzentry* (JNICALL *GetNextEntry_t)(jzfile *zip, jint n); |
|
27562 | 87 |
typedef jboolean (JNICALL *ZipInflateFully_t)(void *inBuf, jlong inLen, void *outBuf, jlong outLen, char **pmsg); |
27025 | 88 |
typedef jint (JNICALL *Crc32_t)(jint crc, const jbyte *buf, jint len); |
1 | 89 |
|
90 |
static ZipOpen_t ZipOpen = NULL; |
|
91 |
static ZipClose_t ZipClose = NULL; |
|
92 |
static FindEntry_t FindEntry = NULL; |
|
93 |
static ReadEntry_t ReadEntry = NULL; |
|
94 |
static GetNextEntry_t GetNextEntry = NULL; |
|
95 |
static canonicalize_fn_t CanonicalizeEntry = NULL; |
|
27562 | 96 |
static ZipInflateFully_t ZipInflateFully = NULL; |
27025 | 97 |
static Crc32_t Crc32 = NULL; |
1 | 98 |
|
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
99 |
// Entry points for jimage.dll for loading jimage file entries |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
100 |
|
37490
fd089d3f8cb3
8147634: Need a JImage API that given a JImageLocationRef returns class name
jlaskey
parents:
37418
diff
changeset
|
101 |
static JImageOpen_t JImageOpen = NULL; |
fd089d3f8cb3
8147634: Need a JImage API that given a JImageLocationRef returns class name
jlaskey
parents:
37418
diff
changeset
|
102 |
static JImageClose_t JImageClose = NULL; |
fd089d3f8cb3
8147634: Need a JImage API that given a JImageLocationRef returns class name
jlaskey
parents:
37418
diff
changeset
|
103 |
static JImagePackageToModule_t JImagePackageToModule = NULL; |
fd089d3f8cb3
8147634: Need a JImage API that given a JImageLocationRef returns class name
jlaskey
parents:
37418
diff
changeset
|
104 |
static JImageFindResource_t JImageFindResource = NULL; |
fd089d3f8cb3
8147634: Need a JImage API that given a JImageLocationRef returns class name
jlaskey
parents:
37418
diff
changeset
|
105 |
static JImageGetResource_t JImageGetResource = NULL; |
fd089d3f8cb3
8147634: Need a JImage API that given a JImageLocationRef returns class name
jlaskey
parents:
37418
diff
changeset
|
106 |
static JImageResourceIterator_t JImageResourceIterator = NULL; |
fd089d3f8cb3
8147634: Need a JImage API that given a JImageLocationRef returns class name
jlaskey
parents:
37418
diff
changeset
|
107 |
static JImage_ResourcePath_t JImageResourcePath = NULL; |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
108 |
|
1 | 109 |
// Globals |
110 |
||
111 |
PerfCounter* ClassLoader::_perf_accumulated_time = NULL; |
|
112 |
PerfCounter* ClassLoader::_perf_classes_inited = NULL; |
|
113 |
PerfCounter* ClassLoader::_perf_class_init_time = NULL; |
|
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
114 |
PerfCounter* ClassLoader::_perf_class_init_selftime = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
115 |
PerfCounter* ClassLoader::_perf_classes_verified = NULL; |
1 | 116 |
PerfCounter* ClassLoader::_perf_class_verify_time = NULL; |
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
117 |
PerfCounter* ClassLoader::_perf_class_verify_selftime = NULL; |
1 | 118 |
PerfCounter* ClassLoader::_perf_classes_linked = NULL; |
119 |
PerfCounter* ClassLoader::_perf_class_link_time = NULL; |
|
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
120 |
PerfCounter* ClassLoader::_perf_class_link_selftime = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
121 |
PerfCounter* ClassLoader::_perf_class_parse_time = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
122 |
PerfCounter* ClassLoader::_perf_class_parse_selftime = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
123 |
PerfCounter* ClassLoader::_perf_sys_class_lookup_time = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
124 |
PerfCounter* ClassLoader::_perf_shared_classload_time = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
125 |
PerfCounter* ClassLoader::_perf_sys_classload_time = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
126 |
PerfCounter* ClassLoader::_perf_app_classload_time = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
127 |
PerfCounter* ClassLoader::_perf_app_classload_selftime = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
128 |
PerfCounter* ClassLoader::_perf_app_classload_count = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
129 |
PerfCounter* ClassLoader::_perf_define_appclasses = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
130 |
PerfCounter* ClassLoader::_perf_define_appclass_time = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
131 |
PerfCounter* ClassLoader::_perf_define_appclass_selftime = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
132 |
PerfCounter* ClassLoader::_perf_app_classfile_bytes_read = NULL; |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
133 |
PerfCounter* ClassLoader::_perf_sys_classfile_bytes_read = NULL; |
1 | 134 |
PerfCounter* ClassLoader::_sync_systemLoaderLockContentionRate = NULL; |
135 |
PerfCounter* ClassLoader::_sync_nonSystemLoaderLockContentionRate = NULL; |
|
136 |
PerfCounter* ClassLoader::_sync_JVMFindLoadedClassLockFreeCounter = NULL; |
|
137 |
PerfCounter* ClassLoader::_sync_JVMDefineClassLockFreeCounter = NULL; |
|
138 |
PerfCounter* ClassLoader::_sync_JNIDefineClassLockFreeCounter = NULL; |
|
139 |
PerfCounter* ClassLoader::_unsafe_defineClassCallCounter = NULL; |
|
140 |
PerfCounter* ClassLoader::_isUnsyncloadClass = NULL; |
|
141 |
PerfCounter* ClassLoader::_load_instance_class_failCounter = NULL; |
|
142 |
||
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
143 |
GrowableArray<ModuleClassPathList*>* ClassLoader::_patch_mod_entries = NULL; |
40013 | 144 |
GrowableArray<ModuleClassPathList*>* ClassLoader::_exploded_entries = NULL; |
145 |
ClassPathEntry* ClassLoader::_jrt_entry = NULL; |
|
146 |
ClassPathEntry* ClassLoader::_first_append_entry = NULL; |
|
147 |
ClassPathEntry* ClassLoader::_last_append_entry = NULL; |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
148 |
int ClassLoader::_num_entries = 0; |
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
149 |
int ClassLoader::_num_boot_entries = -1; |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
150 |
#if INCLUDE_CDS |
36508 | 151 |
GrowableArray<char*>* ClassLoader::_boot_modules_array = NULL; |
152 |
GrowableArray<char*>* ClassLoader::_platform_modules_array = NULL; |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
153 |
SharedPathsMiscInfo* ClassLoader::_shared_paths_misc_info = NULL; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
154 |
#endif |
36508 | 155 |
|
1 | 156 |
// helper routines |
157 |
bool string_starts_with(const char* str, const char* str_to_find) { |
|
158 |
size_t str_len = strlen(str); |
|
159 |
size_t str_to_find_len = strlen(str_to_find); |
|
160 |
if (str_to_find_len > str_len) { |
|
161 |
return false; |
|
162 |
} |
|
163 |
return (strncmp(str, str_to_find, str_to_find_len) == 0); |
|
164 |
} |
|
165 |
||
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
166 |
static const char* get_jimage_version_string() { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
167 |
static char version_string[10] = ""; |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
168 |
if (version_string[0] == '\0') { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
169 |
jio_snprintf(version_string, sizeof(version_string), "%d.%d", |
33973 | 170 |
Abstract_VM_Version::vm_major_version(), Abstract_VM_Version::vm_minor_version()); |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
171 |
} |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
172 |
return (const char*)version_string; |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
173 |
} |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
174 |
|
36508 | 175 |
bool ClassLoader::string_ends_with(const char* str, const char* str_to_find) { |
1 | 176 |
size_t str_len = strlen(str); |
177 |
size_t str_to_find_len = strlen(str_to_find); |
|
178 |
if (str_to_find_len > str_len) { |
|
179 |
return false; |
|
180 |
} |
|
181 |
return (strncmp(str + (str_len - str_to_find_len), str_to_find, str_to_find_len) == 0); |
|
182 |
} |
|
183 |
||
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
184 |
// Used to obtain the package name from a fully qualified class name. |
39216
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
185 |
// It is the responsibility of the caller to establish a ResourceMark. |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
186 |
const char* ClassLoader::package_from_name(const char* const class_name, bool* bad_class_name) { |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
187 |
if (class_name == NULL) { |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
188 |
if (bad_class_name != NULL) { |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
189 |
*bad_class_name = true; |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
190 |
} |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
191 |
return NULL; |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
192 |
} |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
193 |
|
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
194 |
if (bad_class_name != NULL) { |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
195 |
*bad_class_name = false; |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
196 |
} |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
197 |
|
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
198 |
const char* const last_slash = strrchr(class_name, '/'); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
199 |
if (last_slash == NULL) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
200 |
// No package name |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
201 |
return NULL; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
202 |
} |
39216
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
203 |
|
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
204 |
char* class_name_ptr = (char*) class_name; |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
205 |
// Skip over '['s |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
206 |
if (*class_name_ptr == '[') { |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
207 |
do { |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
208 |
class_name_ptr++; |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
209 |
} while (*class_name_ptr == '['); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
210 |
|
39216
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
211 |
// Fully qualified class names should not contain a 'L'. |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
212 |
// Set bad_class_name to true to indicate that the package name |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
213 |
// could not be obtained due to an error condition. |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
214 |
// In this situation, is_same_class_package returns false. |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
215 |
if (*class_name_ptr == 'L') { |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
216 |
if (bad_class_name != NULL) { |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
217 |
*bad_class_name = true; |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
218 |
} |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
219 |
return NULL; |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
220 |
} |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
221 |
} |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
222 |
|
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
223 |
int length = last_slash - class_name_ptr; |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
224 |
|
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
225 |
// A class name could have just the slash character in the name. |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
226 |
if (length <= 0) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
227 |
// No package name |
39216
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
228 |
if (bad_class_name != NULL) { |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
229 |
*bad_class_name = true; |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
230 |
} |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
231 |
return NULL; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
232 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
233 |
|
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
234 |
// drop name after last slash (including slash) |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
235 |
// Ex., "java/lang/String.class" => "java/lang" |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
236 |
char* pkg_name = NEW_RESOURCE_ARRAY(char, length + 1); |
39216
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
237 |
strncpy(pkg_name, class_name_ptr, length); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
238 |
*(pkg_name+length) = '\0'; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
239 |
|
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
240 |
return (const char *)pkg_name; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
241 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
242 |
|
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
243 |
// Given a fully qualified class name, find its defining package in the class loader's |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
244 |
// package entry table. |
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
245 |
PackageEntry* ClassLoader::get_package_entry(const char* class_name, ClassLoaderData* loader_data, TRAPS) { |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
246 |
ResourceMark rm(THREAD); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
247 |
const char *pkg_name = ClassLoader::package_from_name(class_name); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
248 |
if (pkg_name == NULL) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
249 |
return NULL; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
250 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
251 |
PackageEntryTable* pkgEntryTable = loader_data->packages(); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
252 |
TempNewSymbol pkg_symbol = SymbolTable::new_symbol(pkg_name, CHECK_NULL); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
253 |
return pkgEntryTable->lookup_only(pkg_symbol); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
254 |
} |
1 | 255 |
|
26419 | 256 |
ClassPathDirEntry::ClassPathDirEntry(const char* dir) : ClassPathEntry() { |
257 |
char* copy = NEW_C_HEAP_ARRAY(char, strlen(dir)+1, mtClass); |
|
258 |
strcpy(copy, dir); |
|
259 |
_dir = copy; |
|
1 | 260 |
} |
261 |
||
34666 | 262 |
|
19685
3df9b00b5d5f
8020675: invalid jar file in the bootclasspath could lead to jvm fatal error
ccheung
parents:
19158
diff
changeset
|
263 |
ClassFileStream* ClassPathDirEntry::open_stream(const char* name, TRAPS) { |
1 | 264 |
// construct full path name |
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
265 |
char* path = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, JVM_MAXPATHLEN); |
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
266 |
if (jio_snprintf(path, JVM_MAXPATHLEN, "%s%s%s", _dir, os::file_separator(), name) == -1) { |
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
267 |
FREE_RESOURCE_ARRAY(char, path, JVM_MAXPATHLEN); |
1 | 268 |
return NULL; |
269 |
} |
|
270 |
// check if file exists |
|
271 |
struct stat st; |
|
272 |
if (os::stat(path, &st) == 0) { |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
273 |
#if INCLUDE_CDS |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
274 |
if (DumpSharedSpaces) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
275 |
// We have already check in ClassLoader::check_shared_classpath() that the directory is empty, so |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
276 |
// we should never find a file underneath it -- unless user has added a new file while we are running |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
277 |
// the dump, in which case let's quit! |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
278 |
ShouldNotReachHere(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
279 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
280 |
#endif |
1 | 281 |
// found file, open it |
7405
e6fc8d3926f8
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
7397
diff
changeset
|
282 |
int file_handle = os::open(path, 0, 0); |
1 | 283 |
if (file_handle != -1) { |
284 |
// read contents into resource array |
|
285 |
u1* buffer = NEW_RESOURCE_ARRAY(u1, st.st_size); |
|
286 |
size_t num_read = os::read(file_handle, (char*) buffer, st.st_size); |
|
287 |
// close file |
|
7405
e6fc8d3926f8
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
7397
diff
changeset
|
288 |
os::close(file_handle); |
1 | 289 |
// construct ClassFileStream |
290 |
if (num_read == (size_t)st.st_size) { |
|
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
291 |
if (UsePerfData) { |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
292 |
ClassLoader::perf_sys_classfile_bytes_read()->inc(num_read); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
293 |
} |
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
294 |
FREE_RESOURCE_ARRAY(char, path, JVM_MAXPATHLEN); |
34666 | 295 |
// Resource allocated |
296 |
return new ClassFileStream(buffer, |
|
297 |
st.st_size, |
|
298 |
_dir, |
|
299 |
ClassFileStream::verify); |
|
1 | 300 |
} |
301 |
} |
|
302 |
} |
|
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
303 |
FREE_RESOURCE_ARRAY(char, path, JVM_MAXPATHLEN); |
1 | 304 |
return NULL; |
305 |
} |
|
306 |
||
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
307 |
ClassPathZipEntry::ClassPathZipEntry(jzfile* zip, const char* zip_name, bool is_boot_append) : ClassPathEntry() { |
1 | 308 |
_zip = zip; |
26419 | 309 |
char *copy = NEW_C_HEAP_ARRAY(char, strlen(zip_name)+1, mtClass); |
310 |
strcpy(copy, zip_name); |
|
311 |
_zip_name = copy; |
|
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
312 |
_is_boot_append = is_boot_append; |
37418
ebb041956080
8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive
ccheung
parents:
37248
diff
changeset
|
313 |
_multi_versioned = _unknown; |
1 | 314 |
} |
315 |
||
316 |
ClassPathZipEntry::~ClassPathZipEntry() { |
|
317 |
if (ZipClose != NULL) { |
|
318 |
(*ZipClose)(_zip); |
|
319 |
} |
|
27880
afb974a04396
8060074: os::free() takes MemoryTrackingLevel but doesn't need it
coleenp
parents:
27618
diff
changeset
|
320 |
FREE_C_HEAP_ARRAY(char, _zip_name); |
1 | 321 |
} |
322 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
323 |
u1* ClassPathZipEntry::open_entry(const char* name, jint* filesize, bool nul_terminate, TRAPS) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
324 |
// enable call to C land |
1 | 325 |
JavaThread* thread = JavaThread::current(); |
326 |
ThreadToNativeFromVM ttn(thread); |
|
327 |
// check whether zip archive contains name |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
328 |
jint name_len; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
329 |
jzentry* entry = (*FindEntry)(_zip, name, filesize, &name_len); |
1 | 330 |
if (entry == NULL) return NULL; |
331 |
u1* buffer; |
|
332 |
char name_buf[128]; |
|
333 |
char* filename; |
|
334 |
if (name_len < 128) { |
|
335 |
filename = name_buf; |
|
336 |
} else { |
|
337 |
filename = NEW_RESOURCE_ARRAY(char, name_len + 1); |
|
338 |
} |
|
339 |
||
41667
4a349512fde1
8166930: minor cleanups 1) remove reference to ZIP_ReadMappedEntry 2) checking of st_mode
ccheung
parents:
41281
diff
changeset
|
340 |
// read contents into resource array |
4a349512fde1
8166930: minor cleanups 1) remove reference to ZIP_ReadMappedEntry 2) checking of st_mode
ccheung
parents:
41281
diff
changeset
|
341 |
int size = (*filesize) + ((nul_terminate) ? 1 : 0); |
4a349512fde1
8166930: minor cleanups 1) remove reference to ZIP_ReadMappedEntry 2) checking of st_mode
ccheung
parents:
41281
diff
changeset
|
342 |
buffer = NEW_RESOURCE_ARRAY(u1, size); |
4a349512fde1
8166930: minor cleanups 1) remove reference to ZIP_ReadMappedEntry 2) checking of st_mode
ccheung
parents:
41281
diff
changeset
|
343 |
if (!(*ReadEntry)(_zip, entry, buffer, filename)) return NULL; |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
344 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
345 |
// return result |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
346 |
if (nul_terminate) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
347 |
buffer[*filesize] = 0; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
348 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
349 |
return buffer; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
350 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
351 |
|
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
352 |
#if INCLUDE_CDS |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
353 |
u1* ClassPathZipEntry::open_versioned_entry(const char* name, jint* filesize, TRAPS) { |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
354 |
u1* buffer = NULL; |
38294
0a86f32d0fa0
8156789: missing condition in ClassPathZipEntry::open_versioned_entry()
ccheung
parents:
38252
diff
changeset
|
355 |
if (DumpSharedSpaces && !_is_boot_append) { |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
356 |
// We presume default is multi-release enabled |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
357 |
const char* multi_ver = Arguments::get_property("jdk.util.jar.enableMultiRelease"); |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
358 |
const char* verstr = Arguments::get_property("jdk.util.jar.version"); |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
359 |
bool is_multi_ver = (multi_ver == NULL || |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
360 |
strcmp(multi_ver, "true") == 0 || |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
361 |
strcmp(multi_ver, "force") == 0) && |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
362 |
is_multiple_versioned(THREAD); |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
363 |
// command line version setting |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
364 |
int version = 0; |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
365 |
const int base_version = 8; // JDK8 |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
366 |
int cur_ver = JDK_Version::current().major_version(); |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
367 |
if (verstr != NULL) { |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
368 |
version = atoi(verstr); |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
369 |
if (version < base_version || version > cur_ver) { |
43490
3c43be5db478
8173163: searching for a versioned entry in a multi-release jar in hotspot is inconsistent with java code
ccheung
parents:
42876
diff
changeset
|
370 |
// If the specified version is lower than the base version, the base |
3c43be5db478
8173163: searching for a versioned entry in a multi-release jar in hotspot is inconsistent with java code
ccheung
parents:
42876
diff
changeset
|
371 |
// entry will be used; if the version is higher than the current |
3c43be5db478
8173163: searching for a versioned entry in a multi-release jar in hotspot is inconsistent with java code
ccheung
parents:
42876
diff
changeset
|
372 |
// jdk version, the highest versioned entry will be used. |
3c43be5db478
8173163: searching for a versioned entry in a multi-release jar in hotspot is inconsistent with java code
ccheung
parents:
42876
diff
changeset
|
373 |
if (version < base_version) { |
3c43be5db478
8173163: searching for a versioned entry in a multi-release jar in hotspot is inconsistent with java code
ccheung
parents:
42876
diff
changeset
|
374 |
is_multi_ver = false; |
3c43be5db478
8173163: searching for a versioned entry in a multi-release jar in hotspot is inconsistent with java code
ccheung
parents:
42876
diff
changeset
|
375 |
} |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
376 |
// print out warning, do not use assertion here since it will continue to look |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
377 |
// for proper version. |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
378 |
warning("JDK%d is not supported in multiple version jars", version); |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
379 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
380 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
381 |
|
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
382 |
if (is_multi_ver) { |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
383 |
int n; |
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
384 |
char* entry_name = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, JVM_MAXPATHLEN); |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
385 |
if (version > 0) { |
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
386 |
n = jio_snprintf(entry_name, JVM_MAXPATHLEN, "META-INF/versions/%d/%s", version, name); |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
387 |
entry_name[n] = '\0'; |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
388 |
buffer = open_entry((const char*)entry_name, filesize, false, CHECK_NULL); |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
389 |
if (buffer == NULL) { |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
390 |
warning("Could not find %s in %s, try to find highest version instead", entry_name, _zip_name); |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
391 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
392 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
393 |
if (buffer == NULL) { |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
394 |
for (int i = cur_ver; i >= base_version; i--) { |
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
395 |
n = jio_snprintf(entry_name, JVM_MAXPATHLEN, "META-INF/versions/%d/%s", i, name); |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
396 |
entry_name[n] = '\0'; |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
397 |
buffer = open_entry((const char*)entry_name, filesize, false, CHECK_NULL); |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
398 |
if (buffer != NULL) { |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
399 |
break; |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
400 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
401 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
402 |
} |
39223
af5506aae343
8159019: ResourceMark in ClassLoader::open_versioned_entry() is being used incorrectly
ccheung
parents:
39216
diff
changeset
|
403 |
FREE_RESOURCE_ARRAY(char, entry_name, JVM_MAXPATHLEN); |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
404 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
405 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
406 |
return buffer; |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
407 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
408 |
|
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
409 |
bool ClassPathZipEntry::is_multiple_versioned(TRAPS) { |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
410 |
assert(DumpSharedSpaces, "called only at dump time"); |
37418
ebb041956080
8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive
ccheung
parents:
37248
diff
changeset
|
411 |
if (_multi_versioned != _unknown) { |
ebb041956080
8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive
ccheung
parents:
37248
diff
changeset
|
412 |
return (_multi_versioned == _yes) ? true : false; |
ebb041956080
8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive
ccheung
parents:
37248
diff
changeset
|
413 |
} |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
414 |
jint size; |
37418
ebb041956080
8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive
ccheung
parents:
37248
diff
changeset
|
415 |
char* buffer = (char*)open_entry("META-INF/MANIFEST.MF", &size, true, CHECK_false); |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
416 |
if (buffer != NULL) { |
37418
ebb041956080
8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive
ccheung
parents:
37248
diff
changeset
|
417 |
char* p = buffer; |
ebb041956080
8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive
ccheung
parents:
37248
diff
changeset
|
418 |
for ( ; *p; ++p) *p = tolower(*p); |
ebb041956080
8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive
ccheung
parents:
37248
diff
changeset
|
419 |
if (strstr(buffer, "multi-release: true") != NULL) { |
ebb041956080
8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive
ccheung
parents:
37248
diff
changeset
|
420 |
_multi_versioned = _yes; |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
421 |
return true; |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
422 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
423 |
} |
37418
ebb041956080
8152329: jvm should treat the "Multi-Release" jar manifest attribute name as case insensitive
ccheung
parents:
37248
diff
changeset
|
424 |
_multi_versioned = _no; |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
425 |
return false; |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
426 |
} |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
427 |
#endif // INCLUDE_CDS |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
428 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
429 |
ClassFileStream* ClassPathZipEntry::open_stream(const char* name, TRAPS) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
430 |
jint filesize; |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
431 |
u1* buffer = open_versioned_entry(name, &filesize, CHECK_NULL); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
432 |
if (buffer == NULL) { |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
433 |
buffer = open_entry(name, &filesize, false, CHECK_NULL); |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
434 |
if (buffer == NULL) { |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
435 |
return NULL; |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
436 |
} |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
437 |
} |
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
438 |
if (UsePerfData) { |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
439 |
ClassLoader::perf_sys_classfile_bytes_read()->inc(filesize); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
440 |
} |
34666 | 441 |
// Resource allocated |
442 |
return new ClassFileStream(buffer, |
|
443 |
filesize, |
|
444 |
_zip_name, |
|
445 |
ClassFileStream::verify); |
|
1 | 446 |
} |
447 |
||
448 |
// invoke function for each entry in the zip file |
|
449 |
void ClassPathZipEntry::contents_do(void f(const char* name, void* context), void* context) { |
|
450 |
JavaThread* thread = JavaThread::current(); |
|
451 |
HandleMark handle_mark(thread); |
|
452 |
ThreadToNativeFromVM ttn(thread); |
|
453 |
for (int n = 0; ; n++) { |
|
454 |
jzentry * ze = ((*GetNextEntry)(_zip, n)); |
|
455 |
if (ze == NULL) break; |
|
456 |
(*f)(ze->name, context); |
|
457 |
} |
|
458 |
} |
|
459 |
||
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
460 |
ClassPathImageEntry::ClassPathImageEntry(JImageFile* jimage, const char* name) : |
31608 | 461 |
ClassPathEntry(), |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
462 |
_jimage(jimage) { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
463 |
guarantee(jimage != NULL, "jimage file is null"); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
464 |
guarantee(name != NULL, "jimage file name is null"); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
465 |
size_t len = strlen(name) + 1; |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
466 |
_name = NEW_C_HEAP_ARRAY(const char, len, mtClass); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
467 |
strncpy((char *)_name, name, len); |
27562 | 468 |
} |
469 |
||
470 |
ClassPathImageEntry::~ClassPathImageEntry() { |
|
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
471 |
if (_name != NULL) { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
472 |
FREE_C_HEAP_ARRAY(const char, _name); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
473 |
_name = NULL; |
31608 | 474 |
} |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
475 |
if (_jimage != NULL) { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
476 |
(*JImageClose)(_jimage); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
477 |
_jimage = NULL; |
27562 | 478 |
} |
479 |
} |
|
480 |
||
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
481 |
// For a class in a named module, look it up in the jimage file using this syntax: |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
482 |
// /<module-name>/<package-name>/<base-class> |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
483 |
// |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
484 |
// Assumptions: |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
485 |
// 1. There are no unnamed modules in the jimage file. |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
486 |
// 2. A package is in at most one module in the jimage file. |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
487 |
// |
27562 | 488 |
ClassFileStream* ClassPathImageEntry::open_stream(const char* name, TRAPS) { |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
489 |
jlong size; |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
490 |
JImageLocationRef location = (*JImageFindResource)(_jimage, "", get_jimage_version_string(), name, &size); |
31608 | 491 |
|
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
492 |
if (location == 0) { |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
493 |
ResourceMark rm; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
494 |
const char* pkg_name = ClassLoader::package_from_name(name); |
36508 | 495 |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
496 |
if (pkg_name != NULL) { |
36508 | 497 |
if (!Universe::is_module_initialized()) { |
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
42634
diff
changeset
|
498 |
location = (*JImageFindResource)(_jimage, JAVA_BASE_NAME, get_jimage_version_string(), name, &size); |
36508 | 499 |
#if INCLUDE_CDS |
500 |
// CDS uses the boot class loader to load classes whose packages are in |
|
501 |
// modules defined for other class loaders. So, for now, get their module |
|
502 |
// names from the "modules" jimage file. |
|
503 |
if (DumpSharedSpaces && location == 0) { |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
504 |
const char* module_name = (*JImagePackageToModule)(_jimage, pkg_name); |
36508 | 505 |
if (module_name != NULL) { |
506 |
location = (*JImageFindResource)(_jimage, module_name, get_jimage_version_string(), name, &size); |
|
507 |
} |
|
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
508 |
} |
36508 | 509 |
#endif |
510 |
||
511 |
} else { |
|
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
512 |
PackageEntry* package_entry = ClassLoader::get_package_entry(name, ClassLoaderData::the_null_class_loader_data(), CHECK_NULL); |
36508 | 513 |
if (package_entry != NULL) { |
514 |
ResourceMark rm; |
|
515 |
// Get the module name |
|
516 |
ModuleEntry* module = package_entry->module(); |
|
517 |
assert(module != NULL, "Boot classLoader package missing module"); |
|
518 |
assert(module->is_named(), "Boot classLoader package is in unnamed module"); |
|
519 |
const char* module_name = module->name()->as_C_string(); |
|
520 |
if (module_name != NULL) { |
|
521 |
location = (*JImageFindResource)(_jimage, module_name, get_jimage_version_string(), name, &size); |
|
522 |
} |
|
523 |
} |
|
524 |
} |
|
31608 | 525 |
} |
526 |
} |
|
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
527 |
if (location != 0) { |
27562 | 528 |
if (UsePerfData) { |
529 |
ClassLoader::perf_sys_classfile_bytes_read()->inc(size); |
|
530 |
} |
|
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
531 |
char* data = NEW_RESOURCE_ARRAY(char, size); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
532 |
(*JImageGetResource)(_jimage, location, data, size); |
34666 | 533 |
// Resource allocated |
534 |
return new ClassFileStream((u1*)data, |
|
535 |
(int)size, |
|
536 |
_name, |
|
537 |
ClassFileStream::verify); |
|
27562 | 538 |
} |
539 |
||
540 |
return NULL; |
|
541 |
} |
|
542 |
||
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
543 |
JImageLocationRef ClassLoader::jimage_find_resource(JImageFile* jf, |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
544 |
const char* module_name, |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
545 |
const char* file_name, |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
546 |
jlong &size) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
547 |
return ((*JImageFindResource)(jf, module_name, get_jimage_version_string(), file_name, &size)); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
548 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
549 |
|
27562 | 550 |
#ifndef PRODUCT |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
551 |
bool ctw_visitor(JImageFile* jimage, |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
552 |
const char* module_name, const char* version, const char* package, |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
553 |
const char* name, const char* extension, void* arg) { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
554 |
if (strcmp(extension, "class") == 0) { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
555 |
Thread* THREAD = Thread::current(); |
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
556 |
ResourceMark rm(THREAD); |
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
557 |
char* path = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, JIMAGE_MAX_PATH); |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
558 |
jio_snprintf(path, JIMAGE_MAX_PATH - 1, "%s/%s.class", package, name); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
559 |
ClassLoader::compile_the_world_in(path, *(Handle*)arg, THREAD); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
560 |
return !HAS_PENDING_EXCEPTION; |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
561 |
} |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
562 |
return true; |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
563 |
} |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
564 |
|
27562 | 565 |
void ClassPathImageEntry::compile_the_world(Handle loader, TRAPS) { |
566 |
tty->print_cr("CompileTheWorld : Compiling all classes in %s", name()); |
|
567 |
tty->cr(); |
|
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
568 |
(*JImageResourceIterator)(_jimage, (JImageResourceVisitor_t)ctw_visitor, (void *)&loader); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
569 |
if (HAS_PENDING_EXCEPTION) { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
570 |
if (PENDING_EXCEPTION->is_a(SystemDictionary::OutOfMemoryError_klass())) { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
571 |
CLEAR_PENDING_EXCEPTION; |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
572 |
tty->print_cr("\nCompileTheWorld : Ran out of memory\n"); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
573 |
tty->print_cr("Increase class metadata storage if a limit was set"); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
574 |
} else { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
575 |
tty->print_cr("\nCompileTheWorld : Unexpected exception occurred\n"); |
27562 | 576 |
} |
577 |
} |
|
578 |
} |
|
36508 | 579 |
#endif |
27562 | 580 |
|
581 |
bool ClassPathImageEntry::is_jrt() { |
|
36508 | 582 |
return ClassLoader::is_jrt(name()); |
27562 | 583 |
} |
584 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
585 |
#if INCLUDE_CDS |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
586 |
void ClassLoader::exit_with_path_failure(const char* error, const char* message) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
587 |
assert(DumpSharedSpaces, "only called at dump time"); |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38145
diff
changeset
|
588 |
tty->print_cr("Hint: enable -Xlog:class+path=info to diagnose the failure"); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
589 |
vm_exit_during_initialization(error, message); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
590 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
591 |
#endif |
1 | 592 |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
593 |
ModuleClassPathList::ModuleClassPathList(Symbol* module_name) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
594 |
_module_name = module_name; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
595 |
_module_first_entry = NULL; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
596 |
_module_last_entry = NULL; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
597 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
598 |
|
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
599 |
ModuleClassPathList::~ModuleClassPathList() { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
600 |
// Clean out each ClassPathEntry on list |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
601 |
ClassPathEntry* e = _module_first_entry; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
602 |
while (e != NULL) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
603 |
ClassPathEntry* next_entry = e->next(); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
604 |
delete e; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
605 |
e = next_entry; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
606 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
607 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
608 |
|
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
609 |
void ModuleClassPathList::add_to_list(ClassPathEntry* new_entry) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
610 |
if (new_entry != NULL) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
611 |
if (_module_last_entry == NULL) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
612 |
_module_first_entry = _module_last_entry = new_entry; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
613 |
} else { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
614 |
_module_last_entry->set_next(new_entry); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
615 |
_module_last_entry = new_entry; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
616 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
617 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
618 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
619 |
|
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
620 |
void ClassLoader::trace_class_path(const char* msg, const char* name) { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46560
diff
changeset
|
621 |
LogTarget(Info, class, path) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46560
diff
changeset
|
622 |
if (lt.is_enabled()) { |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46560
diff
changeset
|
623 |
LogStream ls(lt); |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
624 |
if (msg) { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46560
diff
changeset
|
625 |
ls.print("%s", msg); |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
626 |
} |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
627 |
if (name) { |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
628 |
if (strlen(name) < 256) { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46560
diff
changeset
|
629 |
ls.print("%s", name); |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
630 |
} else { |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
631 |
// For very long paths, we need to print each character separately, |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
632 |
// as print_cr() has a length limit |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
633 |
while (name[0] != '\0') { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46560
diff
changeset
|
634 |
ls.print("%c", name[0]); |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
635 |
name++; |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
636 |
} |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
637 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
638 |
} |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46560
diff
changeset
|
639 |
ls.cr(); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
640 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
641 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
642 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
643 |
#if INCLUDE_CDS |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
644 |
void ClassLoader::check_shared_classpath(const char *path) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
645 |
if (strcmp(path, "") == 0) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
646 |
exit_with_path_failure("Cannot have empty path in archived classpaths", NULL); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
647 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
648 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
649 |
struct stat st; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
650 |
if (os::stat(path, &st) == 0) { |
41281 | 651 |
if ((st.st_mode & S_IFMT) != S_IFREG) { // is not a regular file |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
652 |
if (!os::dir_is_empty(path)) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
653 |
tty->print_cr("Error: non-empty directory '%s'", path); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
654 |
exit_with_path_failure("CDS allows only empty directories in archived classpaths", NULL); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
655 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
656 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
657 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
658 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
659 |
#endif |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
660 |
|
1 | 661 |
void ClassLoader::setup_bootstrap_search_path() { |
26419 | 662 |
const char* sys_class_path = Arguments::get_sysclasspath(); |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
663 |
const char* java_class_path = Arguments::get_appclasspath(); |
26419 | 664 |
if (PrintSharedArchiveAndExit) { |
665 |
// Don't print sys_class_path - this is the bootcp of this current VM process, not necessarily |
|
666 |
// the same as the bootcp of the shared archive. |
|
667 |
} else { |
|
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
668 |
trace_class_path("bootstrap loader class path=", sys_class_path); |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
35917
diff
changeset
|
669 |
trace_class_path("classpath: ", java_class_path); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
670 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
671 |
#if INCLUDE_CDS |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
672 |
if (DumpSharedSpaces) { |
26419 | 673 |
_shared_paths_misc_info->add_boot_classpath(sys_class_path); |
1 | 674 |
} |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
675 |
#endif |
36508 | 676 |
setup_search_path(sys_class_path, true); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
677 |
} |
1 | 678 |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
679 |
#if INCLUDE_CDS |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
680 |
int ClassLoader::get_shared_paths_misc_info_size() { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
681 |
return _shared_paths_misc_info->get_used_bytes(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
682 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
683 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
684 |
void* ClassLoader::get_shared_paths_misc_info() { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
685 |
return _shared_paths_misc_info->buffer(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
686 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
687 |
|
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
688 |
bool ClassLoader::check_shared_paths_misc_info(void *buf, int size) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
689 |
SharedPathsMiscInfo* checker = SharedClassUtil::allocate_shared_paths_misc_info((char*)buf, size); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
690 |
bool result = checker->check(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
691 |
delete checker; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
692 |
return result; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
693 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
694 |
#endif |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
695 |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
696 |
// Construct the array of module/path pairs as specified to --patch-module |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
697 |
// for the boot loader to search ahead of the jimage, if the class being |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
698 |
// loaded is defined to a module that has been specified to --patch-module. |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
699 |
void ClassLoader::setup_patch_mod_entries() { |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
700 |
Thread* THREAD = Thread::current(); |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
701 |
GrowableArray<ModulePatchPath*>* patch_mod_args = Arguments::get_patch_mod_prefix(); |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
702 |
int num_of_entries = patch_mod_args->length(); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
703 |
|
40013 | 704 |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
705 |
// Set up the boot loader's _patch_mod_entries list |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
706 |
_patch_mod_entries = new (ResourceObj::C_HEAP, mtModule) GrowableArray<ModuleClassPathList*>(num_of_entries, true); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
707 |
|
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
708 |
for (int i = 0; i < num_of_entries; i++) { |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
709 |
const char* module_name = (patch_mod_args->at(i))->module_name(); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
710 |
Symbol* const module_sym = SymbolTable::lookup(module_name, (int)strlen(module_name), CHECK); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
711 |
assert(module_sym != NULL, "Failed to obtain Symbol for module name"); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
712 |
ModuleClassPathList* module_cpl = new ModuleClassPathList(module_sym); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
713 |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
714 |
char* class_path = (patch_mod_args->at(i))->path_string(); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
715 |
int len = (int)strlen(class_path); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
716 |
int end = 0; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
717 |
// Iterate over the module's class path entries |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
718 |
for (int start = 0; start < len; start = end) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
719 |
while (class_path[end] && class_path[end] != os::path_separator()[0]) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
720 |
end++; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
721 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
722 |
EXCEPTION_MARK; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
723 |
ResourceMark rm(THREAD); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
724 |
char* path = NEW_RESOURCE_ARRAY(char, end - start + 1); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
725 |
strncpy(path, &class_path[start], end - start); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
726 |
path[end - start] = '\0'; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
727 |
|
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
728 |
struct stat st; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
729 |
if (os::stat(path, &st) == 0) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
730 |
// File or directory found |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
731 |
Thread* THREAD = Thread::current(); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
732 |
ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, CHECK); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
733 |
// If the path specification is valid, enter it into this module's list |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
734 |
if (new_entry != NULL) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
735 |
module_cpl->add_to_list(new_entry); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
736 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
737 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
738 |
|
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
739 |
while (class_path[end] == os::path_separator()[0]) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
740 |
end++; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
741 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
742 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
743 |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
744 |
// Record the module into the list of --patch-module entries only if |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
745 |
// valid ClassPathEntrys have been created |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
746 |
if (module_cpl->module_first_entry() != NULL) { |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
747 |
_patch_mod_entries->push(module_cpl); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
748 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
749 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
750 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
751 |
|
42634
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
752 |
// Determine whether the module has been patched via the command-line |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
753 |
// option --patch-module |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
754 |
bool ClassLoader::is_in_patch_mod_entries(Symbol* module_name) { |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
755 |
if (_patch_mod_entries != NULL && _patch_mod_entries->is_nonempty()) { |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
756 |
int table_len = _patch_mod_entries->length(); |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
757 |
for (int i = 0; i < table_len; i++) { |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
758 |
ModuleClassPathList* patch_mod = _patch_mod_entries->at(i); |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
759 |
if (module_name->fast_compare(patch_mod->module_name()) == 0) { |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
760 |
return true; |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
761 |
} |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
762 |
} |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
763 |
} |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
764 |
return false; |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
765 |
} |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
766 |
|
36508 | 767 |
void ClassLoader::setup_search_path(const char *class_path, bool bootstrap_search) { |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
768 |
int len = (int)strlen(class_path); |
1 | 769 |
int end = 0; |
40013 | 770 |
bool set_base_piece = bootstrap_search; |
1 | 771 |
|
772 |
// Iterate over class path entries |
|
773 |
for (int start = 0; start < len; start = end) { |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
774 |
while (class_path[end] && class_path[end] != os::path_separator()[0]) { |
1 | 775 |
end++; |
776 |
} |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
777 |
EXCEPTION_MARK; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
778 |
ResourceMark rm(THREAD); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
779 |
char* path = NEW_RESOURCE_ARRAY(char, end - start + 1); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
780 |
strncpy(path, &class_path[start], end - start); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
781 |
path[end - start] = '\0'; |
40013 | 782 |
|
783 |
// The first time through the bootstrap_search setup, it must be determined |
|
784 |
// what the base or core piece of the boot loader search is. Either a java runtime |
|
785 |
// image is present or this is an exploded module build situation. |
|
786 |
if (set_base_piece) { |
|
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
42634
diff
changeset
|
787 |
assert(string_ends_with(path, MODULES_IMAGE_NAME) || string_ends_with(path, JAVA_BASE_NAME), |
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
42634
diff
changeset
|
788 |
"Incorrect boot loader search path, no java runtime image or " JAVA_BASE_NAME " exploded build"); |
40013 | 789 |
struct stat st; |
790 |
if (os::stat(path, &st) == 0) { |
|
791 |
// Directory found |
|
792 |
Thread* THREAD = Thread::current(); |
|
793 |
ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, CHECK); |
|
36508 | 794 |
|
40013 | 795 |
// Check for a jimage |
796 |
if (Arguments::has_jimage()) { |
|
797 |
assert(_jrt_entry == NULL, "should not setup bootstrap class search path twice"); |
|
798 |
assert(new_entry != NULL && new_entry->is_jrt(), "No java runtime image present"); |
|
799 |
_jrt_entry = new_entry; |
|
800 |
++_num_entries; |
|
801 |
#if INCLUDE_CDS |
|
802 |
if (DumpSharedSpaces) { |
|
803 |
JImageFile *jimage = _jrt_entry->jimage(); |
|
804 |
assert(jimage != NULL, "No java runtime image file present"); |
|
805 |
} |
|
806 |
#endif |
|
807 |
} |
|
808 |
} else { |
|
809 |
// If path does not exist, exit |
|
810 |
vm_exit_during_initialization("Unable to establish the boot loader search path", path); |
|
811 |
} |
|
812 |
set_base_piece = false; |
|
36508 | 813 |
} else { |
40013 | 814 |
// Every entry on the system boot class path after the initial base piece, |
815 |
// which is set by os::set_boot_path(), is considered an appended entry. |
|
816 |
update_class_path_entry_list(path, false, bootstrap_search); |
|
36508 | 817 |
} |
818 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
819 |
#if INCLUDE_CDS |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
820 |
if (DumpSharedSpaces) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
821 |
check_shared_classpath(path); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
822 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
823 |
#endif |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
824 |
while (class_path[end] == os::path_separator()[0]) { |
1 | 825 |
end++; |
826 |
} |
|
827 |
} |
|
828 |
} |
|
829 |
||
40013 | 830 |
// During an exploded modules build, each module defined to the boot loader |
831 |
// will be added to the ClassLoader::_exploded_entries array. |
|
832 |
void ClassLoader::add_to_exploded_build_list(Symbol* module_sym, TRAPS) { |
|
833 |
assert(!ClassLoader::has_jrt_entry(), "Exploded build not applicable"); |
|
46463
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
834 |
assert(_exploded_entries != NULL, "_exploded_entries was not initialized"); |
40013 | 835 |
|
836 |
// Find the module's symbol |
|
837 |
ResourceMark rm(THREAD); |
|
838 |
const char *module_name = module_sym->as_C_string(); |
|
839 |
const char *home = Arguments::get_java_home(); |
|
840 |
const char file_sep = os::file_separator()[0]; |
|
841 |
// 10 represents the length of "modules" + 2 file separators + \0 |
|
842 |
size_t len = strlen(home) + strlen(module_name) + 10; |
|
843 |
char *path = NEW_C_HEAP_ARRAY(char, len, mtModule); |
|
844 |
jio_snprintf(path, len, "%s%cmodules%c%s", home, file_sep, file_sep, module_name); |
|
845 |
||
846 |
struct stat st; |
|
847 |
if (os::stat(path, &st) == 0) { |
|
848 |
// Directory found |
|
849 |
ClassPathEntry* new_entry = create_class_path_entry(path, &st, false, false, CHECK); |
|
850 |
||
851 |
// If the path specification is valid, enter it into this module's list. |
|
852 |
// There is no need to check for duplicate modules in the exploded entry list, |
|
853 |
// since no two modules with the same name can be defined to the boot loader. |
|
854 |
// This is checked at module definition time in Modules::define_module. |
|
855 |
if (new_entry != NULL) { |
|
856 |
ModuleClassPathList* module_cpl = new ModuleClassPathList(module_sym); |
|
857 |
module_cpl->add_to_list(new_entry); |
|
46463
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
858 |
{ |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
859 |
MutexLocker ml(Module_lock, THREAD); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
860 |
_exploded_entries->push(module_cpl); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
861 |
} |
40013 | 862 |
log_info(class, load)("path: %s", path); |
863 |
} |
|
864 |
} |
|
865 |
FREE_C_HEAP_ARRAY(char, path); |
|
866 |
} |
|
867 |
||
26419 | 868 |
ClassPathEntry* ClassLoader::create_class_path_entry(const char *path, const struct stat* st, |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
869 |
bool throw_exception, |
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
870 |
bool is_boot_append, TRAPS) { |
1 | 871 |
JavaThread* thread = JavaThread::current(); |
19685
3df9b00b5d5f
8020675: invalid jar file in the bootclasspath could lead to jvm fatal error
ccheung
parents:
19158
diff
changeset
|
872 |
ClassPathEntry* new_entry = NULL; |
41281 | 873 |
if ((st->st_mode & S_IFMT) == S_IFREG) { |
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
874 |
ResourceMark rm(thread); |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
875 |
// Regular file, should be a zip or jimage file |
1 | 876 |
// Canonicalized filename |
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
877 |
char* canonical_path = NEW_RESOURCE_ARRAY_IN_THREAD(thread, char, JVM_MAXPATHLEN); |
1 | 878 |
if (!get_canonical_path(path, canonical_path, JVM_MAXPATHLEN)) { |
879 |
// This matches the classic VM |
|
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
880 |
if (throw_exception) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
881 |
THROW_MSG_(vmSymbols::java_io_IOException(), "Bad pathname", NULL); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
882 |
} else { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
883 |
return NULL; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
884 |
} |
1 | 885 |
} |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
886 |
jint error; |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
887 |
JImageFile* jimage =(*JImageOpen)(canonical_path, &error); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
888 |
if (jimage != NULL) { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
889 |
new_entry = new ClassPathImageEntry(jimage, canonical_path); |
27562 | 890 |
} else { |
31612
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
891 |
char* error_msg = NULL; |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
892 |
jzfile* zip; |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
893 |
{ |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
894 |
// enable call to C land |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
895 |
ThreadToNativeFromVM ttn(thread); |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
896 |
HandleMark hm(thread); |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
897 |
zip = (*ZipOpen)(canonical_path, &error_msg); |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
898 |
} |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
899 |
if (zip != NULL && error_msg == NULL) { |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
900 |
new_entry = new ClassPathZipEntry(zip, path, is_boot_append); |
1 | 901 |
} else { |
31612
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
902 |
char *msg; |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
903 |
if (error_msg == NULL) { |
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
904 |
msg = NEW_RESOURCE_ARRAY_IN_THREAD(thread, char, strlen(path) + 128); ; |
31612
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
905 |
jio_snprintf(msg, strlen(path) + 127, "error in opening JAR file %s", path); |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
906 |
} else { |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
907 |
int len = (int)(strlen(path) + strlen(error_msg) + 128); |
39210
178947361a68
8153876: Replace 4K stack allocations with Resource allocations
ccheung
parents:
38733
diff
changeset
|
908 |
msg = NEW_RESOURCE_ARRAY_IN_THREAD(thread, char, len); ; |
31612
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
909 |
jio_snprintf(msg, len - 1, "error in opening JAR file <%s> %s", error_msg, path); |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
910 |
} |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
911 |
// Don't complain about bad jar files added via -Xbootclasspath/a:. |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
912 |
if (throw_exception && is_init_completed()) { |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
913 |
THROW_MSG_(vmSymbols::java_lang_ClassNotFoundException(), msg, NULL); |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
914 |
} else { |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
915 |
return NULL; |
930eee00deb0
8073423: Remove LazyClassPathEntry support if no longer needed
hseigel
parents:
31608
diff
changeset
|
916 |
} |
1 | 917 |
} |
27562 | 918 |
} |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38145
diff
changeset
|
919 |
log_info(class, path)("opened: %s", path); |
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38145
diff
changeset
|
920 |
log_info(class, load)("opened: %s", path); |
1 | 921 |
} else { |
922 |
// Directory |
|
19685
3df9b00b5d5f
8020675: invalid jar file in the bootclasspath could lead to jvm fatal error
ccheung
parents:
19158
diff
changeset
|
923 |
new_entry = new ClassPathDirEntry(path); |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
38145
diff
changeset
|
924 |
log_info(class, load)("path: %s", path); |
1 | 925 |
} |
19685
3df9b00b5d5f
8020675: invalid jar file in the bootclasspath could lead to jvm fatal error
ccheung
parents:
19158
diff
changeset
|
926 |
return new_entry; |
1 | 927 |
} |
928 |
||
929 |
||
930 |
// Create a class path zip entry for a given path (return NULL if not found |
|
931 |
// or zip/JAR file cannot be opened) |
|
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
932 |
ClassPathZipEntry* ClassLoader::create_class_path_zip_entry(const char *path, bool is_boot_append) { |
1 | 933 |
// check for a regular file |
934 |
struct stat st; |
|
935 |
if (os::stat(path, &st) == 0) { |
|
41281 | 936 |
if ((st.st_mode & S_IFMT) == S_IFREG) { |
1 | 937 |
char canonical_path[JVM_MAXPATHLEN]; |
26419 | 938 |
if (get_canonical_path(path, canonical_path, JVM_MAXPATHLEN)) { |
1 | 939 |
char* error_msg = NULL; |
940 |
jzfile* zip; |
|
941 |
{ |
|
942 |
// enable call to C land |
|
943 |
JavaThread* thread = JavaThread::current(); |
|
944 |
ThreadToNativeFromVM ttn(thread); |
|
945 |
HandleMark hm(thread); |
|
946 |
zip = (*ZipOpen)(canonical_path, &error_msg); |
|
947 |
} |
|
948 |
if (zip != NULL && error_msg == NULL) { |
|
949 |
// create using canonical path |
|
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
950 |
return new ClassPathZipEntry(zip, canonical_path, is_boot_append); |
1 | 951 |
} |
952 |
} |
|
953 |
} |
|
954 |
} |
|
955 |
return NULL; |
|
956 |
} |
|
957 |
||
958 |
// returns true if entry already on class path |
|
41741
2f5b8bbcb18c
8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents:
41715
diff
changeset
|
959 |
bool ClassLoader::contains_append_entry(const char* name) { |
40013 | 960 |
ClassPathEntry* e = _first_append_entry; |
1 | 961 |
while (e != NULL) { |
962 |
// assume zip entries have been canonicalized |
|
41741
2f5b8bbcb18c
8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents:
41715
diff
changeset
|
963 |
if (strcmp(name, e->name()) == 0) { |
1 | 964 |
return true; |
965 |
} |
|
966 |
e = e->next(); |
|
967 |
} |
|
968 |
return false; |
|
969 |
} |
|
970 |
||
971 |
void ClassLoader::add_to_list(ClassPathEntry *new_entry) { |
|
972 |
if (new_entry != NULL) { |
|
40013 | 973 |
if (_last_append_entry == NULL) { |
974 |
assert(_first_append_entry == NULL, "boot loader's append class path entry list not empty"); |
|
975 |
_first_append_entry = _last_append_entry = new_entry; |
|
1 | 976 |
} else { |
40013 | 977 |
_last_append_entry->set_next(new_entry); |
978 |
_last_append_entry = new_entry; |
|
1 | 979 |
} |
980 |
} |
|
40013 | 981 |
_num_entries++; |
36508 | 982 |
} |
983 |
||
984 |
void ClassLoader::add_to_list(const char *apath) { |
|
40013 | 985 |
update_class_path_entry_list((char*)apath, false, false); |
36508 | 986 |
} |
987 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
988 |
// Returns true IFF the file/dir exists and the entry was successfully created. |
26419 | 989 |
bool ClassLoader::update_class_path_entry_list(const char *path, |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
990 |
bool check_for_duplicates, |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
991 |
bool is_boot_append, |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
992 |
bool throw_exception) { |
1 | 993 |
struct stat st; |
19685
3df9b00b5d5f
8020675: invalid jar file in the bootclasspath could lead to jvm fatal error
ccheung
parents:
19158
diff
changeset
|
994 |
if (os::stat(path, &st) == 0) { |
1 | 995 |
// File or directory found |
996 |
ClassPathEntry* new_entry = NULL; |
|
19685
3df9b00b5d5f
8020675: invalid jar file in the bootclasspath could lead to jvm fatal error
ccheung
parents:
19158
diff
changeset
|
997 |
Thread* THREAD = Thread::current(); |
37220
ec74292c0c9c
8075253: Multiversion JAR feature: CDS does not support MV-JARs
ccheung
parents:
36508
diff
changeset
|
998 |
new_entry = create_class_path_entry(path, &st, throw_exception, is_boot_append, CHECK_(false)); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
999 |
if (new_entry == NULL) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1000 |
return false; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1001 |
} |
36508 | 1002 |
|
1003 |
// Do not reorder the bootclasspath which would break get_system_package(). |
|
1 | 1004 |
// Add new entry to linked list |
41741
2f5b8bbcb18c
8166931: Do not include classes which are unusable during run time in the classlist file
ccheung
parents:
41715
diff
changeset
|
1005 |
if (!check_for_duplicates || !contains_append_entry(new_entry->name())) { |
40013 | 1006 |
ClassLoaderExt::add_class_path_entry(path, check_for_duplicates, new_entry); |
1 | 1007 |
} |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1008 |
return true; |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1009 |
} else { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1010 |
#if INCLUDE_CDS |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1011 |
if (DumpSharedSpaces) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1012 |
_shared_paths_misc_info->add_nonexist_path(path); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1013 |
} |
26419 | 1014 |
#endif |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1015 |
return false; |
1 | 1016 |
} |
1017 |
} |
|
1018 |
||
40013 | 1019 |
static void print_module_entry_table(const GrowableArray<ModuleClassPathList*>* const module_list) { |
1020 |
ResourceMark rm; |
|
1021 |
int num_of_entries = module_list->length(); |
|
1022 |
for (int i = 0; i < num_of_entries; i++) { |
|
1023 |
ClassPathEntry* e; |
|
1024 |
ModuleClassPathList* mpl = module_list->at(i); |
|
1025 |
tty->print("%s=", mpl->module_name()->as_C_string()); |
|
1026 |
e = mpl->module_first_entry(); |
|
1027 |
while (e != NULL) { |
|
1028 |
tty->print("%s", e->name()); |
|
1029 |
e = e->next(); |
|
1030 |
if (e != NULL) { |
|
1031 |
tty->print("%s", os::path_separator()); |
|
1032 |
} |
|
1033 |
} |
|
1034 |
tty->print(" ;"); |
|
1035 |
} |
|
1036 |
} |
|
1037 |
||
1 | 1038 |
void ClassLoader::print_bootclasspath() { |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1039 |
ClassPathEntry* e; |
1 | 1040 |
tty->print("[bootclasspath= "); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1041 |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1042 |
// Print --patch-module module/path specifications first |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1043 |
if (_patch_mod_entries != NULL) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1044 |
print_module_entry_table(_patch_mod_entries); |
40013 | 1045 |
} |
1046 |
||
1047 |
// [jimage | exploded modules build] |
|
1048 |
if (has_jrt_entry()) { |
|
1049 |
// Print the location of the java runtime image |
|
1050 |
tty->print("%s ;", _jrt_entry->name()); |
|
1051 |
} else { |
|
1052 |
// Print exploded module build path specifications |
|
1053 |
if (_exploded_entries != NULL) { |
|
1054 |
print_module_entry_table(_exploded_entries); |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1055 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1056 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1057 |
|
40013 | 1058 |
// appended entries |
1059 |
e = _first_append_entry; |
|
1 | 1060 |
while (e != NULL) { |
1061 |
tty->print("%s ;", e->name()); |
|
1062 |
e = e->next(); |
|
1063 |
} |
|
1064 |
tty->print_cr("]"); |
|
1065 |
} |
|
1066 |
||
1067 |
void ClassLoader::load_zip_library() { |
|
1068 |
assert(ZipOpen == NULL, "should not load zip library twice"); |
|
1069 |
// First make sure native library is loaded |
|
1070 |
os::native_java_library(); |
|
1071 |
// Load zip library |
|
1072 |
char path[JVM_MAXPATHLEN]; |
|
1073 |
char ebuf[1024]; |
|
14471
f3a6b82e25cf
8001185: parsing of sun.boot.library.path in os::dll_build_name somewhat broken
bpittore
parents:
13728
diff
changeset
|
1074 |
void* handle = NULL; |
47089
27050b653624
8186072: dll_build_name returns true even if file is missing.
goetz
parents:
46727
diff
changeset
|
1075 |
if (os::dll_locate_lib(path, sizeof(path), Arguments::get_dll_dir(), "zip")) { |
14471
f3a6b82e25cf
8001185: parsing of sun.boot.library.path in os::dll_build_name somewhat broken
bpittore
parents:
13728
diff
changeset
|
1076 |
handle = os::dll_load(path, ebuf, sizeof ebuf); |
f3a6b82e25cf
8001185: parsing of sun.boot.library.path in os::dll_build_name somewhat broken
bpittore
parents:
13728
diff
changeset
|
1077 |
} |
1 | 1078 |
if (handle == NULL) { |
1079 |
vm_exit_during_initialization("Unable to load ZIP library", path); |
|
1080 |
} |
|
1081 |
// Lookup zip entry points |
|
7405
e6fc8d3926f8
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
7397
diff
changeset
|
1082 |
ZipOpen = CAST_TO_FN_PTR(ZipOpen_t, os::dll_lookup(handle, "ZIP_Open")); |
e6fc8d3926f8
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
7397
diff
changeset
|
1083 |
ZipClose = CAST_TO_FN_PTR(ZipClose_t, os::dll_lookup(handle, "ZIP_Close")); |
e6fc8d3926f8
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
7397
diff
changeset
|
1084 |
FindEntry = CAST_TO_FN_PTR(FindEntry_t, os::dll_lookup(handle, "ZIP_FindEntry")); |
e6fc8d3926f8
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
7397
diff
changeset
|
1085 |
ReadEntry = CAST_TO_FN_PTR(ReadEntry_t, os::dll_lookup(handle, "ZIP_ReadEntry")); |
e6fc8d3926f8
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
7397
diff
changeset
|
1086 |
GetNextEntry = CAST_TO_FN_PTR(GetNextEntry_t, os::dll_lookup(handle, "ZIP_GetNextEntry")); |
27562 | 1087 |
ZipInflateFully = CAST_TO_FN_PTR(ZipInflateFully_t, os::dll_lookup(handle, "ZIP_InflateFully")); |
27025 | 1088 |
Crc32 = CAST_TO_FN_PTR(Crc32_t, os::dll_lookup(handle, "ZIP_CRC32")); |
1 | 1089 |
|
1090 |
// ZIP_Close is not exported on Windows in JDK5.0 so don't abort if ZIP_Close is NULL |
|
27025 | 1091 |
if (ZipOpen == NULL || FindEntry == NULL || ReadEntry == NULL || |
1092 |
GetNextEntry == NULL || Crc32 == NULL) { |
|
1 | 1093 |
vm_exit_during_initialization("Corrupted ZIP library", path); |
1094 |
} |
|
1095 |
||
27562 | 1096 |
if (ZipInflateFully == NULL) { |
1097 |
vm_exit_during_initialization("Corrupted ZIP library ZIP_InflateFully missing", path); |
|
1098 |
} |
|
1099 |
||
1 | 1100 |
// Lookup canonicalize entry in libjava.dll |
1101 |
void *javalib_handle = os::native_java_library(); |
|
7405
e6fc8d3926f8
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
7397
diff
changeset
|
1102 |
CanonicalizeEntry = CAST_TO_FN_PTR(canonicalize_fn_t, os::dll_lookup(javalib_handle, "Canonicalize")); |
1 | 1103 |
// This lookup only works on 1.3. Do not check for non-null here |
1104 |
} |
|
1105 |
||
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1106 |
void ClassLoader::load_jimage_library() { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1107 |
// First make sure native library is loaded |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1108 |
os::native_java_library(); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1109 |
// Load jimage library |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1110 |
char path[JVM_MAXPATHLEN]; |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1111 |
char ebuf[1024]; |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1112 |
void* handle = NULL; |
47089
27050b653624
8186072: dll_build_name returns true even if file is missing.
goetz
parents:
46727
diff
changeset
|
1113 |
if (os::dll_locate_lib(path, sizeof(path), Arguments::get_dll_dir(), "jimage")) { |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1114 |
handle = os::dll_load(path, ebuf, sizeof ebuf); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1115 |
} |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1116 |
if (handle == NULL) { |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1117 |
vm_exit_during_initialization("Unable to load jimage library", path); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1118 |
} |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1119 |
|
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1120 |
// Lookup jimage entry points |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1121 |
JImageOpen = CAST_TO_FN_PTR(JImageOpen_t, os::dll_lookup(handle, "JIMAGE_Open")); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1122 |
guarantee(JImageOpen != NULL, "function JIMAGE_Open not found"); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1123 |
JImageClose = CAST_TO_FN_PTR(JImageClose_t, os::dll_lookup(handle, "JIMAGE_Close")); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1124 |
guarantee(JImageClose != NULL, "function JIMAGE_Close not found"); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1125 |
JImagePackageToModule = CAST_TO_FN_PTR(JImagePackageToModule_t, os::dll_lookup(handle, "JIMAGE_PackageToModule")); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1126 |
guarantee(JImagePackageToModule != NULL, "function JIMAGE_PackageToModule not found"); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1127 |
JImageFindResource = CAST_TO_FN_PTR(JImageFindResource_t, os::dll_lookup(handle, "JIMAGE_FindResource")); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1128 |
guarantee(JImageFindResource != NULL, "function JIMAGE_FindResource not found"); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1129 |
JImageGetResource = CAST_TO_FN_PTR(JImageGetResource_t, os::dll_lookup(handle, "JIMAGE_GetResource")); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1130 |
guarantee(JImageGetResource != NULL, "function JIMAGE_GetResource not found"); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1131 |
JImageResourceIterator = CAST_TO_FN_PTR(JImageResourceIterator_t, os::dll_lookup(handle, "JIMAGE_ResourceIterator")); |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1132 |
guarantee(JImageResourceIterator != NULL, "function JIMAGE_ResourceIterator not found"); |
37490
fd089d3f8cb3
8147634: Need a JImage API that given a JImageLocationRef returns class name
jlaskey
parents:
37418
diff
changeset
|
1133 |
JImageResourcePath = CAST_TO_FN_PTR(JImage_ResourcePath_t, os::dll_lookup(handle, "JIMAGE_ResourcePath")); |
fd089d3f8cb3
8147634: Need a JImage API that given a JImageLocationRef returns class name
jlaskey
parents:
37418
diff
changeset
|
1134 |
guarantee(JImageResourcePath != NULL, "function JIMAGE_ResourcePath not found"); |
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1135 |
} |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1136 |
|
27562 | 1137 |
jboolean ClassLoader::decompress(void *in, u8 inSize, void *out, u8 outSize, char **pmsg) { |
1138 |
return (*ZipInflateFully)(in, inSize, out, outSize, pmsg); |
|
1139 |
} |
|
1140 |
||
27025 | 1141 |
int ClassLoader::crc32(int crc, const char* buf, int len) { |
1142 |
assert(Crc32 != NULL, "ZIP_CRC32 is not found"); |
|
1143 |
return (*Crc32)(crc, (const jbyte*)buf, len); |
|
1144 |
} |
|
1145 |
||
36508 | 1146 |
// Function add_package extracts the package from the fully qualified class name |
1147 |
// and checks if the package is in the boot loader's package entry table. If so, |
|
1148 |
// then it sets the classpath_index in the package entry record. |
|
1149 |
// |
|
1150 |
// The classpath_index field is used to find the entry on the boot loader class |
|
1151 |
// path for packages with classes loaded by the boot loader from -Xbootclasspath/a |
|
1152 |
// in an unnamed module. It is also used to indicate (for all packages whose |
|
1153 |
// classes are loaded by the boot loader) that at least one of the package's |
|
1154 |
// classes has been loaded. |
|
1155 |
bool ClassLoader::add_package(const char *fullq_class_name, s2 classpath_index, TRAPS) { |
|
1156 |
assert(fullq_class_name != NULL, "just checking"); |
|
1157 |
||
1158 |
// Get package name from fully qualified class name. |
|
39216
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
1159 |
ResourceMark rm; |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
1160 |
const char *cp = package_from_name(fullq_class_name); |
1 | 1161 |
if (cp != NULL) { |
39216
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
1162 |
PackageEntryTable* pkg_entry_tbl = ClassLoaderData::the_null_class_loader_data()->packages(); |
40c3d66352ae
8153858: Clean up needed when obtaining the package name from a fully qualified class name
rprotacio
parents:
39210
diff
changeset
|
1163 |
TempNewSymbol pkg_symbol = SymbolTable::new_symbol(cp, CHECK_false); |
36508 | 1164 |
PackageEntry* pkg_entry = pkg_entry_tbl->lookup_only(pkg_symbol); |
1165 |
if (pkg_entry != NULL) { |
|
1166 |
assert(classpath_index != -1, "Unexpected classpath_index"); |
|
1167 |
pkg_entry->set_classpath_index(classpath_index); |
|
1168 |
} else { |
|
1169 |
return false; |
|
1170 |
} |
|
1171 |
} |
|
1172 |
return true; |
|
1173 |
} |
|
1174 |
||
1175 |
oop ClassLoader::get_system_package(const char* name, TRAPS) { |
|
1176 |
// Look up the name in the boot loader's package entry table. |
|
1177 |
if (name != NULL) { |
|
1178 |
TempNewSymbol package_sym = SymbolTable::new_symbol(name, (int)strlen(name), CHECK_NULL); |
|
1179 |
// Look for the package entry in the boot loader's package entry table. |
|
1180 |
PackageEntry* package = |
|
1181 |
ClassLoaderData::the_null_class_loader_data()->packages()->lookup_only(package_sym); |
|
1182 |
||
1183 |
// Return NULL if package does not exist or if no classes in that package |
|
1184 |
// have been loaded. |
|
1185 |
if (package != NULL && package->has_loaded_class()) { |
|
1186 |
ModuleEntry* module = package->module(); |
|
1187 |
if (module->location() != NULL) { |
|
1188 |
ResourceMark rm(THREAD); |
|
1189 |
Handle ml = java_lang_String::create_from_str( |
|
1190 |
module->location()->as_C_string(), THREAD); |
|
1191 |
return ml(); |
|
1192 |
} |
|
1193 |
// Return entry on boot loader class path. |
|
1194 |
Handle cph = java_lang_String::create_from_str( |
|
1195 |
ClassLoader::classpath_entry(package->classpath_index())->name(), THREAD); |
|
1196 |
return cph(); |
|
1197 |
} |
|
1 | 1198 |
} |
1199 |
return NULL; |
|
1200 |
} |
|
1201 |
||
36508 | 1202 |
objArrayOop ClassLoader::get_system_packages(TRAPS) { |
1203 |
ResourceMark rm(THREAD); |
|
1204 |
// List of pointers to PackageEntrys that have loaded classes. |
|
1205 |
GrowableArray<PackageEntry*>* loaded_class_pkgs = new GrowableArray<PackageEntry*>(50); |
|
1 | 1206 |
{ |
36508 | 1207 |
MutexLocker ml(Module_lock, THREAD); |
1208 |
||
1209 |
PackageEntryTable* pe_table = |
|
1210 |
ClassLoaderData::the_null_class_loader_data()->packages(); |
|
1 | 1211 |
|
36508 | 1212 |
// Collect the packages that have at least one loaded class. |
1213 |
for (int x = 0; x < pe_table->table_size(); x++) { |
|
1214 |
for (PackageEntry* package_entry = pe_table->bucket(x); |
|
1215 |
package_entry != NULL; |
|
1216 |
package_entry = package_entry->next()) { |
|
1217 |
if (package_entry->has_loaded_class()) { |
|
1218 |
loaded_class_pkgs->append(package_entry); |
|
1219 |
} |
|
1 | 1220 |
} |
1221 |
} |
|
1222 |
} |
|
1223 |
||
1224 |
||
36508 | 1225 |
// Allocate objArray and fill with java.lang.String |
1226 |
objArrayOop r = oopFactory::new_objArray(SystemDictionary::String_klass(), |
|
1227 |
loaded_class_pkgs->length(), CHECK_NULL); |
|
1228 |
objArrayHandle result(THREAD, r); |
|
1229 |
for (int x = 0; x < loaded_class_pkgs->length(); x++) { |
|
1230 |
PackageEntry* package_entry = loaded_class_pkgs->at(x); |
|
1231 |
Handle str = java_lang_String::create_from_symbol(package_entry->name(), CHECK_NULL); |
|
1232 |
result->obj_at_put(x, str()); |
|
1 | 1233 |
} |
36508 | 1234 |
return result(); |
1 | 1235 |
} |
1236 |
||
34666 | 1237 |
// caller needs ResourceMark |
1238 |
const char* ClassLoader::file_name_for_class_name(const char* class_name, |
|
1239 |
int class_name_len) { |
|
1240 |
assert(class_name != NULL, "invariant"); |
|
1241 |
assert((int)strlen(class_name) == class_name_len, "invariant"); |
|
1 | 1242 |
|
34666 | 1243 |
static const char class_suffix[] = ".class"; |
1244 |
||
1245 |
char* const file_name = NEW_RESOURCE_ARRAY(char, |
|
1246 |
class_name_len + |
|
1247 |
sizeof(class_suffix)); // includes term NULL |
|
1248 |
||
1249 |
strncpy(file_name, class_name, class_name_len); |
|
1250 |
strncpy(&file_name[class_name_len], class_suffix, sizeof(class_suffix)); |
|
1251 |
||
1252 |
return file_name; |
|
1253 |
} |
|
1254 |
||
46463
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1255 |
ClassPathEntry* find_first_module_cpe(ModuleEntry* mod_entry, |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1256 |
const GrowableArray<ModuleClassPathList*>* const module_list) { |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1257 |
int num_of_entries = module_list->length(); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1258 |
const Symbol* class_module_name = mod_entry->name(); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1259 |
|
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1260 |
// Loop through all the modules in either the patch-module or exploded entries looking for module |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1261 |
for (int i = 0; i < num_of_entries; i++) { |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1262 |
ModuleClassPathList* module_cpl = module_list->at(i); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1263 |
Symbol* module_cpl_name = module_cpl->module_name(); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1264 |
|
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1265 |
if (module_cpl_name->fast_compare(class_module_name) == 0) { |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1266 |
// Class' module has been located. |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1267 |
return module_cpl->module_first_entry(); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1268 |
} |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1269 |
} |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1270 |
return NULL; |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1271 |
} |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1272 |
|
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1273 |
|
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1274 |
// Search either the patch-module or exploded build entries for class. |
40013 | 1275 |
ClassFileStream* ClassLoader::search_module_entries(const GrowableArray<ModuleClassPathList*>* const module_list, |
46463
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1276 |
const char* const class_name, |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1277 |
const char* const file_name, |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1278 |
TRAPS) { |
40013 | 1279 |
ClassFileStream* stream = NULL; |
1280 |
||
1281 |
// Find the class' defining module in the boot loader's module entry table |
|
1282 |
PackageEntry* pkg_entry = get_package_entry(class_name, ClassLoaderData::the_null_class_loader_data(), CHECK_NULL); |
|
1283 |
ModuleEntry* mod_entry = (pkg_entry != NULL) ? pkg_entry->module() : NULL; |
|
1284 |
||
1285 |
// If the module system has not defined java.base yet, then |
|
1286 |
// classes loaded are assumed to be defined to java.base. |
|
1287 |
// When java.base is eventually defined by the module system, |
|
1288 |
// all packages of classes that have been previously loaded |
|
1289 |
// are verified in ModuleEntryTable::verify_javabase_packages(). |
|
1290 |
if (!Universe::is_module_initialized() && |
|
1291 |
!ModuleEntryTable::javabase_defined() && |
|
1292 |
mod_entry == NULL) { |
|
41183
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40244
diff
changeset
|
1293 |
mod_entry = ModuleEntryTable::javabase_moduleEntry(); |
40013 | 1294 |
} |
1295 |
||
1296 |
// The module must be a named module |
|
46463
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1297 |
ClassPathEntry* e = NULL; |
40013 | 1298 |
if (mod_entry != NULL && mod_entry->is_named()) { |
46463
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1299 |
if (module_list == _exploded_entries) { |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1300 |
// The exploded build entries can be added to at any time so a lock is |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1301 |
// needed when searching them. |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1302 |
assert(!ClassLoader::has_jrt_entry(), "Must be exploded build"); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1303 |
MutexLocker ml(Module_lock, THREAD); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1304 |
e = find_first_module_cpe(mod_entry, module_list); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1305 |
} else { |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1306 |
e = find_first_module_cpe(mod_entry, module_list); |
40013 | 1307 |
} |
1308 |
} |
|
1309 |
||
46463
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1310 |
// Try to load the class from the module's ClassPathEntry list. |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1311 |
while (e != NULL) { |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1312 |
stream = e->open_stream(file_name, CHECK_NULL); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1313 |
// No context.check is required since CDS is not supported |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1314 |
// for an exploded modules build or if --patch-module is specified. |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1315 |
if (NULL != stream) { |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1316 |
return stream; |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1317 |
} |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1318 |
e = e->next(); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1319 |
} |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1320 |
// If the module was located, break out even if the class was not |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1321 |
// located successfully from that module's ClassPathEntry list. |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1322 |
// There will not be another valid entry for that module. |
40013 | 1323 |
return NULL; |
1324 |
} |
|
1325 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1326 |
InstanceKlass* ClassLoader::load_class(Symbol* name, bool search_append_only, TRAPS) { |
34666 | 1327 |
assert(name != NULL, "invariant"); |
1328 |
assert(THREAD->is_Java_thread(), "must be a JavaThread"); |
|
1329 |
||
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1330 |
ResourceMark rm(THREAD); |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1331 |
HandleMark hm(THREAD); |
34666 | 1332 |
|
1333 |
const char* const class_name = name->as_C_string(); |
|
1334 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1335 |
EventMark m("loading class %s", class_name); |
1 | 1336 |
|
34666 | 1337 |
const char* const file_name = file_name_for_class_name(class_name, |
1338 |
name->utf8_length()); |
|
1339 |
assert(file_name != NULL, "invariant"); |
|
1340 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1341 |
ClassLoaderExt::Context context(class_name, file_name, THREAD); |
1 | 1342 |
|
36508 | 1343 |
// Lookup stream for parsing .class file |
1 | 1344 |
ClassFileStream* stream = NULL; |
36508 | 1345 |
s2 classpath_index = 0; |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1346 |
ClassPathEntry* e = NULL; |
36508 | 1347 |
|
40013 | 1348 |
// If DumpSharedSpaces is true boot loader visibility boundaries are set to: |
1349 |
// - [jimage] + [_first_append_entry to _last_append_entry] (all path entries). |
|
36508 | 1350 |
// |
1351 |
// If search_append_only is true, boot loader visibility boundaries are |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1352 |
// set to be _first_append_entry to the end. This includes: |
36508 | 1353 |
// [-Xbootclasspath/a]; [jvmti appended entries] |
1354 |
// |
|
1355 |
// If both DumpSharedSpaces and search_append_only are false, boot loader |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1356 |
// visibility boundaries are set to be the --patch-module entries plus the base piece. |
40013 | 1357 |
// This would include: |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1358 |
// [--patch-module=<module>=<file>(<pathsep><file>)*]; [jimage | exploded module build] |
36508 | 1359 |
// |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1360 |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1361 |
// Load Attempt #1: --patch-module |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1362 |
// Determine the class' defining module. If it appears in the _patch_mod_entries, |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1363 |
// attempt to load the class from those locations specific to the module. |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1364 |
// Specifications to --patch-module can contain a partial number of classes |
40013 | 1365 |
// that are part of the overall module definition. So if a particular class is not |
1366 |
// found within its module specification, the search should continue to Load Attempt #2. |
|
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1367 |
// Note: The --patch-module entries are never searched if the boot loader's |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1368 |
// visibility boundary is limited to only searching the append entries. |
41281 | 1369 |
if (_patch_mod_entries != NULL && !search_append_only) { |
42876
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42636
diff
changeset
|
1370 |
// At CDS dump time, the --patch-module entries are ignored. That means a |
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42636
diff
changeset
|
1371 |
// class is still loaded from the runtime image even if it might |
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42636
diff
changeset
|
1372 |
// appear in the _patch_mod_entries. The runtime shared class visibility |
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42636
diff
changeset
|
1373 |
// check will determine if a shared class is visible based on the runtime |
ff8ff9dcccec
8168797: do not load any archived classes from a patched module
jiangli
parents:
42636
diff
changeset
|
1374 |
// environemnt, including the runtime --patch-module setting. |
41281 | 1375 |
if (!DumpSharedSpaces) { |
1376 |
stream = search_module_entries(_patch_mod_entries, class_name, file_name, CHECK_NULL); |
|
1377 |
} |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1378 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1379 |
|
40013 | 1380 |
// Load Attempt #2: [jimage | exploded build] |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1381 |
if (!search_append_only && (NULL == stream)) { |
40013 | 1382 |
if (has_jrt_entry()) { |
1383 |
e = _jrt_entry; |
|
1384 |
stream = _jrt_entry->open_stream(file_name, CHECK_NULL); |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1385 |
if (!context.check(stream, classpath_index)) { |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1386 |
return NULL; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1387 |
} |
40013 | 1388 |
} else { |
1389 |
// Exploded build - attempt to locate class in its defining module's location. |
|
1390 |
assert(_exploded_entries != NULL, "No exploded build entries present"); |
|
1391 |
stream = search_module_entries(_exploded_entries, class_name, file_name, CHECK_NULL); |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1392 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1393 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1394 |
|
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1395 |
// Load Attempt #3: [-Xbootclasspath/a]; [jvmti appended entries] |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1396 |
if ((search_append_only || DumpSharedSpaces) && (NULL == stream)) { |
40013 | 1397 |
// For the boot loader append path search, the starting classpath_index |
1398 |
// for the appended piece is always 1 to account for either the |
|
1399 |
// _jrt_entry or the _exploded_entries. |
|
1400 |
assert(classpath_index == 0, "The classpath_index has been incremented incorrectly"); |
|
1401 |
classpath_index = 1; |
|
34666 | 1402 |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1403 |
e = _first_append_entry; |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1404 |
while (e != NULL) { |
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1405 |
if (DumpSharedSpaces && classpath_index >= _num_boot_entries) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1406 |
// Do not load any class from the app classpath using the boot loader. Let |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1407 |
// the built-in app class laoder load them. |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1408 |
break; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1409 |
} |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1410 |
stream = e->open_stream(file_name, CHECK_NULL); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1411 |
if (!context.check(stream, classpath_index)) { |
34666 | 1412 |
return NULL; |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1413 |
} |
36508 | 1414 |
if (NULL != stream) { |
1415 |
break; |
|
1416 |
} |
|
1417 |
e = e->next(); |
|
1418 |
++classpath_index; |
|
1 | 1419 |
} |
1420 |
} |
|
1421 |
||
34666 | 1422 |
if (NULL == stream) { |
1423 |
return NULL; |
|
1 | 1424 |
} |
1425 |
||
34666 | 1426 |
stream->set_verify(context.should_verify(classpath_index)); |
1427 |
||
1428 |
ClassLoaderData* loader_data = ClassLoaderData::the_null_class_loader_data(); |
|
1429 |
Handle protection_domain; |
|
1430 |
||
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1431 |
InstanceKlass* result = KlassFactory::create_from_stream(stream, |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1432 |
name, |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1433 |
loader_data, |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1434 |
protection_domain, |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1435 |
NULL, // host_klass |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1436 |
NULL, // cp_patches |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1437 |
THREAD); |
34666 | 1438 |
if (HAS_PENDING_EXCEPTION) { |
1439 |
if (DumpSharedSpaces) { |
|
1440 |
tty->print_cr("Preload Error: Failed to load %s", class_name); |
|
1441 |
} |
|
1442 |
return NULL; |
|
1443 |
} |
|
1444 |
||
38192
05ab1ee04bf2
8155678: ClassLoader::initialize_module_loader_map should only be called when dumping CDS archive.
jiangli
parents:
38151
diff
changeset
|
1445 |
return context.record_result(name, e, classpath_index, result, THREAD); |
1 | 1446 |
} |
1447 |
||
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1448 |
#if INCLUDE_CDS |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1449 |
static char* skip_uri_protocol(char* source) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1450 |
if (strncmp(source, "file:", 5) == 0) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1451 |
// file: protocol path could start with file:/ or file:/// |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1452 |
// locate the char after all the forward slashes |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1453 |
int offset = 5; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1454 |
while (*(source + offset) == '/') { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1455 |
offset++; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1456 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1457 |
source += offset; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1458 |
// for non-windows platforms, move back one char as the path begins with a '/' |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1459 |
#ifndef _WINDOWS |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1460 |
source -= 1; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1461 |
#endif |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1462 |
} else if (strncmp(source, "jrt:/", 5) == 0) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1463 |
source += 5; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1464 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1465 |
return source; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1466 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1467 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1468 |
void ClassLoader::record_shared_class_loader_type(InstanceKlass* ik, const ClassFileStream* stream) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1469 |
assert(DumpSharedSpaces, "sanity"); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1470 |
assert(stream != NULL, "sanity"); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1471 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1472 |
if (ik->is_anonymous()) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1473 |
// We do not archive anonymous classes. |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1474 |
return; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1475 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1476 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1477 |
if (stream->source() == NULL) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1478 |
if (ik->class_loader() == NULL) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1479 |
// JFR classes |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1480 |
ik->set_shared_classpath_index(0); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1481 |
ik->set_class_loader_type(ClassLoader::BOOT_LOADER); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1482 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1483 |
return; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1484 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1485 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1486 |
assert(has_jrt_entry(), "CDS dumping does not support exploded JDK build"); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1487 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1488 |
ModuleEntry* module = ik->module(); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1489 |
ClassPathEntry* e = NULL; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1490 |
int classpath_index = 0; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1491 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1492 |
// Check if the class is from the runtime image |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1493 |
if (module != NULL && (module->location() != NULL) && |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1494 |
(module->location()->starts_with("jrt:"))) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1495 |
e = _jrt_entry; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1496 |
classpath_index = 0; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1497 |
} else { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1498 |
classpath_index = 1; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1499 |
ResourceMark rm; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1500 |
char* canonical_path = NEW_RESOURCE_ARRAY(char, JVM_MAXPATHLEN); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1501 |
for (e = _first_append_entry; e != NULL; e = e->next()) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1502 |
if (get_canonical_path(e->name(), canonical_path, JVM_MAXPATHLEN)) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1503 |
char* src = (char*)stream->source(); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1504 |
// save the path from the file: protocol or the module name from the jrt: protocol |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1505 |
// if no protocol prefix is found, src is the same as stream->source() after the following call |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1506 |
src = skip_uri_protocol(src); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1507 |
if (strcmp(canonical_path, os::native_path((char*)src)) == 0) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1508 |
break; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1509 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1510 |
classpath_index ++; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1511 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1512 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1513 |
if (e == NULL) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1514 |
assert(ik->shared_classpath_index() < 0, |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1515 |
"must be a class from a custom jar which isn't in the class path or boot class path"); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1516 |
return; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1517 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1518 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1519 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1520 |
if (classpath_index < _num_boot_entries) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1521 |
// ik is either: |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1522 |
// 1) a boot class loaded from the runtime image during vm initialization (classpath_index = 0); or |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1523 |
// 2) a user's class from -Xbootclasspath/a (classpath_index > 0) |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1524 |
// In the second case, the classpath_index, classloader_type will be recorded via |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1525 |
// context.record_result() in ClassLoader::load_class(Symbol* name, bool search_append_only, TRAPS). |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1526 |
if (classpath_index > 0) { |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1527 |
return; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1528 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1529 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1530 |
|
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1531 |
ResourceMark rm; |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1532 |
const char* const class_name = ik->name()->as_C_string(); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1533 |
const char* const file_name = file_name_for_class_name(class_name, |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1534 |
ik->name()->utf8_length()); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1535 |
assert(file_name != NULL, "invariant"); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1536 |
Thread* THREAD = Thread::current(); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1537 |
ClassLoaderExt::Context context(class_name, file_name, CATCH); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1538 |
context.record_result(ik->name(), e, classpath_index, ik, THREAD); |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1539 |
} |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1540 |
#endif // INCLUDE_CDS |
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1541 |
|
1 | 1542 |
// Initialize the class loader's access to methods in libzip. Parse and |
1543 |
// process the boot classpath into a list ClassPathEntry objects. Once |
|
1544 |
// this list has been created, it must not change order (see class PackageInfo) |
|
1545 |
// it can be appended to and is by jvmti and the kernel vm. |
|
1546 |
||
1547 |
void ClassLoader::initialize() { |
|
1548 |
EXCEPTION_MARK; |
|
1549 |
||
1550 |
if (UsePerfData) { |
|
1551 |
// jvmstat performance counters |
|
1552 |
NEWPERFTICKCOUNTER(_perf_accumulated_time, SUN_CLS, "time"); |
|
1553 |
NEWPERFTICKCOUNTER(_perf_class_init_time, SUN_CLS, "classInitTime"); |
|
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1554 |
NEWPERFTICKCOUNTER(_perf_class_init_selftime, SUN_CLS, "classInitTime.self"); |
1 | 1555 |
NEWPERFTICKCOUNTER(_perf_class_verify_time, SUN_CLS, "classVerifyTime"); |
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1556 |
NEWPERFTICKCOUNTER(_perf_class_verify_selftime, SUN_CLS, "classVerifyTime.self"); |
1 | 1557 |
NEWPERFTICKCOUNTER(_perf_class_link_time, SUN_CLS, "classLinkedTime"); |
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1558 |
NEWPERFTICKCOUNTER(_perf_class_link_selftime, SUN_CLS, "classLinkedTime.self"); |
1 | 1559 |
NEWPERFEVENTCOUNTER(_perf_classes_inited, SUN_CLS, "initializedClasses"); |
1560 |
NEWPERFEVENTCOUNTER(_perf_classes_linked, SUN_CLS, "linkedClasses"); |
|
3575
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1561 |
NEWPERFEVENTCOUNTER(_perf_classes_verified, SUN_CLS, "verifiedClasses"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1562 |
|
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1563 |
NEWPERFTICKCOUNTER(_perf_class_parse_time, SUN_CLS, "parseClassTime"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1564 |
NEWPERFTICKCOUNTER(_perf_class_parse_selftime, SUN_CLS, "parseClassTime.self"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1565 |
NEWPERFTICKCOUNTER(_perf_sys_class_lookup_time, SUN_CLS, "lookupSysClassTime"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1566 |
NEWPERFTICKCOUNTER(_perf_shared_classload_time, SUN_CLS, "sharedClassLoadTime"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1567 |
NEWPERFTICKCOUNTER(_perf_sys_classload_time, SUN_CLS, "sysClassLoadTime"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1568 |
NEWPERFTICKCOUNTER(_perf_app_classload_time, SUN_CLS, "appClassLoadTime"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1569 |
NEWPERFTICKCOUNTER(_perf_app_classload_selftime, SUN_CLS, "appClassLoadTime.self"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1570 |
NEWPERFEVENTCOUNTER(_perf_app_classload_count, SUN_CLS, "appClassLoadCount"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1571 |
NEWPERFTICKCOUNTER(_perf_define_appclasses, SUN_CLS, "defineAppClasses"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1572 |
NEWPERFTICKCOUNTER(_perf_define_appclass_time, SUN_CLS, "defineAppClassTime"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1573 |
NEWPERFTICKCOUNTER(_perf_define_appclass_selftime, SUN_CLS, "defineAppClassTime.self"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1574 |
NEWPERFBYTECOUNTER(_perf_app_classfile_bytes_read, SUN_CLS, "appClassBytes"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1575 |
NEWPERFBYTECOUNTER(_perf_sys_classfile_bytes_read, SUN_CLS, "sysClassBytes"); |
224791e7ecab
6857194: Add hotspot perf counters to aid class loading performance measurement
mchung
parents:
2567
diff
changeset
|
1576 |
|
1 | 1577 |
|
1578 |
// The following performance counters are added for measuring the impact |
|
1579 |
// of the bug fix of 6365597. They are mainly focused on finding out |
|
1580 |
// the behavior of system & user-defined classloader lock, whether |
|
1581 |
// ClassLoader.loadClass/findClass is being called synchronized or not. |
|
1582 |
// Also two additional counters are created to see whether 'UnsyncloadClass' |
|
1583 |
// flag is being set or not and how many times load_instance_class call |
|
1584 |
// fails with linkageError etc. |
|
1585 |
NEWPERFEVENTCOUNTER(_sync_systemLoaderLockContentionRate, SUN_CLS, |
|
1586 |
"systemLoaderLockContentionRate"); |
|
1587 |
NEWPERFEVENTCOUNTER(_sync_nonSystemLoaderLockContentionRate, SUN_CLS, |
|
1588 |
"nonSystemLoaderLockContentionRate"); |
|
1589 |
NEWPERFEVENTCOUNTER(_sync_JVMFindLoadedClassLockFreeCounter, SUN_CLS, |
|
1590 |
"jvmFindLoadedClassNoLockCalls"); |
|
1591 |
NEWPERFEVENTCOUNTER(_sync_JVMDefineClassLockFreeCounter, SUN_CLS, |
|
1592 |
"jvmDefineClassNoLockCalls"); |
|
1593 |
||
1594 |
NEWPERFEVENTCOUNTER(_sync_JNIDefineClassLockFreeCounter, SUN_CLS, |
|
1595 |
"jniDefineClassNoLockCalls"); |
|
1596 |
||
1597 |
NEWPERFEVENTCOUNTER(_unsafe_defineClassCallCounter, SUN_CLS, |
|
1598 |
"unsafeDefineClassCalls"); |
|
1599 |
||
1600 |
NEWPERFEVENTCOUNTER(_isUnsyncloadClass, SUN_CLS, "isUnsyncloadClassSet"); |
|
1601 |
NEWPERFEVENTCOUNTER(_load_instance_class_failCounter, SUN_CLS, |
|
1602 |
"loadInstanceClassFailRate"); |
|
1603 |
||
1604 |
// increment the isUnsyncloadClass counter if UnsyncloadClass is set. |
|
1605 |
if (UnsyncloadClass) { |
|
1606 |
_isUnsyncloadClass->inc(); |
|
1607 |
} |
|
1608 |
} |
|
1609 |
||
1610 |
// lookup zip library entry points |
|
1611 |
load_zip_library(); |
|
32619
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1612 |
// lookup jimage library entry points |
47acec81dcca
8087181: Move native jimage code to its own library (maybe libjimage)
jlaskey
parents:
31612
diff
changeset
|
1613 |
load_jimage_library(); |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1614 |
#if INCLUDE_CDS |
1 | 1615 |
// initialize search path |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1616 |
if (DumpSharedSpaces) { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1617 |
_shared_paths_misc_info = SharedClassUtil::allocate_shared_paths_misc_info(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1618 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1619 |
#endif |
1 | 1620 |
setup_bootstrap_search_path(); |
1621 |
} |
|
1622 |
||
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1623 |
#if INCLUDE_CDS |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1624 |
void ClassLoader::initialize_shared_path() { |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1625 |
if (DumpSharedSpaces) { |
47103
a993ec29ec75
8186842: Use Java class loaders for creating the CDS archive
ccheung
parents:
47089
diff
changeset
|
1626 |
_num_boot_entries = _num_entries; |
26135
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1627 |
ClassLoaderExt::setup_search_paths(); |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1628 |
_shared_paths_misc_info->write_jint(0); // see comments in SharedPathsMiscInfo::check() |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1629 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1630 |
} |
82b516c550f7
8046070: Class Data Sharing clean up and refactoring
iklam
parents:
25949
diff
changeset
|
1631 |
#endif |
1 | 1632 |
|
1633 |
jlong ClassLoader::classloader_time_ms() { |
|
1634 |
return UsePerfData ? |
|
1635 |
Management::ticks_to_ms(_perf_accumulated_time->get_value()) : -1; |
|
1636 |
} |
|
1637 |
||
1638 |
jlong ClassLoader::class_init_count() { |
|
1639 |
return UsePerfData ? _perf_classes_inited->get_value() : -1; |
|
1640 |
} |
|
1641 |
||
1642 |
jlong ClassLoader::class_init_time_ms() { |
|
1643 |
return UsePerfData ? |
|
1644 |
Management::ticks_to_ms(_perf_class_init_time->get_value()) : -1; |
|
1645 |
} |
|
1646 |
||
1647 |
jlong ClassLoader::class_verify_time_ms() { |
|
1648 |
return UsePerfData ? |
|
1649 |
Management::ticks_to_ms(_perf_class_verify_time->get_value()) : -1; |
|
1650 |
} |
|
1651 |
||
1652 |
jlong ClassLoader::class_link_count() { |
|
1653 |
return UsePerfData ? _perf_classes_linked->get_value() : -1; |
|
1654 |
} |
|
1655 |
||
1656 |
jlong ClassLoader::class_link_time_ms() { |
|
1657 |
return UsePerfData ? |
|
1658 |
Management::ticks_to_ms(_perf_class_link_time->get_value()) : -1; |
|
1659 |
} |
|
1660 |
||
1661 |
int ClassLoader::compute_Object_vtable() { |
|
1662 |
// hardwired for JDK1.2 -- would need to duplicate class file parsing |
|
1663 |
// code to determine actual value from file |
|
1664 |
// Would be value '11' if finals were in vtable |
|
1665 |
int JDK_1_2_Object_vtable_size = 5; |
|
1666 |
return JDK_1_2_Object_vtable_size * vtableEntry::size(); |
|
1667 |
} |
|
1668 |
||
1669 |
||
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1670 |
void classLoader_init1() { |
1 | 1671 |
ClassLoader::initialize(); |
1672 |
} |
|
1673 |
||
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1674 |
// Complete the ClassPathEntry setup for the boot loader |
40013 | 1675 |
void ClassLoader::classLoader_init2(TRAPS) { |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1676 |
// Setup the list of module/path pairs for --patch-module processing |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1677 |
// This must be done after the SymbolTable is created in order |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1678 |
// to use fast_compare on module names instead of a string compare. |
40244
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1679 |
if (Arguments::get_patch_mod_prefix() != NULL) { |
b3055c216762
8136930: Simplify use of module-system options by custom launchers
hseigel
parents:
40016
diff
changeset
|
1680 |
setup_patch_mod_entries(); |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1681 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1682 |
|
42634
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
1683 |
// Create the ModuleEntry for java.base (must occur after setup_patch_mod_entries |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
1684 |
// to successfully determine if java.base has been patched) |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
1685 |
create_javabase(); |
7459867ebf98
8168850: Mark module entries that have been specified by --patch-module
rprotacio
parents:
41741
diff
changeset
|
1686 |
|
40013 | 1687 |
// Setup the initial java.base/path pair for the exploded build entries. |
1688 |
// As more modules are defined during module system initialization, more |
|
1689 |
// entries will be added to the exploded build array. |
|
1690 |
if (!has_jrt_entry()) { |
|
1691 |
assert(!DumpSharedSpaces, "DumpSharedSpaces not supported with exploded module builds"); |
|
1692 |
assert(!UseSharedSpaces, "UsedSharedSpaces not supported with exploded module builds"); |
|
46463
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1693 |
// Set up the boot loader's _exploded_entries list. Note that this gets |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1694 |
// done before loading any classes, by the same thread that will |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1695 |
// subsequently do the first class load. So, no lock is needed for this. |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1696 |
assert(_exploded_entries == NULL, "Should only get initialized once"); |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1697 |
_exploded_entries = new (ResourceObj::C_HEAP, mtModule) |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46404
diff
changeset
|
1698 |
GrowableArray<ModuleClassPathList*>(EXPLODED_ENTRY_SIZE, true); |
40013 | 1699 |
add_to_exploded_build_list(vmSymbols::java_base(), CHECK); |
1700 |
} |
|
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1701 |
} |
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1702 |
|
1 | 1703 |
|
26419 | 1704 |
bool ClassLoader::get_canonical_path(const char* orig, char* out, int len) { |
1 | 1705 |
assert(orig != NULL && out != NULL && len > 0, "bad arguments"); |
1706 |
if (CanonicalizeEntry != NULL) { |
|
26419 | 1707 |
JavaThread* THREAD = JavaThread::current(); |
1708 |
JNIEnv* env = THREAD->jni_environment(); |
|
1709 |
ResourceMark rm(THREAD); |
|
1710 |
||
1711 |
// os::native_path writes into orig_copy |
|
1712 |
char* orig_copy = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, strlen(orig)+1); |
|
1713 |
strcpy(orig_copy, orig); |
|
1714 |
if ((CanonicalizeEntry)(env, os::native_path(orig_copy), out, len) < 0) { |
|
1 | 1715 |
return false; |
1716 |
} |
|
1717 |
} else { |
|
1718 |
// On JDK 1.2.2 the Canonicalize does not exist, so just do nothing |
|
1719 |
strncpy(out, orig, len); |
|
1720 |
out[len - 1] = '\0'; |
|
1721 |
} |
|
1722 |
return true; |
|
1723 |
} |
|
1724 |
||
36508 | 1725 |
void ClassLoader::create_javabase() { |
1726 |
Thread* THREAD = Thread::current(); |
|
1727 |
||
1728 |
// Create java.base's module entry for the boot |
|
1729 |
// class loader prior to loading j.l.Ojbect. |
|
1730 |
ClassLoaderData* null_cld = ClassLoaderData::the_null_class_loader_data(); |
|
1731 |
||
1732 |
// Get module entry table |
|
1733 |
ModuleEntryTable* null_cld_modules = null_cld->modules(); |
|
1734 |
if (null_cld_modules == NULL) { |
|
1735 |
vm_exit_during_initialization("No ModuleEntryTable for the boot class loader"); |
|
1736 |
} |
|
1 | 1737 |
|
36508 | 1738 |
{ |
1739 |
MutexLocker ml(Module_lock, THREAD); |
|
46404
ae62ba99a1a7
8165896: Use "open" flag from JVM_DefineModule to export all module packages
rprotacio
parents:
46329
diff
changeset
|
1740 |
ModuleEntry* jb_module = null_cld_modules->locked_create_entry_or_null(Handle(), |
ae62ba99a1a7
8165896: Use "open" flag from JVM_DefineModule to export all module packages
rprotacio
parents:
46329
diff
changeset
|
1741 |
false, vmSymbols::java_base(), NULL, NULL, null_cld); |
36508 | 1742 |
if (jb_module == NULL) { |
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
42634
diff
changeset
|
1743 |
vm_exit_during_initialization("Unable to create ModuleEntry for " JAVA_BASE_NAME); |
36508 | 1744 |
} |
41183
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40244
diff
changeset
|
1745 |
ModuleEntryTable::set_javabase_moduleEntry(jb_module); |
36508 | 1746 |
} |
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37490
diff
changeset
|
1747 |
} |
36508 | 1748 |
|
1749 |
#ifndef PRODUCT |
|
1 | 1750 |
|
1751 |
// CompileTheWorld |
|
1752 |
// |
|
1753 |
// Iterates over all class path entries and forces compilation of all methods |
|
1754 |
// in all classes found. Currently, only zip/jar archives are searched. |
|
1755 |
// |
|
1756 |
// The classes are loaded by the Java level bootstrap class loader, and the |
|
1757 |
// initializer is called. If DelayCompilationDuringStartup is true (default), |
|
1758 |
// the interpreter will run the initialization code. Note that forcing |
|
1759 |
// initialization in this way could potentially lead to initialization order |
|
1760 |
// problems, in which case we could just force the initialization bit to be set. |
|
1761 |
||
1762 |
||
1763 |
// We need to iterate over the contents of a zip/jar file, so we replicate the |
|
1764 |
// jzcell and jzfile definitions from zip_util.h but rename jzfile to real_jzfile, |
|
1765 |
// since jzfile already has a void* definition. |
|
1766 |
// |
|
1767 |
// Note that this is only used in debug mode. |
|
1768 |
// |
|
1769 |
// HotSpot integration note: |
|
1770 |
// Matches zip_util.h 1.14 99/06/01 from jdk1.3 beta H build |
|
1771 |
||
1772 |
||
1773 |
// JDK 1.3 version |
|
25057 | 1774 |
typedef struct real_jzentry { /* Zip file entry */ |
1 | 1775 |
char *name; /* entry name */ |
1776 |
jint time; /* modification time */ |
|
1777 |
jint size; /* size of uncompressed data */ |
|
1778 |
jint csize; /* size of compressed data (zero if uncompressed) */ |
|
1779 |
jint crc; /* crc of uncompressed data */ |
|
1780 |
char *comment; /* optional zip file comment */ |
|
1781 |
jbyte *extra; /* optional extra data */ |
|
1782 |
jint pos; /* position of LOC header (if negative) or data */ |
|
25057 | 1783 |
} real_jzentry; |
1 | 1784 |
|
25057 | 1785 |
typedef struct real_jzfile { /* Zip file */ |
1 | 1786 |
char *name; /* zip file name */ |
1787 |
jint refs; /* number of active references */ |
|
1788 |
jint fd; /* open file descriptor */ |
|
1789 |
void *lock; /* read lock */ |
|
1790 |
char *comment; /* zip file comment */ |
|
1791 |
char *msg; /* zip error message */ |
|
1792 |
void *entries; /* array of hash cells */ |
|
1793 |
jint total; /* total number of entries */ |
|
1794 |
unsigned short *table; /* Hash chain heads: indexes into entries */ |
|
1795 |
jint tablelen; /* number of hash eads */ |
|
25057 | 1796 |
real_jzfile *next; /* next zip file in search list */ |
1 | 1797 |
jzentry *cache; /* we cache the most recently freed jzentry */ |
1798 |
/* Information on metadata names in META-INF directory */ |
|
1799 |
char **metanames; /* array of meta names (may have null names) */ |
|
1800 |
jint metacount; /* number of slots in metanames array */ |
|
1801 |
/* If there are any per-entry comments, they are in the comments array */ |
|
1802 |
char **comments; |
|
25057 | 1803 |
} real_jzfile; |
1 | 1804 |
|
1805 |
void ClassPathDirEntry::compile_the_world(Handle loader, TRAPS) { |
|
1806 |
// For now we only compile all methods in all classes in zip/jar files |
|
1807 |
tty->print_cr("CompileTheWorld : Skipped classes in %s", _dir); |
|
1808 |
tty->cr(); |
|
1809 |
} |
|
1810 |
||
1811 |
void ClassPathZipEntry::compile_the_world(Handle loader, TRAPS) { |
|
25057 | 1812 |
real_jzfile* zip = (real_jzfile*) _zip; |
1813 |
tty->print_cr("CompileTheWorld : Compiling all classes in %s", zip->name); |
|
1814 |
tty->cr(); |
|
1815 |
// Iterate over all entries in zip file |
|
1816 |
for (int n = 0; ; n++) { |
|
1817 |
real_jzentry * ze = (real_jzentry *)((*GetNextEntry)(_zip, n)); |
|
1818 |
if (ze == NULL) break; |
|
1819 |
ClassLoader::compile_the_world_in(ze->name, loader, CHECK); |
|
1 | 1820 |
} |
1821 |
if (HAS_PENDING_EXCEPTION) { |
|
1822 |
if (PENDING_EXCEPTION->is_a(SystemDictionary::OutOfMemoryError_klass())) { |
|
1823 |
CLEAR_PENDING_EXCEPTION; |
|
1824 |
tty->print_cr("\nCompileTheWorld : Ran out of memory\n"); |
|
13728
882756847a04
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
13195
diff
changeset
|
1825 |
tty->print_cr("Increase class metadata storage if a limit was set"); |
1 | 1826 |
} else { |
1827 |
tty->print_cr("\nCompileTheWorld : Unexpected exception occurred\n"); |
|
1828 |
} |
|
1829 |
} |
|
1830 |
} |
|
1831 |
||
1832 |
void ClassLoader::compile_the_world() { |
|
1833 |
EXCEPTION_MARK; |
|
1834 |
HandleMark hm(THREAD); |
|
1835 |
ResourceMark rm(THREAD); |
|
36807
539a2817f0b4
8152004: CTW crashes with failed assertion after 8150646 integration
fzhinkin
parents:
36364
diff
changeset
|
1836 |
|
40013 | 1837 |
assert(has_jrt_entry(), "Compile The World not supported with exploded module build"); |
1838 |
||
1 | 1839 |
// Find bootstrap loader |
1840 |
Handle system_class_loader (THREAD, SystemDictionary::java_system_loader()); |
|
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1841 |
jlong start = os::javaTimeMillis(); |
40013 | 1842 |
|
1843 |
// Compile the world for the modular java runtime image |
|
1844 |
_jrt_entry->compile_the_world(system_class_loader, CATCH); |
|
1845 |
||
1846 |
// Iterate over all bootstrap class path appended entries |
|
1847 |
ClassPathEntry* e = _first_append_entry; |
|
1 | 1848 |
while (e != NULL) { |
40013 | 1849 |
assert(!e->is_jrt(), "A modular java runtime image is present on the list of appended entries"); |
1 | 1850 |
e->compile_the_world(system_class_loader, CATCH); |
1851 |
e = e->next(); |
|
1852 |
} |
|
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1853 |
jlong end = os::javaTimeMillis(); |
24424
2658d7834c6e
8037816: Fix for 8036122 breaks build with Xcode5/clang
drchase
parents:
22838
diff
changeset
|
1854 |
tty->print_cr("CompileTheWorld : Done (%d classes, %d methods, " JLONG_FORMAT " ms)", |
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1855 |
_compile_the_world_class_counter, _compile_the_world_method_counter, (end - start)); |
1 | 1856 |
{ |
1857 |
// Print statistics as if before normal exit: |
|
1858 |
extern void print_statistics(); |
|
1859 |
print_statistics(); |
|
1860 |
} |
|
1861 |
vm_exit(0); |
|
1862 |
} |
|
1863 |
||
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1864 |
int ClassLoader::_compile_the_world_class_counter = 0; |
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1865 |
int ClassLoader::_compile_the_world_method_counter = 0; |
4736
e091227926da
6919886: Sweep CodeCache more aggressively to reduce its usage for CompileTheWorld
kvn
parents:
4571
diff
changeset
|
1866 |
static int _codecache_sweep_counter = 0; |
1 | 1867 |
|
8327 | 1868 |
// Filter out all exceptions except OOMs |
1869 |
static void clear_pending_exception_if_not_oom(TRAPS) { |
|
1870 |
if (HAS_PENDING_EXCEPTION && |
|
1871 |
!PENDING_EXCEPTION->is_a(SystemDictionary::OutOfMemoryError_klass())) { |
|
1872 |
CLEAR_PENDING_EXCEPTION; |
|
1873 |
} |
|
1874 |
// The CHECK at the caller will propagate the exception out |
|
1875 |
} |
|
1876 |
||
20008
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1877 |
/** |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1878 |
* Returns if the given method should be compiled when doing compile-the-world. |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1879 |
* |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1880 |
* TODO: This should be a private method in a CompileTheWorld class. |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1881 |
*/ |
46727
6e4a84748e2c
8183039: Re-examine methodHandle methods uninlined by 8144256
coleenp
parents:
46701
diff
changeset
|
1882 |
static bool can_be_compiled(const methodHandle& m, int comp_level) { |
20008
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1883 |
assert(CompileTheWorld, "must be"); |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1884 |
|
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1885 |
// It's not valid to compile a native wrapper for MethodHandle methods |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1886 |
// that take a MemberName appendix since the bytecode signature is not |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1887 |
// correct. |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1888 |
vmIntrinsics::ID iid = m->intrinsic_id(); |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1889 |
if (MethodHandles::is_signature_polymorphic(iid) && MethodHandles::has_member_arg(iid)) { |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1890 |
return false; |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1891 |
} |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1892 |
|
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1893 |
return CompilationPolicy::can_be_compiled(m, comp_level); |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1894 |
} |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1895 |
|
1 | 1896 |
void ClassLoader::compile_the_world_in(char* name, Handle loader, TRAPS) { |
27562 | 1897 |
if (string_ends_with(name, ".class")) { |
1 | 1898 |
// We have a .class file |
27562 | 1899 |
int len = (int)strlen(name); |
1 | 1900 |
char buffer[2048]; |
1901 |
strncpy(buffer, name, len - 6); |
|
1902 |
buffer[len-6] = 0; |
|
1903 |
// If the file has a period after removing .class, it's not really a |
|
1904 |
// valid class file. The class loader will check everything else. |
|
1905 |
if (strchr(buffer, '.') == NULL) { |
|
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1906 |
_compile_the_world_class_counter++; |
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1907 |
if (_compile_the_world_class_counter > CompileTheWorldStopAt) return; |
2567 | 1908 |
|
1909 |
// Construct name without extension |
|
8076
96d498ec7ae1
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
7910
diff
changeset
|
1910 |
TempNewSymbol sym = SymbolTable::new_symbol(buffer, CHECK); |
2567 | 1911 |
// Use loader to load and initialize class |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1912 |
Klass* k = SystemDictionary::resolve_or_null(sym, loader, Handle(), THREAD); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1913 |
if (k != NULL && !HAS_PENDING_EXCEPTION) { |
2567 | 1914 |
k->initialize(THREAD); |
1915 |
} |
|
1916 |
bool exception_occurred = HAS_PENDING_EXCEPTION; |
|
8327 | 1917 |
clear_pending_exception_if_not_oom(CHECK); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1918 |
if (CompileTheWorldPreloadClasses && k != NULL) { |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1919 |
InstanceKlass* ik = InstanceKlass::cast(k); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1920 |
ConstantPool::preload_and_initialize_all_classes(ik->constants(), THREAD); |
2567 | 1921 |
if (HAS_PENDING_EXCEPTION) { |
1922 |
// If something went wrong in preloading we just ignore it |
|
8327 | 1923 |
clear_pending_exception_if_not_oom(CHECK); |
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1924 |
tty->print_cr("Preloading failed for (%d) %s", _compile_the_world_class_counter, buffer); |
1 | 1925 |
} |
2567 | 1926 |
} |
1927 |
||
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1928 |
if (_compile_the_world_class_counter >= CompileTheWorldStartAt) { |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1929 |
if (k == NULL || exception_occurred) { |
1 | 1930 |
// If something went wrong (e.g. ExceptionInInitializerError) we skip this class |
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1931 |
tty->print_cr("CompileTheWorld (%d) : Skipping %s", _compile_the_world_class_counter, buffer); |
1 | 1932 |
} else { |
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1933 |
tty->print_cr("CompileTheWorld (%d) : %s", _compile_the_world_class_counter, buffer); |
1 | 1934 |
// Preload all classes to get around uncommon traps |
1935 |
// Iterate over all methods in class |
|
17126
42a942feeea2
8012322: Tiered: CompilationPolicy::can_be_compiled(CompLevel_all) mistakenly return false
iignatyev
parents:
17004
diff
changeset
|
1936 |
int comp_level = CompilationPolicy::policy()->initial_compile_level(); |
46329
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1937 |
InstanceKlass* ik = InstanceKlass::cast(k); |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1938 |
for (int n = 0; n < ik->methods()->length(); n++) { |
53ccc37bda19
8155672: Remove instanceKlassHandles and KlassHandles
coleenp
parents:
46289
diff
changeset
|
1939 |
methodHandle m (THREAD, ik->methods()->at(n)); |
20008
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1940 |
if (can_be_compiled(m, comp_level)) { |
4736
e091227926da
6919886: Sweep CodeCache more aggressively to reduce its usage for CompileTheWorld
kvn
parents:
4571
diff
changeset
|
1941 |
if (++_codecache_sweep_counter == CompileTheWorldSafepointInterval) { |
e091227926da
6919886: Sweep CodeCache more aggressively to reduce its usage for CompileTheWorld
kvn
parents:
4571
diff
changeset
|
1942 |
// Give sweeper a chance to keep up with CTW |
46495
34f7d403039f
8152953: ForceSafepoint operations should be more specific
rehn
parents:
46463
diff
changeset
|
1943 |
VM_CTWThreshold op; |
4736
e091227926da
6919886: Sweep CodeCache more aggressively to reduce its usage for CompileTheWorld
kvn
parents:
4571
diff
changeset
|
1944 |
VMThread::execute(&op); |
e091227926da
6919886: Sweep CodeCache more aggressively to reduce its usage for CompileTheWorld
kvn
parents:
4571
diff
changeset
|
1945 |
_codecache_sweep_counter = 0; |
e091227926da
6919886: Sweep CodeCache more aggressively to reduce its usage for CompileTheWorld
kvn
parents:
4571
diff
changeset
|
1946 |
} |
1 | 1947 |
// Force compilation |
17126
42a942feeea2
8012322: Tiered: CompilationPolicy::can_be_compiled(CompLevel_all) mistakenly return false
iignatyev
parents:
17004
diff
changeset
|
1948 |
CompileBroker::compile_method(m, InvocationEntryBci, comp_level, |
38218 | 1949 |
methodHandle(), 0, CompileTask::Reason_CTW, THREAD); |
1 | 1950 |
if (HAS_PENDING_EXCEPTION) { |
8327 | 1951 |
clear_pending_exception_if_not_oom(CHECK); |
20008
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1952 |
tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_class_counter, m->name_and_sig_as_C_string()); |
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1953 |
} else { |
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1954 |
_compile_the_world_method_counter++; |
1 | 1955 |
} |
10250
0794cd144834
7066339: Tiered: policy should make consistent decisions about osr levels
iveresov
parents:
8921
diff
changeset
|
1956 |
if (TieredCompilation && TieredStopAtLevel >= CompLevel_full_optimization) { |
2567 | 1957 |
// Clobber the first compile and force second tier compilation |
38133
78b95467b9f1
8151956: Support non-continuous CodeBlobs in HotSpot
rbackman
parents:
37418
diff
changeset
|
1958 |
CompiledMethod* nm = m->code(); |
26581
cb21ee34883d
8057750: CTW should not make MH intrinsics not entrant
iveresov
parents:
26135
diff
changeset
|
1959 |
if (nm != NULL && !m->is_method_handle_intrinsic()) { |
2567 | 1960 |
// Throw out the code so that the code cache doesn't fill up |
1961 |
nm->make_not_entrant(); |
|
1962 |
} |
|
6453 | 1963 |
CompileBroker::compile_method(m, InvocationEntryBci, CompLevel_full_optimization, |
38218 | 1964 |
methodHandle(), 0, CompileTask::Reason_CTW, THREAD); |
2567 | 1965 |
if (HAS_PENDING_EXCEPTION) { |
8327 | 1966 |
clear_pending_exception_if_not_oom(CHECK); |
20008
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1967 |
tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_class_counter, m->name_and_sig_as_C_string()); |
17004
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1968 |
} else { |
4d2371d76a19
8011933: add number of classes, methods and time spent to CompileTheWorld
twisti
parents:
14588
diff
changeset
|
1969 |
_compile_the_world_method_counter++; |
2567 | 1970 |
} |
1 | 1971 |
} |
20008
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1972 |
} else { |
9f5ffba04ead
8024275: During CTW: assert(sig_bt[member_arg_pos] == T_OBJECT) failed: dispatch argument must be an object
twisti
parents:
19685
diff
changeset
|
1973 |
tty->print_cr("CompileTheWorld (%d) : Skipping method: %s", _compile_the_world_class_counter, m->name_and_sig_as_C_string()); |
1 | 1974 |
} |
2567 | 1975 |
|
38133
78b95467b9f1
8151956: Support non-continuous CodeBlobs in HotSpot
rbackman
parents:
37418
diff
changeset
|
1976 |
CompiledMethod* nm = m->code(); |
26581
cb21ee34883d
8057750: CTW should not make MH intrinsics not entrant
iveresov
parents:
26135
diff
changeset
|
1977 |
if (nm != NULL && !m->is_method_handle_intrinsic()) { |
2567 | 1978 |
// Throw out the code so that the code cache doesn't fill up |
1979 |
nm->make_not_entrant(); |
|
1 | 1980 |
} |
1981 |
} |
|
1982 |
} |
|
1983 |
} |
|
1984 |
} |
|
1985 |
} |
|
1986 |
} |
|
1987 |
||
1988 |
#endif //PRODUCT |
|
7910
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1989 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1990 |
// Please keep following two functions at end of this file. With them placed at top or in middle of the file, |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1991 |
// they could get inlined by agressive compiler, an unknown trick, see bug 6966589. |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1992 |
void PerfClassTraceTime::initialize() { |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1993 |
if (!UsePerfData) return; |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1994 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1995 |
if (_eventp != NULL) { |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1996 |
// increment the event counter |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1997 |
_eventp->inc(); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1998 |
} |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
1999 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2000 |
// stop the current active thread-local timer to measure inclusive time |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2001 |
_prev_active_event = -1; |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2002 |
for (int i=0; i < EVENT_TYPE_COUNT; i++) { |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2003 |
if (_timers[i].is_active()) { |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2004 |
assert(_prev_active_event == -1, "should have only one active timer"); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2005 |
_prev_active_event = i; |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2006 |
_timers[i].stop(); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2007 |
} |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2008 |
} |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2009 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2010 |
if (_recursion_counters == NULL || (_recursion_counters[_event_type])++ == 0) { |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2011 |
// start the inclusive timer if not recursively called |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2012 |
_t.start(); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2013 |
} |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2014 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2015 |
// start thread-local timer of the given event type |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2016 |
if (!_timers[_event_type].is_active()) { |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2017 |
_timers[_event_type].start(); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2018 |
} |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2019 |
} |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2020 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2021 |
PerfClassTraceTime::~PerfClassTraceTime() { |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2022 |
if (!UsePerfData) return; |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2023 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2024 |
// stop the thread-local timer as the event completes |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2025 |
// and resume the thread-local timer of the event next on the stack |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2026 |
_timers[_event_type].stop(); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2027 |
jlong selftime = _timers[_event_type].ticks(); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2028 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2029 |
if (_prev_active_event >= 0) { |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2030 |
_timers[_prev_active_event].start(); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2031 |
} |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2032 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2033 |
if (_recursion_counters != NULL && --(_recursion_counters[_event_type]) > 0) return; |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2034 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2035 |
// increment the counters only on the leaf call |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2036 |
_t.stop(); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2037 |
_timep->inc(_t.ticks()); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2038 |
if (_selftimep != NULL) { |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2039 |
_selftimep->inc(selftime); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2040 |
} |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2041 |
// add all class loading related event selftime to the accumulated time counter |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2042 |
ClassLoader::perf_accumulated_time()->inc(selftime); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2043 |
|
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2044 |
// reset the timer |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2045 |
_timers[_event_type].reset(); |
135031ddb2bb
6966589: hs16-b08 causes java.lang.StackOverflowError
minqi
parents:
7405
diff
changeset
|
2046 |
} |