author | mbaesken |
Thu, 17 May 2018 18:09:19 +0200 | |
changeset 50231 | 10b14c9ee78d |
parent 49739 | 00805b129186 |
child 50634 | c349d409262a |
permissions | -rw-r--r-- |
36508 | 1 |
/* |
49192
6734eeef4283
8198474: Move JNIHandles::resolve into jniHandles.inline.hpp
kbarrett
parents:
47765
diff
changeset
|
2 |
* Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved. |
36508 | 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 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
* |
|
23 |
*/ |
|
24 |
||
25 |
#include "precompiled.hpp" |
|
47765
b7c7428eaab9
8189610: Reconcile jvm.h and all jvm_md.h between java.base and hotspot
coleenp
parents:
47216
diff
changeset
|
26 |
#include "jvm.h" |
36508 | 27 |
#include "classfile/classFileParser.hpp" |
28 |
#include "classfile/classLoader.hpp" |
|
29 |
#include "classfile/classLoaderData.inline.hpp" |
|
30 |
#include "classfile/javaAssertions.hpp" |
|
31 |
#include "classfile/javaClasses.hpp" |
|
32 |
#include "classfile/javaClasses.inline.hpp" |
|
33 |
#include "classfile/moduleEntry.hpp" |
|
34 |
#include "classfile/modules.hpp" |
|
35 |
#include "classfile/packageEntry.hpp" |
|
36 |
#include "classfile/stringTable.hpp" |
|
37 |
#include "classfile/symbolTable.hpp" |
|
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
38 |
#include "classfile/systemDictionary.hpp" |
36508 | 39 |
#include "classfile/vmSymbols.hpp" |
40 |
#include "logging/log.hpp" |
|
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
41 |
#include "logging/logStream.hpp" |
37248 | 42 |
#include "memory/resourceArea.hpp" |
36508 | 43 |
#include "oops/instanceKlass.hpp" |
44 |
#include "runtime/arguments.hpp" |
|
45 |
#include "runtime/handles.inline.hpp" |
|
46 |
#include "runtime/javaCalls.hpp" |
|
49192
6734eeef4283
8198474: Move JNIHandles::resolve into jniHandles.inline.hpp
kbarrett
parents:
47765
diff
changeset
|
47 |
#include "runtime/jniHandles.inline.hpp" |
36508 | 48 |
#include "runtime/reflection.hpp" |
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
49 |
#include "utilities/stringUtils.hpp" |
36508 | 50 |
#include "utilities/utf8.hpp" |
51 |
||
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
52 |
static bool verify_module_name(const char *module_name) { |
36508 | 53 |
if (module_name == NULL) return false; |
54 |
int len = (int)strlen(module_name); |
|
42630
ae91fbc4b59f
8170987: Module system implementation refresh (12/2016)
alanb
parents:
42307
diff
changeset
|
55 |
return (len > 0 && len <= Symbol::max_length()); |
36508 | 56 |
} |
57 |
||
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
58 |
bool Modules::verify_package_name(const char* package_name) { |
36508 | 59 |
if (package_name == NULL) return false; |
60 |
int len = (int)strlen(package_name); |
|
61 |
return (len > 0 && len <= Symbol::max_length() && |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
62 |
UTF8::is_legal_utf8((const unsigned char *)package_name, len, false) && |
36508 | 63 |
ClassFileParser::verify_unqualified_name(package_name, len, |
64 |
ClassFileParser::LegalClass)); |
|
65 |
} |
|
66 |
||
67 |
static char* get_module_name(oop module, TRAPS) { |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
68 |
oop name_oop = java_lang_Module::name(module); |
36508 | 69 |
if (name_oop == NULL) { |
70 |
THROW_MSG_NULL(vmSymbols::java_lang_NullPointerException(), "Null module name"); |
|
71 |
} |
|
72 |
char* module_name = java_lang_String::as_utf8_string(name_oop); |
|
73 |
if (!verify_module_name(module_name)) { |
|
74 |
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), |
|
75 |
err_msg("Invalid module name: %s", |
|
76 |
module_name != NULL ? module_name : "NULL")); |
|
77 |
} |
|
78 |
return module_name; |
|
79 |
} |
|
80 |
||
81 |
static const char* get_module_version(jstring version) { |
|
82 |
if (version == NULL) { |
|
83 |
return NULL; |
|
84 |
} |
|
85 |
return java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(version)); |
|
86 |
} |
|
87 |
||
49739
00805b129186
8194812: Extend class-data sharing to support the module path
ccheung
parents:
49348
diff
changeset
|
88 |
ModuleEntryTable* Modules::get_module_entry_table(Handle h_loader) { |
36508 | 89 |
// This code can be called during start-up, before the classLoader's classLoader data got |
90 |
// created. So, call register_loader() to make sure the classLoader data gets created. |
|
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49192
diff
changeset
|
91 |
ClassLoaderData *loader_cld = SystemDictionary::register_loader(h_loader); |
36508 | 92 |
return loader_cld->modules(); |
93 |
} |
|
94 |
||
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49192
diff
changeset
|
95 |
static PackageEntryTable* get_package_entry_table(Handle h_loader) { |
36508 | 96 |
// This code can be called during start-up, before the classLoader's classLoader data got |
97 |
// created. So, call register_loader() to make sure the classLoader data gets created. |
|
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49192
diff
changeset
|
98 |
ClassLoaderData *loader_cld = SystemDictionary::register_loader(h_loader); |
36508 | 99 |
return loader_cld->packages(); |
100 |
} |
|
101 |
||
102 |
static ModuleEntry* get_module_entry(jobject module, TRAPS) { |
|
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49192
diff
changeset
|
103 |
oop m = JNIHandles::resolve(module); |
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49192
diff
changeset
|
104 |
if (!java_lang_Module::is_instance(m)) { |
40020
20738e6bef83
8160487: JVM should validate a module by checking for an instance of java.lang.reflect.Module
lfoltan
parents:
40013
diff
changeset
|
105 |
THROW_MSG_NULL(vmSymbols::java_lang_IllegalArgumentException(), |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
106 |
"module is not an instance of type java.lang.Module"); |
36508 | 107 |
} |
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49192
diff
changeset
|
108 |
return java_lang_Module::module_entry(m); |
36508 | 109 |
} |
110 |
||
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
111 |
static PackageEntry* get_package_entry(ModuleEntry* module_entry, const char* package_name, TRAPS) { |
36508 | 112 |
ResourceMark rm(THREAD); |
113 |
if (package_name == NULL) return NULL; |
|
114 |
TempNewSymbol pkg_symbol = SymbolTable::new_symbol(package_name, CHECK_NULL); |
|
39616
f82b1f888578
8159262: Walking PackageEntry Export and ModuleEntry Reads Must Occur Only When Neccessary And Wait Until ClassLoader's Aliveness Determined
lfoltan
parents:
39290
diff
changeset
|
115 |
PackageEntryTable* package_entry_table = module_entry->loader_data()->packages(); |
36508 | 116 |
assert(package_entry_table != NULL, "Unexpected null package entry table"); |
117 |
return package_entry_table->lookup_only(pkg_symbol); |
|
118 |
} |
|
119 |
||
120 |
static PackageEntry* get_package_entry_by_name(Symbol* package, |
|
121 |
Handle h_loader, |
|
122 |
TRAPS) { |
|
123 |
if (package != NULL) { |
|
124 |
ResourceMark rm(THREAD); |
|
125 |
if (Modules::verify_package_name(package->as_C_string())) { |
|
126 |
PackageEntryTable* const package_entry_table = |
|
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49192
diff
changeset
|
127 |
get_package_entry_table(h_loader); |
36508 | 128 |
assert(package_entry_table != NULL, "Unexpected null package entry table"); |
129 |
return package_entry_table->lookup_only(package); |
|
130 |
} |
|
131 |
} |
|
132 |
return NULL; |
|
133 |
} |
|
134 |
||
135 |
bool Modules::is_package_defined(Symbol* package, Handle h_loader, TRAPS) { |
|
136 |
PackageEntry* res = get_package_entry_by_name(package, h_loader, CHECK_false); |
|
137 |
return res != NULL; |
|
138 |
} |
|
139 |
||
140 |
static void define_javabase_module(jobject module, jstring version, |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
141 |
jstring location, const char* const* packages, |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
142 |
jsize num_packages, TRAPS) { |
36508 | 143 |
ResourceMark rm(THREAD); |
144 |
||
145 |
Handle module_handle(THREAD, JNIHandles::resolve(module)); |
|
146 |
||
147 |
// Obtain java.base's module version |
|
148 |
const char* module_version = get_module_version(version); |
|
149 |
TempNewSymbol version_symbol; |
|
150 |
if (module_version != NULL) { |
|
151 |
version_symbol = SymbolTable::new_symbol(module_version, CHECK); |
|
152 |
} else { |
|
153 |
version_symbol = NULL; |
|
154 |
} |
|
155 |
||
156 |
// Obtain java.base's location |
|
157 |
const char* module_location = NULL; |
|
158 |
TempNewSymbol location_symbol = NULL; |
|
159 |
if (location != NULL) { |
|
160 |
module_location = |
|
161 |
java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(location)); |
|
162 |
if (module_location != NULL) { |
|
163 |
location_symbol = SymbolTable::new_symbol(module_location, CHECK); |
|
164 |
} |
|
165 |
} |
|
166 |
||
167 |
||
46322
25836096c89d
8172514: Stop checking for duplicate packages in the JVM_DefineModule() package list
hseigel
parents:
46296
diff
changeset
|
168 |
// Check that the packages are syntactically ok. |
36508 | 169 |
GrowableArray<Symbol*>* pkg_list = new GrowableArray<Symbol*>(num_packages); |
170 |
for (int x = 0; x < num_packages; x++) { |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
171 |
const char *package_name = packages[x]; |
36508 | 172 |
if (!Modules::verify_package_name(package_name)) { |
173 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
41691
diff
changeset
|
174 |
err_msg("Invalid package name: %s for module: " JAVA_BASE_NAME, package_name)); |
36508 | 175 |
} |
176 |
Symbol* pkg_symbol = SymbolTable::new_symbol(package_name, CHECK); |
|
46322
25836096c89d
8172514: Stop checking for duplicate packages in the JVM_DefineModule() package list
hseigel
parents:
46296
diff
changeset
|
177 |
pkg_list->append(pkg_symbol); |
36508 | 178 |
} |
179 |
||
180 |
// Validate java_base's loader is the boot loader. |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
181 |
oop loader = java_lang_Module::loader(module_handle()); |
36508 | 182 |
if (loader != NULL) { |
183 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
184 |
"Class loader must be the boot class loader"); |
|
185 |
} |
|
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
42656
diff
changeset
|
186 |
Handle h_loader(THREAD, loader); |
36508 | 187 |
|
188 |
// Ensure the boot loader's PackageEntryTable has been created |
|
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49192
diff
changeset
|
189 |
PackageEntryTable* package_table = get_package_entry_table(h_loader); |
36508 | 190 |
assert(pkg_list->length() == 0 || package_table != NULL, "Bad package_table"); |
191 |
||
192 |
// Ensure java.base's ModuleEntry has been created |
|
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
41691
diff
changeset
|
193 |
assert(ModuleEntryTable::javabase_moduleEntry() != NULL, "No ModuleEntry for " JAVA_BASE_NAME); |
36508 | 194 |
|
38732
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
195 |
bool duplicate_javabase = false; |
36508 | 196 |
{ |
197 |
MutexLocker m1(Module_lock, THREAD); |
|
198 |
||
38014
8731fa11f766
8152949: Jigsaw crash when Klass in _fixup_module_field_list is unloaded
lfoltan
parents:
37248
diff
changeset
|
199 |
if (ModuleEntryTable::javabase_defined()) { |
38732
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
200 |
duplicate_javabase = true; |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
201 |
} else { |
38014
8731fa11f766
8152949: Jigsaw crash when Klass in _fixup_module_field_list is unloaded
lfoltan
parents:
37248
diff
changeset
|
202 |
|
38732
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
203 |
// Verify that all java.base packages created during bootstrapping are in |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
204 |
// pkg_list. If any are not in pkg_list, than a non-java.base class was |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
205 |
// loaded erroneously pre java.base module definition. |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
206 |
package_table->verify_javabase_packages(pkg_list); |
36508 | 207 |
|
38732
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
208 |
// loop through and add any new packages for java.base |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
209 |
PackageEntry* pkg; |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
210 |
for (int x = 0; x < pkg_list->length(); x++) { |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
211 |
// Some of java.base's packages were added early in bootstrapping, ignore duplicates. |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
212 |
if (package_table->lookup_only(pkg_list->at(x)) == NULL) { |
41183
207b92e69457
8163406: The fixup_module_list must be protected by Module_lock when inserting new entries
lfoltan
parents:
40020
diff
changeset
|
213 |
pkg = package_table->locked_create_entry_or_null(pkg_list->at(x), ModuleEntryTable::javabase_moduleEntry()); |
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
41691
diff
changeset
|
214 |
assert(pkg != NULL, "Unable to create a " JAVA_BASE_NAME " package entry"); |
38732
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
215 |
} |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
216 |
// Unable to have a GrowableArray of TempNewSymbol. Must decrement the refcount of |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
217 |
// the Symbol* that was created above for each package. The refcount was incremented |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
218 |
// by SymbolTable::new_symbol and as well by the PackageEntry creation. |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
219 |
pkg_list->at(x)->decrement_refcount(); |
36508 | 220 |
} |
38732
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
221 |
|
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
222 |
// Finish defining java.base's ModuleEntry |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
223 |
ModuleEntryTable::finalize_javabase(module_handle, version_symbol, location_symbol); |
36508 | 224 |
} |
38732
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
225 |
} |
bb77e0dcc7e5
8158060: BasicLayerTest causes fatal error: Thread holding lock at safepoint that vm can block on: Module_lock
hseigel
parents:
38207
diff
changeset
|
226 |
if (duplicate_javabase) { |
43446
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
227 |
THROW_MSG(vmSymbols::java_lang_InternalError(), |
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
41691
diff
changeset
|
228 |
"Module " JAVA_BASE_NAME " is already defined"); |
36508 | 229 |
} |
230 |
||
41691
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
231 |
// Only the thread that actually defined the base module will get here, |
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
232 |
// so no locking is needed. |
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
233 |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
234 |
// Patch any previously loaded class's module field with java.base's java.lang.Module. |
41691
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
235 |
ModuleEntryTable::patch_javabase_entries(module_handle); |
1be281ee5de4
8166364: fatal error: acquiring lock DirtyCardQ_CBL_mon/16 out of order with lock Module_lock/6 -- possible deadlock
hseigel
parents:
41183
diff
changeset
|
236 |
|
44993
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
237 |
log_info(module, load)(JAVA_BASE_NAME " location: %s", |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
238 |
module_location != NULL ? module_location : "NULL"); |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
239 |
log_debug(module)("define_javabase_module(): Definition of module: " |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
240 |
JAVA_BASE_NAME ", version: %s, location: %s, package #: %d", |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
241 |
module_version != NULL ? module_version : "NULL", |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
242 |
module_location != NULL ? module_location : "NULL", |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
243 |
pkg_list->length()); |
36508 | 244 |
|
245 |
// packages defined to java.base |
|
46458 | 246 |
if (log_is_enabled(Trace, module)) { |
46404
ae62ba99a1a7
8165896: Use "open" flag from JVM_DefineModule to export all module packages
rprotacio
parents:
46388
diff
changeset
|
247 |
for (int x = 0; x < pkg_list->length(); x++) { |
46458 | 248 |
log_trace(module)("define_javabase_module(): creation of package %s for module " JAVA_BASE_NAME, |
249 |
(pkg_list->at(x))->as_C_string()); |
|
46404
ae62ba99a1a7
8165896: Use "open" flag from JVM_DefineModule to export all module packages
rprotacio
parents:
46388
diff
changeset
|
250 |
} |
36508 | 251 |
} |
252 |
} |
|
253 |
||
43446
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
254 |
// Caller needs ResourceMark. |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
255 |
void throw_dup_pkg_exception(const char* module_name, PackageEntry* package, TRAPS) { |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
256 |
const char* package_name = package->name()->as_C_string(); |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
257 |
if (package->module()->is_named()) { |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
258 |
THROW_MSG(vmSymbols::java_lang_IllegalStateException(), |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
259 |
err_msg("Package %s for module %s is already in another module, %s, defined to the class loader", |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
260 |
package_name, module_name, package->module()->name()->as_C_string())); |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
261 |
} else { |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
262 |
THROW_MSG(vmSymbols::java_lang_IllegalStateException(), |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
263 |
err_msg("Package %s for module %s is already in the unnamed module defined to the class loader", |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
264 |
package_name, module_name)); |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
265 |
} |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
266 |
} |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
267 |
|
46404
ae62ba99a1a7
8165896: Use "open" flag from JVM_DefineModule to export all module packages
rprotacio
parents:
46388
diff
changeset
|
268 |
void Modules::define_module(jobject module, jboolean is_open, jstring version, |
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
269 |
jstring location, const char* const* packages, |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
270 |
jsize num_packages, TRAPS) { |
36508 | 271 |
ResourceMark rm(THREAD); |
272 |
||
273 |
if (module == NULL) { |
|
274 |
THROW_MSG(vmSymbols::java_lang_NullPointerException(), "Null module object"); |
|
275 |
} |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
276 |
|
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
277 |
if (num_packages < 0) { |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
278 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
279 |
"num_packages must be >= 0"); |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
280 |
} |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
281 |
|
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
282 |
if (packages == NULL && num_packages > 0) { |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
283 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
284 |
"num_packages should be zero if packages is null"); |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
285 |
} |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
286 |
|
36508 | 287 |
Handle module_handle(THREAD, JNIHandles::resolve(module)); |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
288 |
if (!java_lang_Module::is_instance(module_handle())) { |
36508 | 289 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
290 |
"module is not an instance of type java.lang.Module"); |
36508 | 291 |
} |
292 |
||
293 |
char* module_name = get_module_name(module_handle(), CHECK); |
|
294 |
if (module_name == NULL) { |
|
295 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
296 |
"Module name cannot be null"); |
|
297 |
} |
|
298 |
||
299 |
// Special handling of java.base definition |
|
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
41691
diff
changeset
|
300 |
if (strcmp(module_name, JAVA_BASE_NAME) == 0) { |
46404
ae62ba99a1a7
8165896: Use "open" flag from JVM_DefineModule to export all module packages
rprotacio
parents:
46388
diff
changeset
|
301 |
assert(is_open == JNI_FALSE, "java.base module cannot be open"); |
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
302 |
define_javabase_module(module, version, location, packages, num_packages, CHECK); |
36508 | 303 |
return; |
304 |
} |
|
305 |
||
306 |
const char* module_version = get_module_version(version); |
|
307 |
||
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
308 |
oop loader = java_lang_Module::loader(module_handle()); |
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
309 |
// Make sure loader is not the jdk.internal.reflect.DelegatingClassLoader. |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
310 |
if (loader != java_lang_ClassLoader::non_reflection_class_loader(loader)) { |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
311 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
312 |
"Class loader is an invalid delegating class loader"); |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
313 |
} |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
314 |
Handle h_loader = Handle(THREAD, loader); |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
315 |
|
36508 | 316 |
// Check that the list of packages has no duplicates and that the |
317 |
// packages are syntactically ok. |
|
318 |
GrowableArray<Symbol*>* pkg_list = new GrowableArray<Symbol*>(num_packages); |
|
319 |
for (int x = 0; x < num_packages; x++) { |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
320 |
const char* package_name = packages[x]; |
36508 | 321 |
if (!verify_package_name(package_name)) { |
322 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
323 |
err_msg("Invalid package name: %s for module: %s", |
|
324 |
package_name, module_name)); |
|
325 |
} |
|
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
326 |
|
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
327 |
// Only modules defined to either the boot or platform class loader, can define a "java/" package. |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
328 |
if (!h_loader.is_null() && |
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
42656
diff
changeset
|
329 |
!SystemDictionary::is_platform_class_loader(h_loader()) && |
44326
6c59cca7ff07
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43471
diff
changeset
|
330 |
(strncmp(package_name, JAVAPKG, JAVAPKG_LEN) == 0 && |
6c59cca7ff07
8174823: Module system implementation refresh (3/2017)
alanb
parents:
43471
diff
changeset
|
331 |
(package_name[JAVAPKG_LEN] == '/' || package_name[JAVAPKG_LEN] == '\0'))) { |
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
332 |
const char* class_loader_name = SystemDictionary::loader_name(h_loader()); |
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
333 |
size_t pkg_len = strlen(package_name); |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
334 |
char* pkg_name = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, pkg_len); |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
335 |
strncpy(pkg_name, package_name, pkg_len); |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
336 |
StringUtils::replace_no_expand(pkg_name, "/", "."); |
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
337 |
const char* msg_text1 = "Class loader (instance of): "; |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
338 |
const char* msg_text2 = " tried to define prohibited package name: "; |
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
339 |
size_t len = strlen(msg_text1) + strlen(class_loader_name) + strlen(msg_text2) + pkg_len + 1; |
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
340 |
char* message = NEW_RESOURCE_ARRAY_IN_THREAD(THREAD, char, len); |
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
341 |
jio_snprintf(message, len, "%s%s%s%s", msg_text1, class_loader_name, msg_text2, pkg_name); |
42307
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
342 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), message); |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
343 |
} |
cefc81dc1d52
8169069: Module system implementation refresh (11/2016)
alanb
parents:
41691
diff
changeset
|
344 |
|
36508 | 345 |
Symbol* pkg_symbol = SymbolTable::new_symbol(package_name, CHECK); |
46322
25836096c89d
8172514: Stop checking for duplicate packages in the JVM_DefineModule() package list
hseigel
parents:
46296
diff
changeset
|
346 |
pkg_list->append(pkg_symbol); |
36508 | 347 |
} |
348 |
||
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49192
diff
changeset
|
349 |
ModuleEntryTable* module_table = get_module_entry_table(h_loader); |
36508 | 350 |
assert(module_table != NULL, "module entry table shouldn't be null"); |
351 |
||
352 |
// Create symbol* entry for module name. |
|
353 |
TempNewSymbol module_symbol = SymbolTable::new_symbol(module_name, CHECK); |
|
354 |
||
355 |
bool dupl_modules = false; |
|
356 |
||
357 |
// Create symbol* entry for module version. |
|
358 |
TempNewSymbol version_symbol; |
|
359 |
if (module_version != NULL) { |
|
360 |
version_symbol = SymbolTable::new_symbol(module_version, CHECK); |
|
361 |
} else { |
|
362 |
version_symbol = NULL; |
|
363 |
} |
|
364 |
||
365 |
// Create symbol* entry for module location. |
|
366 |
const char* module_location = NULL; |
|
367 |
TempNewSymbol location_symbol = NULL; |
|
368 |
if (location != NULL) { |
|
369 |
module_location = |
|
370 |
java_lang_String::as_utf8_string(JNIHandles::resolve_non_null(location)); |
|
371 |
if (module_location != NULL) { |
|
372 |
location_symbol = SymbolTable::new_symbol(module_location, CHECK); |
|
373 |
} |
|
374 |
} |
|
375 |
||
376 |
ClassLoaderData* loader_data = ClassLoaderData::class_loader_data_or_null(h_loader()); |
|
377 |
assert(loader_data != NULL, "class loader data shouldn't be null"); |
|
378 |
||
379 |
PackageEntryTable* package_table = NULL; |
|
43446
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
380 |
PackageEntry* existing_pkg = NULL; |
36508 | 381 |
{ |
382 |
MutexLocker ml(Module_lock, THREAD); |
|
383 |
||
384 |
if (num_packages > 0) { |
|
49348
fde3feaaa4ed
8198926: Move ClassLoaderData::_dependencies to ClassLoaderData::_handles
coleenp
parents:
49192
diff
changeset
|
385 |
package_table = get_package_entry_table(h_loader); |
36508 | 386 |
assert(package_table != NULL, "Missing package_table"); |
387 |
||
388 |
// Check that none of the packages exist in the class loader's package table. |
|
389 |
for (int x = 0; x < pkg_list->length(); x++) { |
|
43446
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
390 |
existing_pkg = package_table->lookup_only(pkg_list->at(x)); |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
391 |
if (existing_pkg != NULL) { |
36508 | 392 |
// This could be because the module was already defined. If so, |
393 |
// report that error instead of the package error. |
|
394 |
if (module_table->lookup_only(module_symbol) != NULL) { |
|
395 |
dupl_modules = true; |
|
396 |
} |
|
397 |
break; |
|
398 |
} |
|
399 |
} |
|
400 |
} // if (num_packages > 0)... |
|
401 |
||
402 |
// Add the module and its packages. |
|
43446
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
403 |
if (!dupl_modules && existing_pkg == NULL) { |
36508 | 404 |
// Create the entry for this module in the class loader's module entry table. |
46404
ae62ba99a1a7
8165896: Use "open" flag from JVM_DefineModule to export all module packages
rprotacio
parents:
46388
diff
changeset
|
405 |
ModuleEntry* module_entry = module_table->locked_create_entry_or_null(module_handle, |
ae62ba99a1a7
8165896: Use "open" flag from JVM_DefineModule to export all module packages
rprotacio
parents:
46388
diff
changeset
|
406 |
(is_open == JNI_TRUE), module_symbol, |
36508 | 407 |
version_symbol, location_symbol, loader_data); |
408 |
||
409 |
if (module_entry == NULL) { |
|
410 |
dupl_modules = true; |
|
411 |
} else { |
|
412 |
// Add the packages. |
|
413 |
assert(pkg_list->length() == 0 || package_table != NULL, "Bad package table"); |
|
414 |
PackageEntry* pkg; |
|
415 |
for (int y = 0; y < pkg_list->length(); y++) { |
|
416 |
pkg = package_table->locked_create_entry_or_null(pkg_list->at(y), module_entry); |
|
417 |
assert(pkg != NULL, "Unable to create a module's package entry"); |
|
418 |
||
419 |
// Unable to have a GrowableArray of TempNewSymbol. Must decrement the refcount of |
|
420 |
// the Symbol* that was created above for each package. The refcount was incremented |
|
421 |
// by SymbolTable::new_symbol and as well by the PackageEntry creation. |
|
422 |
pkg_list->at(y)->decrement_refcount(); |
|
423 |
} |
|
424 |
||
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
425 |
// Store pointer to ModuleEntry record in java.lang.Module object. |
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
426 |
java_lang_Module::set_module_entry(module_handle(), module_entry); |
36508 | 427 |
} |
428 |
} |
|
429 |
} // Release the lock |
|
430 |
||
431 |
// any errors ? |
|
432 |
if (dupl_modules) { |
|
43446
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
433 |
THROW_MSG(vmSymbols::java_lang_IllegalStateException(), |
36508 | 434 |
err_msg("Module %s is already defined", module_name)); |
43446
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
435 |
} else if (existing_pkg != NULL) { |
4f9ac7ab99d9
8172288: Fix Jigsaw related module/package error messages and throw correct exceptions
hseigel
parents:
42656
diff
changeset
|
436 |
throw_dup_pkg_exception(module_name, existing_pkg, CHECK); |
36508 | 437 |
} |
438 |
||
44993
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
439 |
log_info(module, load)("%s location: %s", module_name, |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
440 |
module_location != NULL ? module_location : "NULL"); |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
441 |
LogTarget(Debug, module) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
442 |
if (lt.is_enabled()) { |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
443 |
LogStream ls(lt); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
444 |
ls.print("define_module(): creation of module: %s, version: %s, location: %s, ", |
36508 | 445 |
module_name, module_version != NULL ? module_version : "NULL", |
446 |
module_location != NULL ? module_location : "NULL"); |
|
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
447 |
loader_data->print_value_on(&ls); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
448 |
ls.print_cr(", package #: %d", pkg_list->length()); |
36508 | 449 |
for (int y = 0; y < pkg_list->length(); y++) { |
44993
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
450 |
log_trace(module)("define_module(): creation of package %s for module %s", |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
451 |
(pkg_list->at(y))->as_C_string(), module_name); |
36508 | 452 |
} |
453 |
} |
|
454 |
||
37773
e5b3e9732c3c
8154956: Module system implementation refresh (4/2016)
alanb
parents:
37248
diff
changeset
|
455 |
// If the module is defined to the boot loader and an exploded build is being |
46463
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46458
diff
changeset
|
456 |
// used, prepend <java.home>/modules/modules_name to the system boot class path. |
4bd2ca84df7a
8178604: JVM does not allow defining boot loader modules in exploded build after module system initialization
hseigel
parents:
46458
diff
changeset
|
457 |
if (loader == NULL && !ClassLoader::has_jrt_entry()) { |
40013 | 458 |
ClassLoader::add_to_exploded_build_list(module_symbol, CHECK); |
36508 | 459 |
} |
460 |
} |
|
461 |
||
462 |
void Modules::set_bootloader_unnamed_module(jobject module, TRAPS) { |
|
463 |
ResourceMark rm(THREAD); |
|
464 |
||
465 |
if (module == NULL) { |
|
466 |
THROW_MSG(vmSymbols::java_lang_NullPointerException(), "Null module object"); |
|
467 |
} |
|
468 |
Handle module_handle(THREAD, JNIHandles::resolve(module)); |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
469 |
if (!java_lang_Module::is_instance(module_handle())) { |
36508 | 470 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
471 |
"module is not an instance of type java.lang.Module"); |
36508 | 472 |
} |
473 |
||
474 |
// Ensure that this is an unnamed module |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
475 |
oop name = java_lang_Module::name(module_handle()); |
36508 | 476 |
if (name != NULL) { |
477 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
478 |
"boot loader's unnamed module's java.lang.Module has a name"); |
36508 | 479 |
} |
480 |
||
481 |
// Validate java_base's loader is the boot loader. |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
482 |
oop loader = java_lang_Module::loader(module_handle()); |
36508 | 483 |
if (loader != NULL) { |
484 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
485 |
"Class loader must be the boot class loader"); |
|
486 |
} |
|
46271
979ebd346ecf
8169881: Remove implicit Handle conversions oop->Handle
coleenp
parents:
42656
diff
changeset
|
487 |
Handle h_loader(THREAD, loader); |
36508 | 488 |
|
44993
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
489 |
log_debug(module)("set_bootloader_unnamed_module(): recording unnamed module for boot loader"); |
36508 | 490 |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
491 |
// Set java.lang.Module for the boot loader's unnamed module |
46387 | 492 |
ClassLoaderData* boot_loader_data = ClassLoaderData::the_null_class_loader_data(); |
493 |
ModuleEntry* unnamed_module = boot_loader_data->unnamed_module(); |
|
36508 | 494 |
assert(unnamed_module != NULL, "boot loader's unnamed ModuleEntry not defined"); |
46387 | 495 |
unnamed_module->set_module(boot_loader_data->add_handle(module_handle)); |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
496 |
// Store pointer to the ModuleEntry in the unnamed module's java.lang.Module object. |
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
497 |
java_lang_Module::set_module_entry(module_handle(), unnamed_module); |
36508 | 498 |
} |
499 |
||
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
500 |
void Modules::add_module_exports(jobject from_module, const char* package_name, jobject to_module, TRAPS) { |
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
501 |
if (package_name == NULL) { |
36508 | 502 |
THROW_MSG(vmSymbols::java_lang_NullPointerException(), |
503 |
"package is null"); |
|
504 |
} |
|
505 |
if (from_module == NULL) { |
|
506 |
THROW_MSG(vmSymbols::java_lang_NullPointerException(), |
|
507 |
"from_module is null"); |
|
508 |
} |
|
509 |
ModuleEntry* from_module_entry = get_module_entry(from_module, CHECK); |
|
510 |
if (from_module_entry == NULL) { |
|
511 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
512 |
"from_module cannot be found"); |
|
513 |
} |
|
514 |
||
46404
ae62ba99a1a7
8165896: Use "open" flag from JVM_DefineModule to export all module packages
rprotacio
parents:
46388
diff
changeset
|
515 |
// All packages in unnamed and open modules are exported by default. |
ae62ba99a1a7
8165896: Use "open" flag from JVM_DefineModule to export all module packages
rprotacio
parents:
46388
diff
changeset
|
516 |
if (!from_module_entry->is_named() || from_module_entry->is_open()) return; |
36508 | 517 |
|
518 |
ModuleEntry* to_module_entry; |
|
519 |
if (to_module == NULL) { |
|
520 |
to_module_entry = NULL; // It's an unqualified export. |
|
521 |
} else { |
|
522 |
to_module_entry = get_module_entry(to_module, CHECK); |
|
523 |
if (to_module_entry == NULL) { |
|
524 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
525 |
"to_module is invalid"); |
|
526 |
} |
|
527 |
} |
|
528 |
||
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
529 |
PackageEntry *package_entry = get_package_entry(from_module_entry, package_name, CHECK); |
36508 | 530 |
ResourceMark rm(THREAD); |
531 |
if (package_entry == NULL) { |
|
532 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
533 |
err_msg("Package %s not found in from_module %s", |
|
534 |
package_name != NULL ? package_name : "", |
|
535 |
from_module_entry->name()->as_C_string())); |
|
536 |
} |
|
537 |
if (package_entry->module() != from_module_entry) { |
|
538 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
539 |
err_msg("Package: %s found in module %s, not in from_module: %s", |
|
540 |
package_entry->name()->as_C_string(), |
|
541 |
package_entry->module()->name()->as_C_string(), |
|
542 |
from_module_entry->name()->as_C_string())); |
|
543 |
} |
|
544 |
||
44993
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
545 |
log_debug(module)("add_module_exports(): package %s in module %s is exported to module %s", |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
546 |
package_entry->name()->as_C_string(), |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
547 |
from_module_entry->name()->as_C_string(), |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
548 |
to_module_entry == NULL ? "NULL" : |
36508 | 549 |
to_module_entry->is_named() ? |
550 |
to_module_entry->name()->as_C_string() : UNNAMED_MODULE); |
|
551 |
||
39290
0cc9f5028562
8156871: Possible concurrency issue with JVM_AddModuleExports
lfoltan
parents:
38733
diff
changeset
|
552 |
// Do nothing if modules are the same. |
0cc9f5028562
8156871: Possible concurrency issue with JVM_AddModuleExports
lfoltan
parents:
38733
diff
changeset
|
553 |
if (from_module_entry != to_module_entry) { |
36508 | 554 |
package_entry->set_exported(to_module_entry); |
555 |
} |
|
556 |
} |
|
557 |
||
558 |
||
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
559 |
void Modules::add_module_exports_qualified(jobject from_module, const char* package, |
36508 | 560 |
jobject to_module, TRAPS) { |
561 |
if (to_module == NULL) { |
|
562 |
THROW_MSG(vmSymbols::java_lang_NullPointerException(), |
|
563 |
"to_module is null"); |
|
564 |
} |
|
565 |
add_module_exports(from_module, package, to_module, CHECK); |
|
566 |
} |
|
567 |
||
568 |
void Modules::add_reads_module(jobject from_module, jobject to_module, TRAPS) { |
|
569 |
if (from_module == NULL) { |
|
570 |
THROW_MSG(vmSymbols::java_lang_NullPointerException(), |
|
571 |
"from_module is null"); |
|
572 |
} |
|
573 |
||
574 |
ModuleEntry* from_module_entry = get_module_entry(from_module, CHECK); |
|
575 |
if (from_module_entry == NULL) { |
|
576 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
577 |
"from_module is not valid"); |
|
578 |
} |
|
579 |
||
580 |
ModuleEntry* to_module_entry; |
|
581 |
if (to_module != NULL) { |
|
582 |
to_module_entry = get_module_entry(to_module, CHECK); |
|
583 |
if (to_module_entry == NULL) { |
|
584 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
585 |
"to_module is invalid"); |
|
586 |
} |
|
587 |
} else { |
|
588 |
to_module_entry = NULL; |
|
589 |
} |
|
590 |
||
591 |
ResourceMark rm(THREAD); |
|
44993
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
592 |
log_debug(module)("add_reads_module(): Adding read from module %s to module %s", |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
593 |
from_module_entry->is_named() ? |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
594 |
from_module_entry->name()->as_C_string() : UNNAMED_MODULE, |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
595 |
to_module_entry == NULL ? "all unnamed" : |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
596 |
(to_module_entry->is_named() ? |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
597 |
to_module_entry->name()->as_C_string() : UNNAMED_MODULE)); |
36508 | 598 |
|
599 |
// if modules are the same or if from_module is unnamed then no need to add the read. |
|
600 |
if (from_module_entry != to_module_entry && from_module_entry->is_named()) { |
|
601 |
from_module_entry->add_read(to_module_entry); |
|
602 |
} |
|
603 |
} |
|
604 |
||
605 |
// This method is called by JFR and JNI. |
|
606 |
jobject Modules::get_module(jclass clazz, TRAPS) { |
|
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
41691
diff
changeset
|
607 |
assert(ModuleEntryTable::javabase_defined(), |
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
41691
diff
changeset
|
608 |
"Attempt to call get_module before " JAVA_BASE_NAME " is defined"); |
36508 | 609 |
|
610 |
if (clazz == NULL) { |
|
611 |
THROW_MSG_(vmSymbols::java_lang_NullPointerException(), |
|
612 |
"class is null", JNI_FALSE); |
|
613 |
} |
|
614 |
oop mirror = JNIHandles::resolve_non_null(clazz); |
|
615 |
if (mirror == NULL) { |
|
44993
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
616 |
log_debug(module)("get_module(): no mirror, returning NULL"); |
36508 | 617 |
return NULL; |
618 |
} |
|
619 |
if (!java_lang_Class::is_instance(mirror)) { |
|
620 |
THROW_MSG_(vmSymbols::java_lang_IllegalArgumentException(), |
|
621 |
"Invalid class", JNI_FALSE); |
|
622 |
} |
|
623 |
||
624 |
oop module = java_lang_Class::module(mirror); |
|
625 |
||
626 |
assert(module != NULL, "java.lang.Class module field not set"); |
|
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
627 |
assert(java_lang_Module::is_instance(module), "module is not an instance of type java.lang.Module"); |
36508 | 628 |
|
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
629 |
LogTarget(Debug,module) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
630 |
if (lt.is_enabled()) { |
36508 | 631 |
ResourceMark rm(THREAD); |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
632 |
LogStream ls(lt); |
36508 | 633 |
Klass* klass = java_lang_Class::as_Klass(mirror); |
44520
0553e129e0ec
8177530: Module system implementation refresh (4/2017)
alanb
parents:
44326
diff
changeset
|
634 |
oop module_name = java_lang_Module::name(module); |
36508 | 635 |
if (module_name != NULL) { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
636 |
ls.print("get_module(): module "); |
36508 | 637 |
java_lang_String::print(module_name, tty); |
638 |
} else { |
|
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
639 |
ls.print("get_module(): Unamed Module"); |
36508 | 640 |
} |
641 |
if (klass != NULL) { |
|
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
642 |
ls.print_cr(" for class %s", klass->external_name()); |
36508 | 643 |
} else { |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46632
diff
changeset
|
644 |
ls.print_cr(" for primitive class"); |
36508 | 645 |
} |
646 |
} |
|
647 |
||
648 |
return JNIHandles::make_local(THREAD, module); |
|
649 |
} |
|
650 |
||
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
651 |
jobject Modules::get_named_module(Handle h_loader, const char* package_name, TRAPS) { |
39706 | 652 |
assert(ModuleEntryTable::javabase_defined(), |
42636
aafc434ba580
8169734: Update uses of string "java.base" to macro
rprotacio
parents:
41691
diff
changeset
|
653 |
"Attempt to call get_named_module before " JAVA_BASE_NAME " is defined"); |
39706 | 654 |
assert(h_loader.is_null() || java_lang_ClassLoader::is_subclass(h_loader->klass()), |
655 |
"Class loader is not a subclass of java.lang.ClassLoader"); |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
656 |
assert(package_name != NULL, "the package_name should not be NULL"); |
39706 | 657 |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
658 |
if (strlen(package_name) == 0) { |
39706 | 659 |
return NULL; |
660 |
} |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
661 |
TempNewSymbol package_sym = SymbolTable::new_symbol(package_name, CHECK_NULL); |
39706 | 662 |
const PackageEntry* const pkg_entry = |
663 |
get_package_entry_by_name(package_sym, h_loader, THREAD); |
|
664 |
const ModuleEntry* const module_entry = (pkg_entry != NULL ? pkg_entry->module() : NULL); |
|
665 |
||
666 |
if (module_entry != NULL && module_entry->module() != NULL && module_entry->is_named()) { |
|
46773
fb17cc9a6847
8185717: Make ModuleEntry->module() return an oop not a jobject
hseigel
parents:
46701
diff
changeset
|
667 |
return JNIHandles::make_local(THREAD, module_entry->module()); |
39706 | 668 |
} |
669 |
return NULL; |
|
670 |
} |
|
671 |
||
672 |
||
36508 | 673 |
// This method is called by JFR and by the above method. |
674 |
jobject Modules::get_module(Symbol* package_name, Handle h_loader, TRAPS) { |
|
675 |
const PackageEntry* const pkg_entry = |
|
676 |
get_package_entry_by_name(package_name, h_loader, THREAD); |
|
677 |
const ModuleEntry* const module_entry = (pkg_entry != NULL ? pkg_entry->module() : NULL); |
|
678 |
||
679 |
if (module_entry != NULL && |
|
680 |
module_entry->module() != NULL) { |
|
46773
fb17cc9a6847
8185717: Make ModuleEntry->module() return an oop not a jobject
hseigel
parents:
46701
diff
changeset
|
681 |
return JNIHandles::make_local(THREAD, module_entry->module()); |
36508 | 682 |
} |
683 |
||
684 |
return NULL; |
|
685 |
} |
|
686 |
||
687 |
// Export package in module to all unnamed modules. |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
688 |
void Modules::add_module_exports_to_all_unnamed(jobject module, const char* package_name, TRAPS) { |
36508 | 689 |
if (module == NULL) { |
690 |
THROW_MSG(vmSymbols::java_lang_NullPointerException(), |
|
691 |
"module is null"); |
|
692 |
} |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
693 |
if (package_name == NULL) { |
36508 | 694 |
THROW_MSG(vmSymbols::java_lang_NullPointerException(), |
695 |
"package is null"); |
|
696 |
} |
|
697 |
ModuleEntry* module_entry = get_module_entry(module, CHECK); |
|
698 |
if (module_entry == NULL) { |
|
699 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
700 |
"module is invalid"); |
|
701 |
} |
|
702 |
||
703 |
if (module_entry->is_named()) { // No-op for unnamed module. |
|
43466
add500644443
8171855: Move package name transformations during module bootstrap into native code
redestad
parents:
43446
diff
changeset
|
704 |
PackageEntry *package_entry = get_package_entry(module_entry, package_name, CHECK); |
36508 | 705 |
ResourceMark rm(THREAD); |
706 |
if (package_entry == NULL) { |
|
707 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
708 |
err_msg("Package %s not found in module %s", |
|
709 |
package_name != NULL ? package_name : "", |
|
710 |
module_entry->name()->as_C_string())); |
|
711 |
} |
|
712 |
if (package_entry->module() != module_entry) { |
|
713 |
THROW_MSG(vmSymbols::java_lang_IllegalArgumentException(), |
|
714 |
err_msg("Package: %s found in module %s, not in module: %s", |
|
715 |
package_entry->name()->as_C_string(), |
|
716 |
package_entry->module()->name()->as_C_string(), |
|
717 |
module_entry->name()->as_C_string())); |
|
718 |
} |
|
719 |
||
44993
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
720 |
log_debug(module)("add_module_exports_to_all_unnamed(): package %s in module" |
f61bcd80ec1f
8178380: Module system implementation refresh (5/2017)
alanb
parents:
44520
diff
changeset
|
721 |
" %s is exported to all unnamed modules", |
36508 | 722 |
package_entry->name()->as_C_string(), |
723 |
module_entry->name()->as_C_string()); |
|
724 |
||
43471
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
43466
diff
changeset
|
725 |
// Mark package as exported to all unnamed modules. |
bfb383279a16
8171971: Fix timing bug in JVM management of package export lists
hseigel
parents:
43466
diff
changeset
|
726 |
package_entry->set_is_exported_allUnnamed(); |
36508 | 727 |
} |
728 |
} |