author | alanb |
Thu, 01 Dec 2016 08:57:53 +0000 | |
changeset 42338 | a60f280f803c |
parent 39050 | 9de41b79ec7e |
child 42703 | 20c39ea4a507 |
permissions | -rw-r--r-- |
36511 | 1 |
/* |
2 |
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. |
|
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. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
package java.lang.module; |
|
27 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
28 |
import java.io.PrintStream; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
29 |
import java.lang.module.ModuleDescriptor.Provides; |
36511 | 30 |
import java.lang.module.ModuleDescriptor.Requires.Modifier; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
31 |
import java.lang.reflect.Layer; |
36511 | 32 |
import java.util.ArrayDeque; |
33 |
import java.util.ArrayList; |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
34 |
import java.util.Arrays; |
36511 | 35 |
import java.util.Collection; |
36 |
import java.util.Deque; |
|
37 |
import java.util.HashMap; |
|
38 |
import java.util.HashSet; |
|
39 |
import java.util.LinkedHashSet; |
|
40 |
import java.util.List; |
|
41 |
import java.util.Map; |
|
42 |
import java.util.Objects; |
|
43 |
import java.util.Optional; |
|
44 |
import java.util.Set; |
|
45 |
import java.util.StringJoiner; |
|
46 |
import java.util.stream.Collectors; |
|
47 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
48 |
import jdk.internal.module.ModuleHashes; |
36511 | 49 |
|
50 |
/** |
|
51 |
* The resolver used by {@link Configuration#resolveRequires} and |
|
52 |
* {@link Configuration#resolveRequiresAndUses}. |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
53 |
* |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
54 |
* @implNote The resolver is used at VM startup and so deliberately avoids |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
55 |
* using lambda and stream usages in code paths used during startup. |
36511 | 56 |
*/ |
57 |
||
58 |
final class Resolver { |
|
59 |
||
60 |
private final ModuleFinder beforeFinder; |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
61 |
private final List<Configuration> parents; |
36511 | 62 |
private final ModuleFinder afterFinder; |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
63 |
private final PrintStream traceOutput; |
36511 | 64 |
|
65 |
// maps module name to module reference |
|
66 |
private final Map<String, ModuleReference> nameToReference = new HashMap<>(); |
|
67 |
||
68 |
||
69 |
Resolver(ModuleFinder beforeFinder, |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
70 |
List<Configuration> parents, |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
71 |
ModuleFinder afterFinder, |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
72 |
PrintStream traceOutput) { |
36511 | 73 |
this.beforeFinder = beforeFinder; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
74 |
this.parents = parents; |
36511 | 75 |
this.afterFinder = afterFinder; |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
76 |
this.traceOutput = traceOutput; |
36511 | 77 |
} |
78 |
||
79 |
||
80 |
/** |
|
81 |
* Resolves the given named modules. |
|
82 |
* |
|
83 |
* @throws ResolutionException |
|
84 |
*/ |
|
85 |
Resolver resolveRequires(Collection<String> roots) { |
|
86 |
||
87 |
// create the visit stack to get us started |
|
88 |
Deque<ModuleDescriptor> q = new ArrayDeque<>(); |
|
89 |
for (String root : roots) { |
|
90 |
||
91 |
// find root module |
|
92 |
ModuleReference mref = findWithBeforeFinder(root); |
|
93 |
if (mref == null) { |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
94 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
95 |
if (findInParent(root) != null) { |
36511 | 96 |
// in parent, nothing to do |
97 |
continue; |
|
98 |
} |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
99 |
|
36511 | 100 |
mref = findWithAfterFinder(root); |
101 |
if (mref == null) { |
|
102 |
fail("Module %s not found", root); |
|
103 |
} |
|
104 |
} |
|
105 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
106 |
if (isTracing()) { |
36511 | 107 |
trace("Root module %s located", root); |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
108 |
mref.location().ifPresent(uri -> trace(" (%s)", uri)); |
36511 | 109 |
} |
110 |
||
111 |
assert mref.descriptor().name().equals(root); |
|
112 |
nameToReference.put(root, mref); |
|
113 |
q.push(mref.descriptor()); |
|
114 |
} |
|
115 |
||
116 |
resolve(q); |
|
117 |
||
118 |
return this; |
|
119 |
} |
|
120 |
||
121 |
/** |
|
122 |
* Resolve all modules in the given queue. On completion the queue will be |
|
123 |
* empty and any resolved modules will be added to {@code nameToReference}. |
|
124 |
* |
|
125 |
* @return The set of module resolved by this invocation of resolve |
|
126 |
*/ |
|
127 |
private Set<ModuleDescriptor> resolve(Deque<ModuleDescriptor> q) { |
|
128 |
Set<ModuleDescriptor> resolved = new HashSet<>(); |
|
129 |
||
130 |
while (!q.isEmpty()) { |
|
131 |
ModuleDescriptor descriptor = q.poll(); |
|
132 |
assert nameToReference.containsKey(descriptor.name()); |
|
133 |
||
134 |
// process dependences |
|
135 |
for (ModuleDescriptor.Requires requires : descriptor.requires()) { |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
136 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
137 |
// only required at compile-time |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
138 |
if (requires.modifiers().contains(Modifier.STATIC)) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
139 |
continue; |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
140 |
|
36511 | 141 |
String dn = requires.name(); |
142 |
||
143 |
// find dependence |
|
144 |
ModuleReference mref = findWithBeforeFinder(dn); |
|
145 |
if (mref == null) { |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
146 |
|
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
147 |
if (findInParent(dn) != null) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
148 |
// dependence is in parent |
36511 | 149 |
continue; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
150 |
} |
36511 | 151 |
|
152 |
mref = findWithAfterFinder(dn); |
|
153 |
if (mref == null) { |
|
154 |
fail("Module %s not found, required by %s", |
|
155 |
dn, descriptor.name()); |
|
156 |
} |
|
157 |
} |
|
158 |
||
159 |
if (!nameToReference.containsKey(dn)) { |
|
160 |
nameToReference.put(dn, mref); |
|
161 |
q.offer(mref.descriptor()); |
|
162 |
resolved.add(mref.descriptor()); |
|
163 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
164 |
if (isTracing()) { |
36511 | 165 |
trace("Module %s located, required by %s", |
166 |
dn, descriptor.name()); |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
167 |
mref.location().ifPresent(uri -> trace(" (%s)", uri)); |
36511 | 168 |
} |
169 |
} |
|
170 |
||
171 |
} |
|
172 |
||
173 |
resolved.add(descriptor); |
|
174 |
} |
|
175 |
||
176 |
return resolved; |
|
177 |
} |
|
178 |
||
179 |
/** |
|
180 |
* Augments the set of resolved modules with modules induced by the |
|
181 |
* service-use relation. |
|
182 |
*/ |
|
183 |
Resolver resolveUses() { |
|
184 |
||
185 |
// Scan the finders for all available service provider modules. As |
|
186 |
// java.base uses services then then module finders will be scanned |
|
187 |
// anyway. |
|
188 |
Map<String, Set<ModuleReference>> availableProviders = new HashMap<>(); |
|
189 |
for (ModuleReference mref : findAll()) { |
|
190 |
ModuleDescriptor descriptor = mref.descriptor(); |
|
191 |
if (!descriptor.provides().isEmpty()) { |
|
192 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
193 |
for (Provides provides : descriptor.provides()) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
194 |
String sn = provides.service(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
195 |
|
36511 | 196 |
// computeIfAbsent |
197 |
Set<ModuleReference> providers = availableProviders.get(sn); |
|
198 |
if (providers == null) { |
|
199 |
providers = new HashSet<>(); |
|
200 |
availableProviders.put(sn, providers); |
|
201 |
} |
|
202 |
providers.add(mref); |
|
203 |
} |
|
204 |
||
205 |
} |
|
206 |
} |
|
207 |
||
208 |
// create the visit stack |
|
209 |
Deque<ModuleDescriptor> q = new ArrayDeque<>(); |
|
210 |
||
211 |
// the initial set of modules that may use services |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
212 |
Set<ModuleDescriptor> initialConsumers; |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
213 |
if (Layer.boot() == null) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
214 |
initialConsumers = new HashSet<>(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
215 |
} else { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
216 |
initialConsumers = parents.stream() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
217 |
.flatMap(Configuration::configurations) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
218 |
.distinct() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
219 |
.flatMap(c -> c.descriptors().stream()) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
220 |
.collect(Collectors.toSet()); |
36511 | 221 |
} |
222 |
for (ModuleReference mref : nameToReference.values()) { |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
223 |
initialConsumers.add(mref.descriptor()); |
36511 | 224 |
} |
225 |
||
226 |
// Where there is a consumer of a service then resolve all modules |
|
227 |
// that provide an implementation of that service |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
228 |
Set<ModuleDescriptor> candidateConsumers = initialConsumers; |
36511 | 229 |
do { |
230 |
for (ModuleDescriptor descriptor : candidateConsumers) { |
|
231 |
if (!descriptor.uses().isEmpty()) { |
|
232 |
for (String service : descriptor.uses()) { |
|
233 |
Set<ModuleReference> mrefs = availableProviders.get(service); |
|
234 |
if (mrefs != null) { |
|
235 |
for (ModuleReference mref : mrefs) { |
|
236 |
ModuleDescriptor provider = mref.descriptor(); |
|
237 |
if (!provider.equals(descriptor)) { |
|
238 |
||
239 |
trace("Module %s provides %s, used by %s", |
|
240 |
provider.name(), service, descriptor.name()); |
|
241 |
||
242 |
String pn = provider.name(); |
|
243 |
if (!nameToReference.containsKey(pn)) { |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
244 |
if (isTracing()) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
245 |
mref.location() |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
246 |
.ifPresent(uri -> trace(" (%s)", uri)); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
247 |
} |
36511 | 248 |
nameToReference.put(pn, mref); |
249 |
q.push(provider); |
|
250 |
} |
|
251 |
} |
|
252 |
} |
|
253 |
} |
|
254 |
} |
|
255 |
} |
|
256 |
} |
|
257 |
||
258 |
candidateConsumers = resolve(q); |
|
259 |
} while (!candidateConsumers.isEmpty()); |
|
260 |
||
261 |
return this; |
|
262 |
} |
|
263 |
||
264 |
||
265 |
/** |
|
266 |
* Execute post-resolution checks and returns the module graph of resolved |
|
267 |
* modules as {@code Map}. The resolved modules will be in the given |
|
268 |
* configuration. |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
269 |
* |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
270 |
* @param check {@true} to execute the post resolution checks |
36511 | 271 |
*/ |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
272 |
Map<ResolvedModule, Set<ResolvedModule>> finish(Configuration cf, |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
273 |
boolean check) |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
274 |
{ |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
275 |
if (isTracing()) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
276 |
trace("Result:"); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
277 |
Set<String> names = nameToReference.keySet(); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
278 |
names.stream().sorted().forEach(name -> trace(" %s", name)); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
279 |
} |
36511 | 280 |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
281 |
if (check) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
282 |
detectCycles(); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
283 |
checkPlatformConstraints(); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
284 |
checkHashes(); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
285 |
} |
36511 | 286 |
|
287 |
Map<ResolvedModule, Set<ResolvedModule>> graph = makeGraph(cf); |
|
288 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
289 |
if (check) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
290 |
checkExportSuppliers(graph); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
291 |
} |
36511 | 292 |
|
293 |
return graph; |
|
294 |
} |
|
295 |
||
296 |
/** |
|
297 |
* Checks the given module graph for cycles. |
|
298 |
* |
|
299 |
* For now the implementation is a simple depth first search on the |
|
300 |
* dependency graph. We'll replace this later, maybe with Tarjan. |
|
301 |
*/ |
|
302 |
private void detectCycles() { |
|
303 |
visited = new HashSet<>(); |
|
304 |
visitPath = new LinkedHashSet<>(); // preserve insertion order |
|
305 |
for (ModuleReference mref : nameToReference.values()) { |
|
306 |
visit(mref.descriptor()); |
|
307 |
} |
|
308 |
visited.clear(); |
|
309 |
} |
|
310 |
||
311 |
// the modules that were visited |
|
312 |
private Set<ModuleDescriptor> visited; |
|
313 |
||
314 |
// the modules in the current visit path |
|
315 |
private Set<ModuleDescriptor> visitPath; |
|
316 |
||
317 |
private void visit(ModuleDescriptor descriptor) { |
|
318 |
if (!visited.contains(descriptor)) { |
|
319 |
boolean added = visitPath.add(descriptor); |
|
320 |
if (!added) { |
|
321 |
throw new ResolutionException("Cycle detected: " + |
|
322 |
cycleAsString(descriptor)); |
|
323 |
} |
|
324 |
for (ModuleDescriptor.Requires requires : descriptor.requires()) { |
|
325 |
String dn = requires.name(); |
|
326 |
||
327 |
ModuleReference mref = nameToReference.get(dn); |
|
328 |
if (mref != null) { |
|
329 |
ModuleDescriptor other = mref.descriptor(); |
|
330 |
if (other != descriptor) { |
|
331 |
// dependency is in this configuration |
|
332 |
visit(other); |
|
333 |
} |
|
334 |
} |
|
335 |
} |
|
336 |
visitPath.remove(descriptor); |
|
337 |
visited.add(descriptor); |
|
338 |
} |
|
339 |
} |
|
340 |
||
341 |
/** |
|
342 |
* Returns a String with a list of the modules in a detected cycle. |
|
343 |
*/ |
|
344 |
private String cycleAsString(ModuleDescriptor descriptor) { |
|
345 |
List<ModuleDescriptor> list = new ArrayList<>(visitPath); |
|
346 |
list.add(descriptor); |
|
347 |
int index = list.indexOf(descriptor); |
|
348 |
return list.stream() |
|
349 |
.skip(index) |
|
350 |
.map(ModuleDescriptor::name) |
|
351 |
.collect(Collectors.joining(" -> ")); |
|
352 |
} |
|
353 |
||
354 |
||
355 |
/** |
|
356 |
* If there are platform specific modules then check that the OS name, |
|
357 |
* architecture and version match. |
|
358 |
* |
|
359 |
* @apiNote This method does not currently check if the OS matches |
|
360 |
* platform specific modules in parent configurations. |
|
361 |
*/ |
|
362 |
private void checkPlatformConstraints() { |
|
363 |
||
364 |
// first module encountered that is platform specific |
|
365 |
String savedModuleName = null; |
|
366 |
String savedOsName = null; |
|
367 |
String savedOsArch = null; |
|
368 |
String savedOsVersion = null; |
|
369 |
||
370 |
for (ModuleReference mref : nameToReference.values()) { |
|
371 |
ModuleDescriptor descriptor = mref.descriptor(); |
|
372 |
||
373 |
String osName = descriptor.osName().orElse(null); |
|
374 |
String osArch = descriptor.osArch().orElse(null); |
|
375 |
String osVersion = descriptor.osVersion().orElse(null); |
|
376 |
||
377 |
if (osName != null || osArch != null || osVersion != null) { |
|
378 |
||
379 |
if (savedModuleName == null) { |
|
380 |
||
381 |
savedModuleName = descriptor.name(); |
|
382 |
savedOsName = osName; |
|
383 |
savedOsArch = osArch; |
|
384 |
savedOsVersion = osVersion; |
|
385 |
||
386 |
} else { |
|
387 |
||
388 |
boolean matches = platformMatches(osName, savedOsName) |
|
389 |
&& platformMatches(osArch, savedOsArch) |
|
390 |
&& platformMatches(osVersion, savedOsVersion); |
|
391 |
||
392 |
if (!matches) { |
|
393 |
String s1 = platformAsString(savedOsName, |
|
394 |
savedOsArch, |
|
395 |
savedOsVersion); |
|
396 |
||
397 |
String s2 = platformAsString(osName, osArch, osVersion); |
|
398 |
fail("Mismatching constraints on target platform: " |
|
399 |
+ savedModuleName + ": " + s1 |
|
400 |
+ ", " + descriptor.name() + ": " + s2); |
|
401 |
} |
|
402 |
||
403 |
} |
|
404 |
||
405 |
} |
|
406 |
} |
|
407 |
||
408 |
} |
|
409 |
||
410 |
/** |
|
411 |
* Returns true if the s1 and s2 are equal or one of them is null. |
|
412 |
*/ |
|
413 |
private boolean platformMatches(String s1, String s2) { |
|
414 |
if (s1 == null || s2 == null) |
|
415 |
return true; |
|
416 |
else |
|
417 |
return Objects.equals(s1, s2); |
|
418 |
} |
|
419 |
||
420 |
/** |
|
421 |
* Return a string that encodes the OS name/arch/version. |
|
422 |
*/ |
|
423 |
private String platformAsString(String osName, |
|
424 |
String osArch, |
|
425 |
String osVersion) { |
|
426 |
||
427 |
return new StringJoiner("-") |
|
428 |
.add(Objects.toString(osName, "*")) |
|
429 |
.add(Objects.toString(osArch, "*")) |
|
430 |
.add(Objects.toString(osVersion, "*")) |
|
431 |
.toString(); |
|
432 |
||
433 |
} |
|
434 |
||
435 |
/** |
|
436 |
* Checks the hashes in the module descriptor to ensure that they match |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
437 |
* any recorded hashes. |
36511 | 438 |
*/ |
439 |
private void checkHashes() { |
|
440 |
for (ModuleReference mref : nameToReference.values()) { |
|
441 |
ModuleDescriptor descriptor = mref.descriptor(); |
|
442 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
443 |
// get map of module hashes |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
444 |
Optional<ModuleHashes> ohashes = descriptor.hashes(); |
36511 | 445 |
if (!ohashes.isPresent()) |
446 |
continue; |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
447 |
ModuleHashes hashes = ohashes.get(); |
36511 | 448 |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
449 |
String algorithm = hashes.algorithm(); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
450 |
for (String dn : hashes.names()) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
451 |
ModuleReference other = nameToReference.get(dn); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
452 |
if (other == null) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
453 |
ResolvedModule resolvedModule = findInParent(dn); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
454 |
if (resolvedModule != null) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
455 |
other = resolvedModule.reference(); |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
456 |
} |
36511 | 457 |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
458 |
// skip checking the hash if the module has been patched |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
459 |
if (other != null && !other.isPatched()) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
460 |
byte[] recordedHash = hashes.hashFor(dn); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
461 |
byte[] actualHash = other.computeHash(algorithm); |
36511 | 462 |
if (actualHash == null) |
463 |
fail("Unable to compute the hash of module %s", dn); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
464 |
if (!Arrays.equals(recordedHash, actualHash)) { |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
465 |
fail("Hash of %s (%s) differs to expected hash (%s)" + |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
466 |
" recorded in %s", dn, toHexString(actualHash), |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
467 |
toHexString(recordedHash), descriptor.name()); |
36511 | 468 |
} |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
469 |
} |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
470 |
} |
36511 | 471 |
|
472 |
} |
|
473 |
} |
|
474 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
475 |
private static String toHexString(byte[] ba) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
476 |
StringBuilder sb = new StringBuilder(ba.length * 2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
477 |
for (byte b: ba) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
478 |
sb.append(String.format("%02x", b & 0xff)); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
479 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
480 |
return sb.toString(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
481 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
482 |
|
36511 | 483 |
|
484 |
/** |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
485 |
* Computes the readability graph for the modules in the given Configuration. |
36511 | 486 |
* |
487 |
* The readability graph is created by propagating "requires" through the |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
488 |
* "requires transitive" edges of the module dependence graph. So if the |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
489 |
* module dependence graph has m1 requires m2 && m2 requires transitive m3 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
490 |
* then the resulting readability graph will contain m1 reads m2, m1 reads m3, |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
491 |
* and m2 reads m3. |
36511 | 492 |
*/ |
493 |
private Map<ResolvedModule, Set<ResolvedModule>> makeGraph(Configuration cf) { |
|
494 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
495 |
// initial capacity of maps to avoid resizing |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
496 |
int capacity = 1 + (4 * nameToReference.size())/ 3; |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
497 |
|
36511 | 498 |
// the "reads" graph starts as a module dependence graph and |
499 |
// is iteratively updated to be the readability graph |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
500 |
Map<ResolvedModule, Set<ResolvedModule>> g1 = new HashMap<>(capacity); |
36511 | 501 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
502 |
// the "requires transitive" graph, contains requires transitive edges only |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
503 |
Map<ResolvedModule, Set<ResolvedModule>> g2; |
36511 | 504 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
505 |
// need "requires transitive" from the modules in parent configurations |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
506 |
// as there may be selected modules that have a dependency on modules in |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
507 |
// the parent configuration. |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
508 |
if (Layer.boot() == null) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
509 |
g2 = new HashMap<>(capacity); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
510 |
} else { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
511 |
g2 = parents.stream() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
512 |
.flatMap(Configuration::configurations) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
513 |
.distinct() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
514 |
.flatMap(c -> |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
515 |
c.modules().stream().flatMap(m1 -> |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
516 |
m1.descriptor().requires().stream() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
517 |
.filter(r -> r.modifiers().contains(Modifier.TRANSITIVE)) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
518 |
.flatMap(r -> { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
519 |
Optional<ResolvedModule> m2 = c.findModule(r.name()); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
520 |
assert m2.isPresent() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
521 |
|| r.modifiers().contains(Modifier.STATIC); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
522 |
return m2.stream(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
523 |
}) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
524 |
.map(m2 -> Map.entry(m1, m2)) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
525 |
) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
526 |
) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
527 |
// stream of m1->m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
528 |
.collect(Collectors.groupingBy(Map.Entry::getKey, |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
529 |
HashMap::new, |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
530 |
Collectors.mapping(Map.Entry::getValue, Collectors.toSet()) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
531 |
)); |
36511 | 532 |
} |
533 |
||
534 |
// populate g1 and g2 with the dependences from the selected modules |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
535 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
536 |
Map<String, ResolvedModule> nameToResolved = new HashMap<>(capacity); |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
537 |
|
36511 | 538 |
for (ModuleReference mref : nameToReference.values()) { |
539 |
ModuleDescriptor descriptor = mref.descriptor(); |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
540 |
String name = descriptor.name(); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
541 |
|
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
542 |
ResolvedModule m1 = computeIfAbsent(nameToResolved, name, cf, mref); |
36511 | 543 |
|
544 |
Set<ResolvedModule> reads = new HashSet<>(); |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
545 |
Set<ResolvedModule> requiresTransitive = new HashSet<>(); |
36511 | 546 |
|
547 |
for (ModuleDescriptor.Requires requires : descriptor.requires()) { |
|
548 |
String dn = requires.name(); |
|
549 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
550 |
ResolvedModule m2 = null; |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
551 |
ModuleReference mref2 = nameToReference.get(dn); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
552 |
if (mref2 != null) { |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
553 |
// same configuration |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
554 |
m2 = computeIfAbsent(nameToResolved, dn, cf, mref2); |
36511 | 555 |
} else { |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
556 |
// parent configuration |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
557 |
m2 = findInParent(dn); |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
558 |
if (m2 == null) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
559 |
assert requires.modifiers().contains(Modifier.STATIC); |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
560 |
continue; |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
561 |
} |
36511 | 562 |
} |
563 |
||
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
564 |
// m1 requires m2 => m1 reads m2 |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
565 |
reads.add(m2); |
36511 | 566 |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
567 |
// m1 requires transitive m2 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
568 |
if (requires.modifiers().contains(Modifier.TRANSITIVE)) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
569 |
requiresTransitive.add(m2); |
36511 | 570 |
} |
571 |
||
572 |
} |
|
573 |
||
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
574 |
// automatic modules read all selected modules and all modules |
36511 | 575 |
// in parent configurations |
576 |
if (descriptor.isAutomatic()) { |
|
577 |
||
578 |
// reads all selected modules |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
579 |
// `requires transitive` all selected automatic modules |
36511 | 580 |
for (ModuleReference mref2 : nameToReference.values()) { |
581 |
ModuleDescriptor descriptor2 = mref2.descriptor(); |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
582 |
String name2 = descriptor2.name(); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
583 |
|
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
584 |
if (!name.equals(name2)) { |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
585 |
ResolvedModule m2 |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
586 |
= computeIfAbsent(nameToResolved, name2, cf, mref2); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
587 |
reads.add(m2); |
36511 | 588 |
if (descriptor2.isAutomatic()) |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
589 |
requiresTransitive.add(m2); |
36511 | 590 |
} |
591 |
} |
|
592 |
||
593 |
// reads all modules in parent configurations |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
594 |
// `requires transitive` all automatic modules in parent |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
595 |
// configurations |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
596 |
for (Configuration parent : parents) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
597 |
parent.configurations() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
598 |
.map(Configuration::modules) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
599 |
.flatMap(Set::stream) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
600 |
.forEach(m -> { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
601 |
reads.add(m); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
602 |
if (m.reference().descriptor().isAutomatic()) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
603 |
requiresTransitive.add(m); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
604 |
}); |
36511 | 605 |
} |
606 |
} |
|
607 |
||
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
608 |
g1.put(m1, reads); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
609 |
g2.put(m1, requiresTransitive); |
36511 | 610 |
} |
611 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
612 |
// Iteratively update g1 until there are no more requires transitive |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
613 |
// to propagate |
36511 | 614 |
boolean changed; |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
615 |
List<ResolvedModule> toAdd = new ArrayList<>(); |
36511 | 616 |
do { |
617 |
changed = false; |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
618 |
for (Set<ResolvedModule> m1Reads : g1.values()) { |
36511 | 619 |
for (ResolvedModule m2 : m1Reads) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
620 |
Set<ResolvedModule> m2RequiresTransitive = g2.get(m2); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
621 |
if (m2RequiresTransitive != null) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
622 |
for (ResolvedModule m3 : m2RequiresTransitive) { |
36511 | 623 |
if (!m1Reads.contains(m3)) { |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
624 |
// m1 reads m2, m2 requires transitive m3 |
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
625 |
// => need to add m1 reads m3 |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
626 |
toAdd.add(m3); |
36511 | 627 |
} |
628 |
} |
|
629 |
} |
|
630 |
} |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
631 |
if (!toAdd.isEmpty()) { |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
632 |
m1Reads.addAll(toAdd); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
633 |
toAdd.clear(); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
634 |
changed = true; |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
635 |
} |
36511 | 636 |
} |
637 |
} while (changed); |
|
638 |
||
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
639 |
return g1; |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
640 |
} |
36511 | 641 |
|
39050
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
642 |
/** |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
643 |
* Equivalent to |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
644 |
* <pre>{@code |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
645 |
* map.computeIfAbsent(name, k -> new ResolvedModule(cf, mref)) |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
646 |
* </pre>} |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
647 |
*/ |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
648 |
private ResolvedModule computeIfAbsent(Map<String, ResolvedModule> map, |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
649 |
String name, |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
650 |
Configuration cf, |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
651 |
ModuleReference mref) |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
652 |
{ |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
653 |
ResolvedModule m = map.get(name); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
654 |
if (m == null) { |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
655 |
m = new ResolvedModule(cf, mref); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
656 |
map.put(name, m); |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
657 |
} |
9de41b79ec7e
8158456: ModuleDescriptor.read does not verify dependence on java.base in module-info.class
alanb
parents:
37779
diff
changeset
|
658 |
return m; |
36511 | 659 |
} |
660 |
||
661 |
||
662 |
/** |
|
663 |
* Checks the readability graph to ensure that no two modules export the |
|
664 |
* same package to a module. This includes the case where module M has |
|
665 |
* a local package P and M reads another module that exports P to M. |
|
666 |
* Also checks the uses/provides of module M to ensure that it reads a |
|
667 |
* module that exports the package of the service type to M. |
|
668 |
*/ |
|
669 |
private void checkExportSuppliers(Map<ResolvedModule, Set<ResolvedModule>> graph) { |
|
670 |
||
671 |
for (Map.Entry<ResolvedModule, Set<ResolvedModule>> e : graph.entrySet()) { |
|
672 |
ModuleDescriptor descriptor1 = e.getKey().descriptor(); |
|
673 |
||
674 |
// the map of packages that are local or exported to descriptor1 |
|
675 |
Map<String, ModuleDescriptor> packageToExporter = new HashMap<>(); |
|
676 |
||
677 |
// local packages |
|
678 |
Set<String> packages = descriptor1.packages(); |
|
679 |
for (String pn : packages) { |
|
680 |
packageToExporter.put(pn, descriptor1); |
|
681 |
} |
|
682 |
||
683 |
// descriptor1 reads descriptor2 |
|
684 |
Set<ResolvedModule> reads = e.getValue(); |
|
685 |
for (ResolvedModule endpoint : reads) { |
|
686 |
ModuleDescriptor descriptor2 = endpoint.descriptor(); |
|
687 |
||
688 |
for (ModuleDescriptor.Exports export : descriptor2.exports()) { |
|
689 |
||
690 |
if (export.isQualified()) { |
|
691 |
if (!export.targets().contains(descriptor1.name())) |
|
692 |
continue; |
|
693 |
} |
|
694 |
||
695 |
// source is exported to descriptor2 |
|
696 |
String source = export.source(); |
|
697 |
ModuleDescriptor other |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
698 |
= packageToExporter.putIfAbsent(source, descriptor2); |
36511 | 699 |
|
700 |
if (other != null && other != descriptor2) { |
|
701 |
// package might be local to descriptor1 |
|
702 |
if (other == descriptor1) { |
|
703 |
fail("Module %s contains package %s" |
|
704 |
+ ", module %s exports package %s to %s", |
|
705 |
descriptor1.name(), |
|
706 |
source, |
|
707 |
descriptor2.name(), |
|
708 |
source, |
|
709 |
descriptor1.name()); |
|
710 |
} else { |
|
711 |
fail("Modules %s and %s export package %s to module %s", |
|
712 |
descriptor2.name(), |
|
713 |
other.name(), |
|
714 |
source, |
|
715 |
descriptor1.name()); |
|
716 |
} |
|
717 |
||
718 |
} |
|
719 |
} |
|
720 |
} |
|
721 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
722 |
// uses/provides checks not applicable to automatic modules |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
723 |
if (!descriptor1.isAutomatic()) { |
36511 | 724 |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
725 |
// uses S |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
726 |
for (String service : descriptor1.uses()) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
727 |
String pn = packageName(service); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
728 |
if (!packageToExporter.containsKey(pn)) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
729 |
fail("Module %s does not read a module that exports %s", |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
730 |
descriptor1.name(), pn); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
731 |
} |
36511 | 732 |
} |
733 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
734 |
// provides S |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
735 |
for (ModuleDescriptor.Provides provides : descriptor1.provides()) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
736 |
String pn = packageName(provides.service()); |
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
737 |
if (!packageToExporter.containsKey(pn)) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
738 |
fail("Module %s does not read a module that exports %s", |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
739 |
descriptor1.name(), pn); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
740 |
} |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
741 |
|
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
742 |
for (String provider : provides.providers()) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
743 |
if (!packages.contains(packageName(provider))) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
744 |
fail("Provider %s not in module %s", |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
745 |
provider, descriptor1.name()); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
746 |
} |
36511 | 747 |
} |
748 |
} |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
749 |
|
36511 | 750 |
} |
751 |
||
752 |
} |
|
753 |
||
754 |
} |
|
755 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
756 |
/** |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
757 |
* Find a module of the given name in the parent configurations |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
758 |
*/ |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
759 |
private ResolvedModule findInParent(String mn) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
760 |
for (Configuration parent : parents) { |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
761 |
Optional<ResolvedModule> om = parent.findModule(mn); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
762 |
if (om.isPresent()) |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
763 |
return om.get(); |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
764 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
765 |
return null; |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
766 |
} |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
767 |
|
36511 | 768 |
|
769 |
/** |
|
770 |
* Invokes the beforeFinder to find method to find the given module. |
|
771 |
*/ |
|
772 |
private ModuleReference findWithBeforeFinder(String mn) { |
|
773 |
try { |
|
774 |
return beforeFinder.find(mn).orElse(null); |
|
775 |
} catch (FindException e) { |
|
776 |
// unwrap |
|
777 |
throw new ResolutionException(e.getMessage(), e.getCause()); |
|
778 |
} |
|
779 |
} |
|
780 |
||
781 |
/** |
|
782 |
* Invokes the afterFinder to find method to find the given module. |
|
783 |
*/ |
|
784 |
private ModuleReference findWithAfterFinder(String mn) { |
|
785 |
try { |
|
786 |
return afterFinder.find(mn).orElse(null); |
|
787 |
} catch (FindException e) { |
|
788 |
// unwrap |
|
789 |
throw new ResolutionException(e.getMessage(), e.getCause()); |
|
790 |
} |
|
791 |
} |
|
792 |
||
793 |
/** |
|
794 |
* Returns the set of all modules that are observable with the before |
|
795 |
* and after ModuleFinders. |
|
796 |
*/ |
|
797 |
private Set<ModuleReference> findAll() { |
|
798 |
try { |
|
799 |
||
800 |
Set<ModuleReference> beforeModules = beforeFinder.findAll(); |
|
801 |
Set<ModuleReference> afterModules = afterFinder.findAll(); |
|
802 |
||
803 |
if (afterModules.isEmpty()) |
|
804 |
return beforeModules; |
|
805 |
||
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
806 |
if (beforeModules.isEmpty() |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
807 |
&& parents.size() == 1 |
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
808 |
&& parents.get(0) == Configuration.empty()) |
36511 | 809 |
return afterModules; |
810 |
||
811 |
Set<ModuleReference> result = new HashSet<>(beforeModules); |
|
812 |
for (ModuleReference mref : afterModules) { |
|
813 |
String name = mref.descriptor().name(); |
|
814 |
if (!beforeFinder.find(name).isPresent() |
|
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
815 |
&& findInParent(name) == null) { |
36511 | 816 |
result.add(mref); |
42338
a60f280f803c
8169069: Module system implementation refresh (11/2016)
alanb
parents:
39050
diff
changeset
|
817 |
} |
36511 | 818 |
} |
819 |
||
820 |
return result; |
|
821 |
||
822 |
} catch (FindException e) { |
|
823 |
// unwrap |
|
824 |
throw new ResolutionException(e.getMessage(), e.getCause()); |
|
825 |
} |
|
826 |
} |
|
827 |
||
828 |
/** |
|
829 |
* Returns the package name |
|
830 |
*/ |
|
831 |
private static String packageName(String cn) { |
|
832 |
int index = cn.lastIndexOf("."); |
|
833 |
return (index == -1) ? "" : cn.substring(0, index); |
|
834 |
} |
|
835 |
||
836 |
/** |
|
837 |
* Throw ResolutionException with the given format string and arguments |
|
838 |
*/ |
|
839 |
private static void fail(String fmt, Object ... args) { |
|
840 |
String msg = String.format(fmt, args); |
|
841 |
throw new ResolutionException(msg); |
|
842 |
} |
|
843 |
||
844 |
/** |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
845 |
* Tracing support |
36511 | 846 |
*/ |
847 |
||
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
848 |
private boolean isTracing() { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
849 |
return traceOutput != null; |
36511 | 850 |
} |
851 |
||
852 |
private void trace(String fmt, Object ... args) { |
|
37779
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
853 |
if (traceOutput != null) { |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
854 |
traceOutput.format("[Resolver] " + fmt, args); |
7c84df693837
8154956: Module system implementation refresh (4/2016)
alanb
parents:
36511
diff
changeset
|
855 |
traceOutput.println(); |
36511 | 856 |
} |
857 |
} |
|
858 |
||
859 |
} |