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