author | simonis |
Tue, 19 Jun 2018 09:43:53 +0200 | |
changeset 50625 | d9753e3db0c6 |
parent 50199 | 83d8b3a25f25 |
child 51439 | 0517bd2a0eda |
permissions | -rw-r--r-- |
26135 | 1 |
/* |
49593
4dd58ecc9912
8200105: Remove cyclic dependency between oop.inline.hpp and collectedHeap.inline.hpp
stefank
parents:
48171
diff
changeset
|
2 |
* Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved. |
26135 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. |
|
8 |
* |
|
9 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
10 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
11 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
12 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
13 |
* accompanied this code). |
|
14 |
* |
|
15 |
* You should have received a copy of the GNU General Public License version |
|
16 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
17 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
18 |
* |
|
19 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
20 |
* or visit www.oracle.com if you need additional information or have any |
|
21 |
* questions. |
|
22 |
* |
|
23 |
*/ |
|
24 |
||
25 |
#include "precompiled.hpp" |
|
26 |
#include "classfile/classLoader.hpp" |
|
27 |
#include "classfile/sharedPathsMiscInfo.hpp" |
|
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
28 |
#include "logging/log.hpp" |
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46365
diff
changeset
|
29 |
#include "logging/logStream.hpp" |
26135 | 30 |
#include "memory/allocation.inline.hpp" |
50199
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
31 |
#include "memory/filemap.hpp" |
26135 | 32 |
#include "memory/metaspaceShared.hpp" |
37248 | 33 |
#include "memory/resourceArea.hpp" |
26135 | 34 |
#include "runtime/arguments.hpp" |
49593
4dd58ecc9912
8200105: Remove cyclic dependency between oop.inline.hpp and collectedHeap.inline.hpp
stefank
parents:
48171
diff
changeset
|
35 |
#include "runtime/os.inline.hpp" |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
36 |
#include "utilities/ostream.hpp" |
26135 | 37 |
|
48157 | 38 |
SharedPathsMiscInfo::SharedPathsMiscInfo() { |
50039
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
39 |
_app_offset = 0; |
48157 | 40 |
_buf_size = INITIAL_BUF_SIZE; |
41 |
_cur_ptr = _buf_start = NEW_C_HEAP_ARRAY(char, _buf_size, mtClass); |
|
42 |
_allocated = true; |
|
43 |
} |
|
44 |
||
45 |
SharedPathsMiscInfo::~SharedPathsMiscInfo() { |
|
46 |
if (_allocated) { |
|
47 |
FREE_C_HEAP_ARRAY(char, _buf_start); |
|
48 |
} |
|
49 |
} |
|
50 |
||
26135 | 51 |
void SharedPathsMiscInfo::add_path(const char* path, int type) { |
38151
fffedc5e5cf8
8154110: Update class* and safepoint* logging subsystems
mockner
parents:
37248
diff
changeset
|
52 |
log_info(class, path)("type=%s ", type_name(type)); |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
53 |
ClassLoader::trace_class_path("add misc shared path ", path); |
26135 | 54 |
write(path, strlen(path) + 1); |
55 |
write_jint(jint(type)); |
|
56 |
} |
|
57 |
||
58 |
void SharedPathsMiscInfo::ensure_size(size_t needed_bytes) { |
|
59 |
assert(_allocated, "cannot modify buffer during validation."); |
|
60 |
int used = get_used_bytes(); |
|
61 |
int target = used + int(needed_bytes); |
|
62 |
if (target > _buf_size) { |
|
63 |
_buf_size = _buf_size * 2 + (int)needed_bytes; |
|
64 |
_buf_start = REALLOC_C_HEAP_ARRAY(char, _buf_start, _buf_size, mtClass); |
|
65 |
_cur_ptr = _buf_start + used; |
|
66 |
_end_ptr = _buf_start + _buf_size; |
|
67 |
} |
|
68 |
} |
|
69 |
||
70 |
void SharedPathsMiscInfo::write(const void* ptr, size_t size) { |
|
71 |
ensure_size(size); |
|
72 |
memcpy(_cur_ptr, ptr, size); |
|
73 |
_cur_ptr += size; |
|
74 |
} |
|
75 |
||
76 |
bool SharedPathsMiscInfo::read(void* ptr, size_t size) { |
|
77 |
if (_cur_ptr + size <= _end_ptr) { |
|
78 |
memcpy(ptr, _cur_ptr, size); |
|
79 |
_cur_ptr += size; |
|
80 |
return true; |
|
81 |
} |
|
82 |
return false; |
|
83 |
} |
|
84 |
||
85 |
bool SharedPathsMiscInfo::fail(const char* msg, const char* name) { |
|
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
86 |
ClassLoader::trace_class_path(msg, name); |
26135 | 87 |
MetaspaceShared::set_archive_loading_failed(); |
88 |
return false; |
|
89 |
} |
|
90 |
||
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46365
diff
changeset
|
91 |
void SharedPathsMiscInfo::print_path(outputStream* out, int type, const char* path) { |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
92 |
switch (type) { |
50039
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
93 |
case BOOT_PATH: |
36508 | 94 |
out->print("Expecting BOOT path=%s", path); |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
95 |
break; |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
96 |
case NON_EXIST: |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
97 |
out->print("Expecting that %s does not exist", path); |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
98 |
break; |
50039
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
99 |
case APP_PATH: |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
100 |
ClassLoader::trace_class_path("Expecting -Djava.class.path=", path); |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
101 |
break; |
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
102 |
default: |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
103 |
ShouldNotReachHere(); |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
104 |
} |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
105 |
} |
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
106 |
|
26135 | 107 |
bool SharedPathsMiscInfo::check() { |
108 |
// The whole buffer must be 0 terminated so that we can use strlen and strcmp |
|
109 |
// without fear. |
|
110 |
_end_ptr -= sizeof(jint); |
|
111 |
if (_cur_ptr >= _end_ptr) { |
|
112 |
return fail("Truncated archive file header"); |
|
113 |
} |
|
114 |
if (*_end_ptr != 0) { |
|
115 |
return fail("Corrupted archive file header"); |
|
116 |
} |
|
117 |
||
118 |
while (_cur_ptr < _end_ptr) { |
|
119 |
jint type; |
|
120 |
const char* path = _cur_ptr; |
|
121 |
_cur_ptr += strlen(path) + 1; |
|
122 |
if (!read_jint(&type)) { |
|
123 |
return fail("Corrupted archive file header"); |
|
124 |
} |
|
46701
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46365
diff
changeset
|
125 |
LogTarget(Info, class, path) lt; |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46365
diff
changeset
|
126 |
if (lt.is_enabled()) { |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46365
diff
changeset
|
127 |
lt.print("type=%s ", type_name(type)); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46365
diff
changeset
|
128 |
LogStream ls(lt); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46365
diff
changeset
|
129 |
print_path(&ls, type, path); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46365
diff
changeset
|
130 |
ls.cr(); |
f559541c0daa
8181917: Refactor UL LogStreams to avoid using resource area
stuefe
parents:
46365
diff
changeset
|
131 |
} |
26135 | 132 |
if (!check(type, path)) { |
133 |
if (!PrintSharedArchiveAndExit) { |
|
134 |
return false; |
|
135 |
} |
|
136 |
} else { |
|
36364
5971776598e5
8150103: Convert TraceClassPaths to Unified Logging
mockner
parents:
34287
diff
changeset
|
137 |
ClassLoader::trace_class_path("ok"); |
26135 | 138 |
} |
139 |
} |
|
140 |
||
141 |
return true; |
|
142 |
} |
|
143 |
||
50199
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
144 |
char* skip_first_path_entry(const char* path) { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
145 |
size_t path_sep_len = strlen(os::path_separator()); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
146 |
char* p = strstr((char*)path, os::path_separator()); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
147 |
if (p != NULL) { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
148 |
debug_only( { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
149 |
size_t image_name_len = strlen(MODULES_IMAGE_NAME); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
150 |
assert(strncmp(p - image_name_len, MODULES_IMAGE_NAME, image_name_len) == 0, |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
151 |
"first entry must be the modules image"); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
152 |
} ); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
153 |
p += path_sep_len; |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
154 |
} else { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
155 |
debug_only( { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
156 |
assert(ClassLoader::string_ends_with(path, MODULES_IMAGE_NAME), |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
157 |
"first entry must be the modules image"); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
158 |
} ); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
159 |
} |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
160 |
return p; |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
161 |
} |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
162 |
|
26135 | 163 |
bool SharedPathsMiscInfo::check(jint type, const char* path) { |
50199
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
164 |
assert(UseSharedSpaces, "runtime only"); |
26135 | 165 |
switch (type) { |
50039
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
166 |
case BOOT_PATH: |
50199
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
167 |
{ |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
168 |
// |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
169 |
// - Archive contains boot classes only - relaxed boot path check: |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
170 |
// Extra path elements appended to the boot path at runtime are allowed. |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
171 |
// |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
172 |
// - Archive contains application or platform classes - strict boot path check: |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
173 |
// Validate the entire runtime boot path, which must be compactible |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
174 |
// with the dump time boot path. Appending boot path at runtime is not |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
175 |
// allowed. |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
176 |
// |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
177 |
|
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
178 |
// The first entry in boot path is the modules_image (guaranteed by |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
179 |
// ClassLoader::setup_boot_search_path()). Skip the first entry. The |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
180 |
// path of the runtime modules_image may be different from the dump |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
181 |
// time path (e.g. the JDK image is copied to a different location |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
182 |
// after generating the shared archive), which is acceptable. For most |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
183 |
// common cases, the dump time boot path might contain modules_image only. |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
184 |
char* runtime_boot_path = Arguments::get_sysclasspath(); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
185 |
char* rp = skip_first_path_entry(runtime_boot_path); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
186 |
char* dp = skip_first_path_entry(path); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
187 |
|
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
188 |
bool relaxed_check = !FileMapInfo::current_info()->header()->has_platform_or_app_classes(); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
189 |
if (dp == NULL && rp == NULL) { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
190 |
break; // ok, both runtime and dump time boot paths have modules_images only |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
191 |
} else if (dp == NULL && rp != NULL && relaxed_check) { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
192 |
break; // ok, relaxed check, runtime has extra boot append path entries |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
193 |
} else if (dp != NULL && rp != NULL) { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
194 |
size_t num; |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
195 |
size_t dp_len = strlen(dp); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
196 |
size_t rp_len = strlen(rp); |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
197 |
if (rp_len >= dp_len) { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
198 |
if (relaxed_check) { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
199 |
// only check the leading entries in the runtime boot path, up to |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
200 |
// the length of the dump time boot path |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
201 |
num = dp_len; |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
202 |
} else { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
203 |
// check the full runtime boot path, must match with dump time |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
204 |
num = rp_len; |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
205 |
} |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
206 |
|
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
207 |
if (os::file_name_strncmp(dp, rp, num) == 0) { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
208 |
// make sure it is the end of an entry in the runtime boot path |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
209 |
if (rp[dp_len] == '\0' || rp[dp_len] == os::path_separator()[0]) { |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
210 |
break; // ok, runtime and dump time paths match |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
211 |
} |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
212 |
} |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
213 |
} |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
214 |
} |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
215 |
|
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
216 |
// The paths are different |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
217 |
return fail("[BOOT classpath mismatch, actual =", runtime_boot_path); |
26135 | 218 |
} |
219 |
break; |
|
46365
d79745f72ae6
8171042: The 'REQUIRED' type in sharedPathsMiscInfo.hpp is not used and should be removed.
jiangli
parents:
42876
diff
changeset
|
220 |
case NON_EXIST: |
26135 | 221 |
{ |
222 |
struct stat st; |
|
46365
d79745f72ae6
8171042: The 'REQUIRED' type in sharedPathsMiscInfo.hpp is not used and should be removed.
jiangli
parents:
42876
diff
changeset
|
223 |
if (os::stat(path, &st) == 0) { |
26135 | 224 |
// The file actually exists |
46365
d79745f72ae6
8171042: The 'REQUIRED' type in sharedPathsMiscInfo.hpp is not used and should be removed.
jiangli
parents:
42876
diff
changeset
|
225 |
// But we want it to not exist -> fail |
d79745f72ae6
8171042: The 'REQUIRED' type in sharedPathsMiscInfo.hpp is not used and should be removed.
jiangli
parents:
42876
diff
changeset
|
226 |
return fail("File must not exist"); |
26135 | 227 |
} |
228 |
} |
|
229 |
break; |
|
50039
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
230 |
case APP_PATH: |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
231 |
{ |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
232 |
size_t len = strlen(path); |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
233 |
const char *appcp = Arguments::get_appclasspath(); |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
234 |
assert(appcp != NULL, "NULL app classpath"); |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
235 |
size_t appcp_len = strlen(appcp); |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
236 |
if (appcp_len < len) { |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
237 |
return fail("Run time APP classpath is shorter than the one at dump time: ", appcp); |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
238 |
} |
50199
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
239 |
// Prefix is OK: E.g., dump with -cp foo.jar, but run with -cp foo.jar:bar.jar. |
83d8b3a25f25
8199807: AppCDS performs overly restrictive path matching check.
jiangli
parents:
50039
diff
changeset
|
240 |
if (os::file_name_strncmp(path, appcp, len) != 0) { |
50039
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
241 |
return fail("[APP classpath mismatch, actual: -Djava.class.path=", appcp); |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
242 |
} |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
243 |
if (appcp[len] != '\0' && appcp[len] != os::path_separator()[0]) { |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
244 |
return fail("Dump time APP classpath is not a proper prefix of run time APP classpath: ", appcp); |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
245 |
} |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
246 |
} |
9fec54fe663d
8197954: Remove unnecessary intermediary APIs from AppCDS implementation
iklam
parents:
49931
diff
changeset
|
247 |
break; |
26135 | 248 |
default: |
249 |
return fail("Corrupted archive file header"); |
|
250 |
} |
|
251 |
||
252 |
return true; |
|
253 |
} |