author | mcimadamore |
Tue, 13 Jan 2009 13:27:14 +0000 | |
changeset 1789 | 7ac8c0815000 |
parent 1205 | b316e32eb90c |
child 3380 | a6c2bcab0fec |
permissions | -rw-r--r-- |
655
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
1 |
/* |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
2 |
* Copyright 2007-2008 Sun Microsystems, Inc. All Rights Reserved. |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
4 |
* |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
7 |
* published by the Free Software Foundation. Sun designates this |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
9 |
* by Sun in the LICENSE file that accompanied this code. |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
10 |
* |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
15 |
* accompanied this code). |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
16 |
* |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
20 |
* |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
21 |
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
22 |
* CA 95054 USA or visit www.sun.com if you need additional information or |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
23 |
* have any questions. |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
24 |
*/ |
1ebc7ce89018
6705945: com.sun.tools.javac.zip files do not have valid copyright
jjg
parents:
10
diff
changeset
|
25 |
|
731
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
26 |
package com.sun.tools.javac.file; |
10 | 27 |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
28 |
|
731
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
29 |
import java.io.File; |
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
30 |
import java.io.FileNotFoundException; |
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
31 |
import java.io.IOException; |
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
32 |
import java.io.RandomAccessFile; |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
33 |
import java.lang.ref.SoftReference; |
731
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
34 |
import java.util.ArrayList; |
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
35 |
import java.util.Arrays; |
865
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
36 |
import java.util.Calendar; |
731
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
37 |
import java.util.Collections; |
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
38 |
import java.util.HashMap; |
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
39 |
import java.util.HashSet; |
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
40 |
import java.util.Iterator; |
10 | 41 |
import java.util.List; |
731
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
42 |
import java.util.Map; |
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
43 |
import java.util.Set; |
10 | 44 |
import java.util.concurrent.locks.ReentrantLock; |
731
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
45 |
import java.util.zip.DataFormatException; |
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
46 |
import java.util.zip.Inflater; |
1dd22bdb9ca5
6714364: refactor javac File handling code into new javac.file package
jjg
parents:
655
diff
changeset
|
47 |
import java.util.zip.ZipException; |
10 | 48 |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
49 |
import com.sun.tools.javac.file.RelativePath.RelativeDirectory; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
50 |
import com.sun.tools.javac.file.RelativePath.RelativeFile; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
51 |
|
10 | 52 |
/** This class implements building of index of a zip archive and access to it's context. |
53 |
* It also uses prebuild index if available. It supports invocations where it will |
|
54 |
* serialize an optimized zip index file to disk. |
|
55 |
* |
|
56 |
* In oreder to use secondary index file make sure the option "usezipindex" is in the Options object, |
|
57 |
* when JavacFileManager is invoked. (You can pass "-XDusezipindex" on the command line. |
|
58 |
* |
|
59 |
* Location where to look for/generate optimized zip index files can be provided using |
|
60 |
* "-XDcachezipindexdir=<directory>". If this flag is not provided, the dfault location is |
|
61 |
* the value of the "java.io.tmpdir" system property. |
|
62 |
* |
|
63 |
* If key "-XDwritezipindexfiles" is specified, there will be new optimized index file |
|
64 |
* created for each archive, used by the compiler for compilation, at location, |
|
65 |
* specified by "cachezipindexdir" option. |
|
66 |
* |
|
67 |
* If nonBatchMode option is specified (-XDnonBatchMode) the compiler will use timestamp |
|
68 |
* checking to reindex the zip files if it is needed. In batch mode the timestamps are not checked |
|
69 |
* and the compiler uses the cached indexes. |
|
70 |
*/ |
|
71 |
public class ZipFileIndex { |
|
72 |
private static final String MIN_CHAR = String.valueOf(Character.MIN_VALUE); |
|
73 |
private static final String MAX_CHAR = String.valueOf(Character.MAX_VALUE); |
|
74 |
||
75 |
public final static long NOT_MODIFIED = Long.MIN_VALUE; |
|
76 |
||
77 |
private static Map<File, ZipFileIndex> zipFileIndexCache = new HashMap<File, ZipFileIndex>(); |
|
78 |
private static ReentrantLock lock = new ReentrantLock(); |
|
79 |
||
80 |
private static boolean NON_BATCH_MODE = System.getProperty("nonBatchMode") != null;// TODO: Use -XD compiler switch for this. |
|
81 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
82 |
private Map<RelativeDirectory, DirectoryEntry> directories = Collections.<RelativeDirectory, DirectoryEntry>emptyMap(); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
83 |
private Set<RelativeDirectory> allDirs = Collections.<RelativeDirectory>emptySet(); |
10 | 84 |
|
85 |
// ZipFileIndex data entries |
|
86 |
private File zipFile; |
|
87 |
private long zipFileLastModified = NOT_MODIFIED; |
|
88 |
private RandomAccessFile zipRandomFile; |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
89 |
private Entry[] entries; |
10 | 90 |
|
91 |
private boolean readFromIndex = false; |
|
92 |
private File zipIndexFile = null; |
|
93 |
private boolean triedToReadIndex = false; |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
94 |
final RelativeDirectory symbolFilePrefix; |
10 | 95 |
private int symbolFilePrefixLength = 0; |
96 |
private boolean hasPopulatedData = false; |
|
97 |
private long lastReferenceTimeStamp = NOT_MODIFIED; |
|
98 |
||
99 |
private boolean usePreindexedCache = false; |
|
100 |
private String preindexedCacheLocation = null; |
|
101 |
||
102 |
private boolean writeIndex = false; |
|
103 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
104 |
private Map <String, SoftReference<RelativeDirectory>> relativeDirectoryCache = |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
105 |
new HashMap<String, SoftReference<RelativeDirectory>>(); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
106 |
|
10 | 107 |
/** |
108 |
* Returns a list of all ZipFileIndex entries |
|
109 |
* |
|
110 |
* @return A list of ZipFileIndex entries, or an empty list |
|
111 |
*/ |
|
112 |
public static List<ZipFileIndex> getZipFileIndexes() { |
|
113 |
return getZipFileIndexes(false); |
|
114 |
} |
|
115 |
||
116 |
/** |
|
117 |
* Returns a list of all ZipFileIndex entries |
|
118 |
* |
|
119 |
* @param openedOnly If true it returns a list of only opened ZipFileIndex entries, otherwise |
|
120 |
* all ZipFileEntry(s) are included into the list. |
|
121 |
* @return A list of ZipFileIndex entries, or an empty list |
|
122 |
*/ |
|
123 |
public static List<ZipFileIndex> getZipFileIndexes(boolean openedOnly) { |
|
124 |
List<ZipFileIndex> zipFileIndexes = new ArrayList<ZipFileIndex>(); |
|
125 |
lock.lock(); |
|
126 |
try { |
|
127 |
zipFileIndexes.addAll(zipFileIndexCache.values()); |
|
128 |
||
129 |
if (openedOnly) { |
|
130 |
for(ZipFileIndex elem : zipFileIndexes) { |
|
131 |
if (!elem.isOpen()) { |
|
132 |
zipFileIndexes.remove(elem); |
|
133 |
} |
|
134 |
} |
|
135 |
} |
|
136 |
} |
|
137 |
finally { |
|
138 |
lock.unlock(); |
|
139 |
} |
|
140 |
return zipFileIndexes; |
|
141 |
} |
|
142 |
||
143 |
public boolean isOpen() { |
|
144 |
lock.lock(); |
|
145 |
try { |
|
146 |
return zipRandomFile != null; |
|
147 |
} |
|
148 |
finally { |
|
149 |
lock.unlock(); |
|
150 |
} |
|
151 |
} |
|
152 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
153 |
public static ZipFileIndex getZipFileIndex(File zipFile, |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
154 |
RelativeDirectory symbolFilePrefix, |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
155 |
boolean useCache, String cacheLocation, |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
156 |
boolean writeIndex) throws IOException { |
10 | 157 |
ZipFileIndex zi = null; |
158 |
lock.lock(); |
|
159 |
try { |
|
160 |
zi = getExistingZipIndex(zipFile); |
|
161 |
||
162 |
if (zi == null || (zi != null && zipFile.lastModified() != zi.zipFileLastModified)) { |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
163 |
zi = new ZipFileIndex(zipFile, symbolFilePrefix, writeIndex, |
10 | 164 |
useCache, cacheLocation); |
165 |
zipFileIndexCache.put(zipFile, zi); |
|
166 |
} |
|
167 |
} |
|
168 |
finally { |
|
169 |
lock.unlock(); |
|
170 |
} |
|
171 |
return zi; |
|
172 |
} |
|
173 |
||
174 |
public static ZipFileIndex getExistingZipIndex(File zipFile) { |
|
175 |
lock.lock(); |
|
176 |
try { |
|
177 |
return zipFileIndexCache.get(zipFile); |
|
178 |
} |
|
179 |
finally { |
|
180 |
lock.unlock(); |
|
181 |
} |
|
182 |
} |
|
183 |
||
184 |
public static void clearCache() { |
|
185 |
lock.lock(); |
|
186 |
try { |
|
187 |
zipFileIndexCache.clear(); |
|
188 |
} |
|
189 |
finally { |
|
190 |
lock.unlock(); |
|
191 |
} |
|
192 |
} |
|
193 |
||
194 |
public static void clearCache(long timeNotUsed) { |
|
195 |
lock.lock(); |
|
196 |
try { |
|
197 |
Iterator<File> cachedFileIterator = zipFileIndexCache.keySet().iterator(); |
|
198 |
while (cachedFileIterator.hasNext()) { |
|
199 |
File cachedFile = cachedFileIterator.next(); |
|
200 |
ZipFileIndex cachedZipIndex = zipFileIndexCache.get(cachedFile); |
|
201 |
if (cachedZipIndex != null) { |
|
202 |
long timeToTest = cachedZipIndex.lastReferenceTimeStamp + timeNotUsed; |
|
203 |
if (timeToTest < cachedZipIndex.lastReferenceTimeStamp || // Overflow... |
|
204 |
System.currentTimeMillis() > timeToTest) { |
|
205 |
zipFileIndexCache.remove(cachedFile); |
|
206 |
} |
|
207 |
} |
|
208 |
} |
|
209 |
} |
|
210 |
finally { |
|
211 |
lock.unlock(); |
|
212 |
} |
|
213 |
} |
|
214 |
||
215 |
public static void removeFromCache(File file) { |
|
216 |
lock.lock(); |
|
217 |
try { |
|
218 |
zipFileIndexCache.remove(file); |
|
219 |
} |
|
220 |
finally { |
|
221 |
lock.unlock(); |
|
222 |
} |
|
223 |
} |
|
224 |
||
225 |
/** Sets already opened list of ZipFileIndexes from an outside client |
|
226 |
* of the compiler. This functionality should be used in a non-batch clients of the compiler. |
|
227 |
*/ |
|
228 |
public static void setOpenedIndexes(List<ZipFileIndex>indexes) throws IllegalStateException { |
|
229 |
lock.lock(); |
|
230 |
try { |
|
231 |
if (zipFileIndexCache.isEmpty()) { |
|
232 |
throw new IllegalStateException("Setting opened indexes should be called only when the ZipFileCache is empty. Call JavacFileManager.flush() before calling this method."); |
|
233 |
} |
|
234 |
||
235 |
for (ZipFileIndex zfi : indexes) { |
|
236 |
zipFileIndexCache.put(zfi.zipFile, zfi); |
|
237 |
} |
|
238 |
} |
|
239 |
finally { |
|
240 |
lock.unlock(); |
|
241 |
} |
|
242 |
} |
|
243 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
244 |
private ZipFileIndex(File zipFile, RelativeDirectory symbolFilePrefix, boolean writeIndex, |
10 | 245 |
boolean useCache, String cacheLocation) throws IOException { |
246 |
this.zipFile = zipFile; |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
247 |
this.symbolFilePrefix = symbolFilePrefix; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
248 |
this.symbolFilePrefixLength = (symbolFilePrefix == null ? 0 : |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
249 |
symbolFilePrefix.getPath().getBytes("UTF-8").length); |
10 | 250 |
this.writeIndex = writeIndex; |
251 |
this.usePreindexedCache = useCache; |
|
252 |
this.preindexedCacheLocation = cacheLocation; |
|
253 |
||
254 |
if (zipFile != null) { |
|
255 |
this.zipFileLastModified = zipFile.lastModified(); |
|
256 |
} |
|
257 |
||
258 |
// Validate integrity of the zip file |
|
259 |
checkIndex(); |
|
260 |
} |
|
261 |
||
262 |
public String toString() { |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
263 |
return "ZipFileIndex[" + zipFile + "]"; |
10 | 264 |
} |
265 |
||
266 |
// Just in case... |
|
267 |
protected void finalize() { |
|
268 |
closeFile(); |
|
269 |
} |
|
270 |
||
271 |
private boolean isUpToDate() { |
|
272 |
if (zipFile != null && |
|
273 |
((!NON_BATCH_MODE) || zipFileLastModified == zipFile.lastModified()) && |
|
274 |
hasPopulatedData) { |
|
275 |
return true; |
|
276 |
} |
|
277 |
||
278 |
return false; |
|
279 |
} |
|
280 |
||
281 |
/** |
|
282 |
* Here we need to make sure that the ZipFileIndex is valid. Check the timestamp of the file and |
|
283 |
* if its the same as the one at the time the index was build we don't need to reopen anything. |
|
284 |
*/ |
|
285 |
private void checkIndex() throws IOException { |
|
286 |
boolean isUpToDate = true; |
|
287 |
if (!isUpToDate()) { |
|
288 |
closeFile(); |
|
289 |
isUpToDate = false; |
|
290 |
} |
|
291 |
||
292 |
if (zipRandomFile != null || isUpToDate) { |
|
293 |
lastReferenceTimeStamp = System.currentTimeMillis(); |
|
294 |
return; |
|
295 |
} |
|
296 |
||
297 |
hasPopulatedData = true; |
|
298 |
||
299 |
if (readIndex()) { |
|
300 |
lastReferenceTimeStamp = System.currentTimeMillis(); |
|
301 |
return; |
|
302 |
} |
|
303 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
304 |
directories = Collections.<RelativeDirectory, DirectoryEntry>emptyMap(); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
305 |
allDirs = Collections.<RelativeDirectory>emptySet(); |
10 | 306 |
|
307 |
try { |
|
308 |
openFile(); |
|
309 |
long totalLength = zipRandomFile.length(); |
|
310 |
ZipDirectory directory = new ZipDirectory(zipRandomFile, 0L, totalLength, this); |
|
311 |
directory.buildIndex(); |
|
312 |
} finally { |
|
313 |
if (zipRandomFile != null) { |
|
314 |
closeFile(); |
|
315 |
} |
|
316 |
} |
|
317 |
||
318 |
lastReferenceTimeStamp = System.currentTimeMillis(); |
|
319 |
} |
|
320 |
||
321 |
private void openFile() throws FileNotFoundException { |
|
322 |
if (zipRandomFile == null && zipFile != null) { |
|
323 |
zipRandomFile = new RandomAccessFile(zipFile, "r"); |
|
324 |
} |
|
325 |
} |
|
326 |
||
327 |
private void cleanupState() { |
|
328 |
// Make sure there is a valid but empty index if the file doesn't exist |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
329 |
entries = Entry.EMPTY_ARRAY; |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
330 |
directories = Collections.<RelativeDirectory, DirectoryEntry>emptyMap(); |
10 | 331 |
zipFileLastModified = NOT_MODIFIED; |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
332 |
allDirs = Collections.<RelativeDirectory>emptySet(); |
10 | 333 |
} |
334 |
||
335 |
public void close() { |
|
336 |
lock.lock(); |
|
337 |
try { |
|
338 |
writeIndex(); |
|
339 |
closeFile(); |
|
340 |
} |
|
341 |
finally { |
|
342 |
lock.unlock(); |
|
343 |
} |
|
344 |
} |
|
345 |
||
346 |
private void closeFile() { |
|
347 |
if (zipRandomFile != null) { |
|
348 |
try { |
|
349 |
zipRandomFile.close(); |
|
350 |
} catch (IOException ex) { |
|
351 |
} |
|
352 |
zipRandomFile = null; |
|
353 |
} |
|
354 |
} |
|
355 |
||
356 |
/** |
|
357 |
* Returns the ZipFileIndexEntry for an absolute path, if there is one. |
|
358 |
*/ |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
359 |
Entry getZipIndexEntry(RelativePath path) { |
10 | 360 |
lock.lock(); |
361 |
try { |
|
362 |
checkIndex(); |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
363 |
DirectoryEntry de = directories.get(path.dirname()); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
364 |
String lookFor = path.basename(); |
10 | 365 |
return de == null ? null : de.getEntry(lookFor); |
366 |
} |
|
367 |
catch (IOException e) { |
|
368 |
return null; |
|
369 |
} |
|
370 |
finally { |
|
371 |
lock.unlock(); |
|
372 |
} |
|
373 |
} |
|
374 |
||
375 |
/** |
|
376 |
* Returns a javac List of filenames within an absolute path in the ZipFileIndex. |
|
377 |
*/ |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
378 |
public com.sun.tools.javac.util.List<String> getFiles(RelativeDirectory path) { |
10 | 379 |
lock.lock(); |
380 |
try { |
|
381 |
checkIndex(); |
|
382 |
||
383 |
DirectoryEntry de = directories.get(path); |
|
384 |
com.sun.tools.javac.util.List<String> ret = de == null ? null : de.getFiles(); |
|
385 |
||
386 |
if (ret == null) { |
|
387 |
return com.sun.tools.javac.util.List.<String>nil(); |
|
388 |
} |
|
389 |
return ret; |
|
390 |
} |
|
391 |
catch (IOException e) { |
|
392 |
return com.sun.tools.javac.util.List.<String>nil(); |
|
393 |
} |
|
394 |
finally { |
|
395 |
lock.unlock(); |
|
396 |
} |
|
397 |
} |
|
398 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
399 |
public List<String> getDirectories(RelativeDirectory path) { |
10 | 400 |
lock.lock(); |
401 |
try { |
|
402 |
checkIndex(); |
|
403 |
||
404 |
DirectoryEntry de = directories.get(path); |
|
405 |
com.sun.tools.javac.util.List<String> ret = de == null ? null : de.getDirectories(); |
|
406 |
||
407 |
if (ret == null) { |
|
408 |
return com.sun.tools.javac.util.List.<String>nil(); |
|
409 |
} |
|
410 |
||
411 |
return ret; |
|
412 |
} |
|
413 |
catch (IOException e) { |
|
414 |
return com.sun.tools.javac.util.List.<String>nil(); |
|
415 |
} |
|
416 |
finally { |
|
417 |
lock.unlock(); |
|
418 |
} |
|
419 |
} |
|
420 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
421 |
public Set<RelativeDirectory> getAllDirectories() { |
10 | 422 |
lock.lock(); |
423 |
try { |
|
424 |
checkIndex(); |
|
425 |
if (allDirs == Collections.EMPTY_SET) { |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
426 |
allDirs = new HashSet<RelativeDirectory>(directories.keySet()); |
10 | 427 |
} |
428 |
||
429 |
return allDirs; |
|
430 |
} |
|
431 |
catch (IOException e) { |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
432 |
return Collections.<RelativeDirectory>emptySet(); |
10 | 433 |
} |
434 |
finally { |
|
435 |
lock.unlock(); |
|
436 |
} |
|
437 |
} |
|
438 |
||
439 |
/** |
|
440 |
* Tests if a specific path exists in the zip. This method will return true |
|
441 |
* for file entries and directories. |
|
442 |
* |
|
443 |
* @param path A path within the zip. |
|
444 |
* @return True if the path is a file or dir, false otherwise. |
|
445 |
*/ |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
446 |
public boolean contains(RelativePath path) { |
10 | 447 |
lock.lock(); |
448 |
try { |
|
449 |
checkIndex(); |
|
450 |
return getZipIndexEntry(path) != null; |
|
451 |
} |
|
452 |
catch (IOException e) { |
|
453 |
return false; |
|
454 |
} |
|
455 |
finally { |
|
456 |
lock.unlock(); |
|
457 |
} |
|
458 |
} |
|
459 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
460 |
public boolean isDirectory(RelativePath path) throws IOException { |
10 | 461 |
lock.lock(); |
462 |
try { |
|
463 |
// The top level in a zip file is always a directory. |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
464 |
if (path.getPath().length() == 0) { |
10 | 465 |
lastReferenceTimeStamp = System.currentTimeMillis(); |
466 |
return true; |
|
467 |
} |
|
468 |
||
469 |
checkIndex(); |
|
470 |
return directories.get(path) != null; |
|
471 |
} |
|
472 |
finally { |
|
473 |
lock.unlock(); |
|
474 |
} |
|
475 |
} |
|
476 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
477 |
public long getLastModified(RelativeFile path) throws IOException { |
10 | 478 |
lock.lock(); |
479 |
try { |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
480 |
Entry entry = getZipIndexEntry(path); |
10 | 481 |
if (entry == null) |
482 |
throw new FileNotFoundException(); |
|
483 |
return entry.getLastModified(); |
|
484 |
} |
|
485 |
finally { |
|
486 |
lock.unlock(); |
|
487 |
} |
|
488 |
} |
|
489 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
490 |
public int length(RelativeFile path) throws IOException { |
10 | 491 |
lock.lock(); |
492 |
try { |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
493 |
Entry entry = getZipIndexEntry(path); |
10 | 494 |
if (entry == null) |
495 |
throw new FileNotFoundException(); |
|
496 |
||
497 |
if (entry.isDir) { |
|
498 |
return 0; |
|
499 |
} |
|
500 |
||
501 |
byte[] header = getHeader(entry); |
|
502 |
// entry is not compressed? |
|
503 |
if (get2ByteLittleEndian(header, 8) == 0) { |
|
504 |
return entry.compressedSize; |
|
505 |
} else { |
|
506 |
return entry.size; |
|
507 |
} |
|
508 |
} |
|
509 |
finally { |
|
510 |
lock.unlock(); |
|
511 |
} |
|
512 |
} |
|
513 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
514 |
public byte[] read(RelativeFile path) throws IOException { |
10 | 515 |
lock.lock(); |
516 |
try { |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
517 |
Entry entry = getZipIndexEntry(path); |
10 | 518 |
if (entry == null) |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
519 |
throw new FileNotFoundException("Path not found in ZIP: " + path.path); |
10 | 520 |
return read(entry); |
521 |
} |
|
522 |
finally { |
|
523 |
lock.unlock(); |
|
524 |
} |
|
525 |
} |
|
526 |
||
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
527 |
byte[] read(Entry entry) throws IOException { |
10 | 528 |
lock.lock(); |
529 |
try { |
|
530 |
openFile(); |
|
531 |
byte[] result = readBytes(entry); |
|
532 |
closeFile(); |
|
533 |
return result; |
|
534 |
} |
|
535 |
finally { |
|
536 |
lock.unlock(); |
|
537 |
} |
|
538 |
} |
|
539 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
540 |
public int read(RelativeFile path, byte[] buffer) throws IOException { |
10 | 541 |
lock.lock(); |
542 |
try { |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
543 |
Entry entry = getZipIndexEntry(path); |
10 | 544 |
if (entry == null) |
545 |
throw new FileNotFoundException(); |
|
546 |
return read(entry, buffer); |
|
547 |
} |
|
548 |
finally { |
|
549 |
lock.unlock(); |
|
550 |
} |
|
551 |
} |
|
552 |
||
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
553 |
int read(Entry entry, byte[] buffer) |
10 | 554 |
throws IOException { |
555 |
lock.lock(); |
|
556 |
try { |
|
557 |
int result = readBytes(entry, buffer); |
|
558 |
return result; |
|
559 |
} |
|
560 |
finally { |
|
561 |
lock.unlock(); |
|
562 |
} |
|
563 |
} |
|
564 |
||
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
565 |
private byte[] readBytes(Entry entry) throws IOException { |
10 | 566 |
byte[] header = getHeader(entry); |
567 |
int csize = entry.compressedSize; |
|
568 |
byte[] cbuf = new byte[csize]; |
|
569 |
zipRandomFile.skipBytes(get2ByteLittleEndian(header, 26) + get2ByteLittleEndian(header, 28)); |
|
570 |
zipRandomFile.readFully(cbuf, 0, csize); |
|
571 |
||
572 |
// is this compressed - offset 8 in the ZipEntry header |
|
573 |
if (get2ByteLittleEndian(header, 8) == 0) |
|
574 |
return cbuf; |
|
575 |
||
576 |
int size = entry.size; |
|
577 |
byte[] buf = new byte[size]; |
|
578 |
if (inflate(cbuf, buf) != size) |
|
579 |
throw new ZipException("corrupted zip file"); |
|
580 |
||
581 |
return buf; |
|
582 |
} |
|
583 |
||
584 |
/** |
|
585 |
* |
|
586 |
*/ |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
587 |
private int readBytes(Entry entry, byte[] buffer) throws IOException { |
10 | 588 |
byte[] header = getHeader(entry); |
589 |
||
590 |
// entry is not compressed? |
|
591 |
if (get2ByteLittleEndian(header, 8) == 0) { |
|
592 |
zipRandomFile.skipBytes(get2ByteLittleEndian(header, 26) + get2ByteLittleEndian(header, 28)); |
|
593 |
int offset = 0; |
|
594 |
int size = buffer.length; |
|
595 |
while (offset < size) { |
|
596 |
int count = zipRandomFile.read(buffer, offset, size - offset); |
|
597 |
if (count == -1) |
|
598 |
break; |
|
599 |
offset += count; |
|
600 |
} |
|
601 |
return entry.size; |
|
602 |
} |
|
603 |
||
604 |
int csize = entry.compressedSize; |
|
605 |
byte[] cbuf = new byte[csize]; |
|
606 |
zipRandomFile.skipBytes(get2ByteLittleEndian(header, 26) + get2ByteLittleEndian(header, 28)); |
|
607 |
zipRandomFile.readFully(cbuf, 0, csize); |
|
608 |
||
609 |
int count = inflate(cbuf, buffer); |
|
610 |
if (count == -1) |
|
611 |
throw new ZipException("corrupted zip file"); |
|
612 |
||
613 |
return entry.size; |
|
614 |
} |
|
615 |
||
616 |
//---------------------------------------------------------------------------- |
|
617 |
// Zip utilities |
|
618 |
//---------------------------------------------------------------------------- |
|
619 |
||
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
620 |
private byte[] getHeader(Entry entry) throws IOException { |
10 | 621 |
zipRandomFile.seek(entry.offset); |
622 |
byte[] header = new byte[30]; |
|
623 |
zipRandomFile.readFully(header); |
|
624 |
if (get4ByteLittleEndian(header, 0) != 0x04034b50) |
|
625 |
throw new ZipException("corrupted zip file"); |
|
626 |
if ((get2ByteLittleEndian(header, 6) & 1) != 0) |
|
627 |
throw new ZipException("encrypted zip file"); // offset 6 in the header of the ZipFileEntry |
|
628 |
return header; |
|
629 |
} |
|
630 |
||
631 |
/* |
|
632 |
* Inflate using the java.util.zip.Inflater class |
|
633 |
*/ |
|
634 |
private static Inflater inflater; |
|
635 |
private int inflate(byte[] src, byte[] dest) { |
|
636 |
||
637 |
// construct the inflater object or reuse an existing one |
|
638 |
if (inflater == null) |
|
639 |
inflater = new Inflater(true); |
|
640 |
||
641 |
synchronized (inflater) { |
|
642 |
inflater.reset(); |
|
643 |
inflater.setInput(src); |
|
644 |
try { |
|
645 |
return inflater.inflate(dest); |
|
646 |
} catch (DataFormatException ex) { |
|
647 |
return -1; |
|
648 |
} |
|
649 |
} |
|
650 |
} |
|
651 |
||
652 |
/** |
|
653 |
* return the two bytes buf[pos], buf[pos+1] as an unsigned integer in little |
|
654 |
* endian format. |
|
655 |
*/ |
|
656 |
private static int get2ByteLittleEndian(byte[] buf, int pos) { |
|
657 |
return (buf[pos] & 0xFF) + ((buf[pos+1] & 0xFF) << 8); |
|
658 |
} |
|
659 |
||
660 |
/** |
|
661 |
* return the 4 bytes buf[i..i+3] as an integer in little endian format. |
|
662 |
*/ |
|
663 |
private static int get4ByteLittleEndian(byte[] buf, int pos) { |
|
664 |
return (buf[pos] & 0xFF) + ((buf[pos + 1] & 0xFF) << 8) + |
|
665 |
((buf[pos + 2] & 0xFF) << 16) + ((buf[pos + 3] & 0xFF) << 24); |
|
666 |
} |
|
667 |
||
668 |
/* ---------------------------------------------------------------------------- |
|
669 |
* ZipDirectory |
|
670 |
* ----------------------------------------------------------------------------*/ |
|
671 |
||
672 |
private class ZipDirectory { |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
673 |
private RelativeDirectory lastDir; |
10 | 674 |
private int lastStart; |
675 |
private int lastLen; |
|
676 |
||
677 |
byte[] zipDir; |
|
678 |
RandomAccessFile zipRandomFile = null; |
|
679 |
ZipFileIndex zipFileIndex = null; |
|
680 |
||
681 |
public ZipDirectory(RandomAccessFile zipRandomFile, long start, long end, ZipFileIndex index) throws IOException { |
|
682 |
this.zipRandomFile = zipRandomFile; |
|
683 |
this.zipFileIndex = index; |
|
684 |
||
685 |
findCENRecord(start, end); |
|
686 |
} |
|
687 |
||
688 |
/* |
|
689 |
* Reads zip file central directory. |
|
690 |
* For more details see readCEN in zip_util.c from the JDK sources. |
|
691 |
* This is a Java port of that function. |
|
692 |
*/ |
|
693 |
private void findCENRecord(long start, long end) throws IOException { |
|
694 |
long totalLength = end - start; |
|
695 |
int endbuflen = 1024; |
|
696 |
byte[] endbuf = new byte[endbuflen]; |
|
697 |
long endbufend = end - start; |
|
698 |
||
699 |
// There is a variable-length field after the dir offset record. We need to do consequential search. |
|
700 |
while (endbufend >= 22) { |
|
701 |
if (endbufend < endbuflen) |
|
702 |
endbuflen = (int)endbufend; |
|
703 |
long endbufpos = endbufend - endbuflen; |
|
704 |
zipRandomFile.seek(start + endbufpos); |
|
705 |
zipRandomFile.readFully(endbuf, 0, endbuflen); |
|
706 |
int i = endbuflen - 22; |
|
707 |
while (i >= 0 && |
|
708 |
!(endbuf[i] == 0x50 && |
|
709 |
endbuf[i + 1] == 0x4b && |
|
710 |
endbuf[i + 2] == 0x05 && |
|
711 |
endbuf[i + 3] == 0x06 && |
|
712 |
endbufpos + i + 22 + |
|
713 |
get2ByteLittleEndian(endbuf, i + 20) == totalLength)) { |
|
714 |
i--; |
|
715 |
} |
|
716 |
||
717 |
if (i >= 0) { |
|
718 |
zipDir = new byte[get4ByteLittleEndian(endbuf, i + 12) + 2]; |
|
719 |
zipDir[0] = endbuf[i + 10]; |
|
720 |
zipDir[1] = endbuf[i + 11]; |
|
721 |
zipRandomFile.seek(start + get4ByteLittleEndian(endbuf, i + 16)); |
|
722 |
zipRandomFile.readFully(zipDir, 2, zipDir.length - 2); |
|
723 |
return; |
|
724 |
} else { |
|
725 |
endbufend = endbufpos + 21; |
|
726 |
} |
|
727 |
} |
|
728 |
throw new ZipException("cannot read zip file"); |
|
729 |
} |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
730 |
|
10 | 731 |
private void buildIndex() throws IOException { |
732 |
int entryCount = get2ByteLittleEndian(zipDir, 0); |
|
733 |
||
734 |
// Add each of the files |
|
735 |
if (entryCount > 0) { |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
736 |
directories = new HashMap<RelativeDirectory, DirectoryEntry>(); |
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
737 |
ArrayList<Entry> entryList = new ArrayList<Entry>(); |
10 | 738 |
int pos = 2; |
739 |
for (int i = 0; i < entryCount; i++) { |
|
740 |
pos = readEntry(pos, entryList, directories); |
|
741 |
} |
|
742 |
||
743 |
// Add the accumulated dirs into the same list |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
744 |
for (RelativeDirectory d: directories.keySet()) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
745 |
// use shared RelativeDirectory objects for parent dirs |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
746 |
RelativeDirectory parent = getRelativeDirectory(d.dirname().getPath()); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
747 |
String file = d.basename(); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
748 |
Entry zipFileIndexEntry = new Entry(parent, file); |
10 | 749 |
zipFileIndexEntry.isDir = true; |
750 |
entryList.add(zipFileIndexEntry); |
|
751 |
} |
|
752 |
||
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
753 |
entries = entryList.toArray(new Entry[entryList.size()]); |
10 | 754 |
Arrays.sort(entries); |
755 |
} else { |
|
756 |
cleanupState(); |
|
757 |
} |
|
758 |
} |
|
759 |
||
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
760 |
private int readEntry(int pos, List<Entry> entryList, |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
761 |
Map<RelativeDirectory, DirectoryEntry> directories) throws IOException { |
10 | 762 |
if (get4ByteLittleEndian(zipDir, pos) != 0x02014b50) { |
763 |
throw new ZipException("cannot read zip file entry"); |
|
764 |
} |
|
765 |
||
766 |
int dirStart = pos + 46; |
|
767 |
int fileStart = dirStart; |
|
768 |
int fileEnd = fileStart + get2ByteLittleEndian(zipDir, pos + 28); |
|
769 |
||
770 |
if (zipFileIndex.symbolFilePrefixLength != 0 && |
|
771 |
((fileEnd - fileStart) >= symbolFilePrefixLength)) { |
|
772 |
dirStart += zipFileIndex.symbolFilePrefixLength; |
|
773 |
fileStart += zipFileIndex.symbolFilePrefixLength; |
|
774 |
} |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
775 |
// Force any '\' to '/'. Keep the position of the last separator. |
10 | 776 |
for (int index = fileStart; index < fileEnd; index++) { |
777 |
byte nextByte = zipDir[index]; |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
778 |
if (nextByte == (byte)'\\') { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
779 |
zipDir[index] = (byte)'/'; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
780 |
fileStart = index + 1; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
781 |
} else if (nextByte == (byte)'/') { |
10 | 782 |
fileStart = index + 1; |
783 |
} |
|
784 |
} |
|
785 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
786 |
RelativeDirectory directory = null; |
10 | 787 |
if (fileStart == dirStart) |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
788 |
directory = getRelativeDirectory(""); |
10 | 789 |
else if (lastDir != null && lastLen == fileStart - dirStart - 1) { |
790 |
int index = lastLen - 1; |
|
791 |
while (zipDir[lastStart + index] == zipDir[dirStart + index]) { |
|
792 |
if (index == 0) { |
|
793 |
directory = lastDir; |
|
794 |
break; |
|
795 |
} |
|
796 |
index--; |
|
797 |
} |
|
798 |
} |
|
799 |
||
800 |
// Sub directories |
|
801 |
if (directory == null) { |
|
802 |
lastStart = dirStart; |
|
803 |
lastLen = fileStart - dirStart - 1; |
|
804 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
805 |
directory = getRelativeDirectory(new String(zipDir, dirStart, lastLen, "UTF-8")); |
10 | 806 |
lastDir = directory; |
807 |
||
808 |
// Enter also all the parent directories |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
809 |
RelativeDirectory tempDirectory = directory; |
10 | 810 |
|
811 |
while (directories.get(tempDirectory) == null) { |
|
812 |
directories.put(tempDirectory, new DirectoryEntry(tempDirectory, zipFileIndex)); |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
813 |
if (tempDirectory.path.indexOf("/") == tempDirectory.path.length() - 1) |
10 | 814 |
break; |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
815 |
else { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
816 |
// use shared RelativeDirectory objects for parent dirs |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
817 |
tempDirectory = getRelativeDirectory(tempDirectory.dirname().getPath()); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
818 |
} |
10 | 819 |
} |
820 |
} |
|
821 |
else { |
|
822 |
if (directories.get(directory) == null) { |
|
823 |
directories.put(directory, new DirectoryEntry(directory, zipFileIndex)); |
|
824 |
} |
|
825 |
} |
|
826 |
||
827 |
// For each dir create also a file |
|
828 |
if (fileStart != fileEnd) { |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
829 |
Entry entry = new Entry(directory, |
10 | 830 |
new String(zipDir, fileStart, fileEnd - fileStart, "UTF-8")); |
831 |
||
832 |
entry.setNativeTime(get4ByteLittleEndian(zipDir, pos + 12)); |
|
833 |
entry.compressedSize = get4ByteLittleEndian(zipDir, pos + 20); |
|
834 |
entry.size = get4ByteLittleEndian(zipDir, pos + 24); |
|
835 |
entry.offset = get4ByteLittleEndian(zipDir, pos + 42); |
|
836 |
entryList.add(entry); |
|
837 |
} |
|
838 |
||
839 |
return pos + 46 + |
|
840 |
get2ByteLittleEndian(zipDir, pos + 28) + |
|
841 |
get2ByteLittleEndian(zipDir, pos + 30) + |
|
842 |
get2ByteLittleEndian(zipDir, pos + 32); |
|
843 |
} |
|
844 |
} |
|
845 |
||
846 |
/** |
|
847 |
* Returns the last modified timestamp of a zip file. |
|
848 |
* @return long |
|
849 |
*/ |
|
850 |
public long getZipFileLastModified() throws IOException { |
|
851 |
lock.lock(); |
|
852 |
try { |
|
853 |
checkIndex(); |
|
854 |
return zipFileLastModified; |
|
855 |
} |
|
856 |
finally { |
|
857 |
lock.unlock(); |
|
858 |
} |
|
859 |
} |
|
860 |
||
861 |
/** ------------------------------------------------------------------------ |
|
862 |
* DirectoryEntry class |
|
863 |
* -------------------------------------------------------------------------*/ |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
864 |
|
10 | 865 |
static class DirectoryEntry { |
866 |
private boolean filesInited; |
|
867 |
private boolean directoriesInited; |
|
868 |
private boolean zipFileEntriesInited; |
|
869 |
private boolean entriesInited; |
|
870 |
||
871 |
private long writtenOffsetOffset = 0; |
|
872 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
873 |
private RelativeDirectory dirName; |
10 | 874 |
|
875 |
private com.sun.tools.javac.util.List<String> zipFileEntriesFiles = com.sun.tools.javac.util.List.<String>nil(); |
|
876 |
private com.sun.tools.javac.util.List<String> zipFileEntriesDirectories = com.sun.tools.javac.util.List.<String>nil(); |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
877 |
private com.sun.tools.javac.util.List<Entry> zipFileEntries = com.sun.tools.javac.util.List.<Entry>nil(); |
10 | 878 |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
879 |
private List<Entry> entries = new ArrayList<Entry>(); |
10 | 880 |
|
881 |
private ZipFileIndex zipFileIndex; |
|
882 |
||
883 |
private int numEntries; |
|
884 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
885 |
DirectoryEntry(RelativeDirectory dirName, ZipFileIndex index) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
886 |
filesInited = false; |
10 | 887 |
directoriesInited = false; |
888 |
entriesInited = false; |
|
889 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
890 |
this.dirName = dirName; |
10 | 891 |
this.zipFileIndex = index; |
892 |
} |
|
893 |
||
894 |
private com.sun.tools.javac.util.List<String> getFiles() { |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
895 |
if (!filesInited) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
896 |
initEntries(); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
897 |
for (Entry e : entries) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
898 |
if (!e.isDir) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
899 |
zipFileEntriesFiles = zipFileEntriesFiles.append(e.name); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
900 |
} |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
901 |
} |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
902 |
filesInited = true; |
10 | 903 |
} |
904 |
return zipFileEntriesFiles; |
|
905 |
} |
|
906 |
||
907 |
private com.sun.tools.javac.util.List<String> getDirectories() { |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
908 |
if (!directoriesInited) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
909 |
initEntries(); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
910 |
for (Entry e : entries) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
911 |
if (e.isDir) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
912 |
zipFileEntriesDirectories = zipFileEntriesDirectories.append(e.name); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
913 |
} |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
914 |
} |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
915 |
directoriesInited = true; |
10 | 916 |
} |
917 |
return zipFileEntriesDirectories; |
|
918 |
} |
|
919 |
||
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
920 |
private com.sun.tools.javac.util.List<Entry> getEntries() { |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
921 |
if (!zipFileEntriesInited) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
922 |
initEntries(); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
923 |
zipFileEntries = com.sun.tools.javac.util.List.nil(); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
924 |
for (Entry zfie : entries) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
925 |
zipFileEntries = zipFileEntries.append(zfie); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
926 |
} |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
927 |
zipFileEntriesInited = true; |
10 | 928 |
} |
929 |
return zipFileEntries; |
|
930 |
} |
|
931 |
||
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
932 |
private Entry getEntry(String rootName) { |
10 | 933 |
initEntries(); |
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
934 |
int index = Collections.binarySearch(entries, new Entry(dirName, rootName)); |
10 | 935 |
if (index < 0) { |
936 |
return null; |
|
937 |
} |
|
938 |
||
939 |
return entries.get(index); |
|
940 |
} |
|
941 |
||
942 |
private void initEntries() { |
|
943 |
if (entriesInited) { |
|
944 |
return; |
|
945 |
} |
|
946 |
||
947 |
if (!zipFileIndex.readFromIndex) { |
|
948 |
int from = -Arrays.binarySearch(zipFileIndex.entries, |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
949 |
new Entry(dirName, ZipFileIndex.MIN_CHAR)) - 1; |
10 | 950 |
int to = -Arrays.binarySearch(zipFileIndex.entries, |
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
951 |
new Entry(dirName, MAX_CHAR)) - 1; |
10 | 952 |
|
953 |
for (int i = from; i < to; i++) { |
|
954 |
entries.add(zipFileIndex.entries[i]); |
|
955 |
} |
|
956 |
} else { |
|
957 |
File indexFile = zipFileIndex.getIndexFile(); |
|
958 |
if (indexFile != null) { |
|
959 |
RandomAccessFile raf = null; |
|
960 |
try { |
|
961 |
raf = new RandomAccessFile(indexFile, "r"); |
|
962 |
raf.seek(writtenOffsetOffset); |
|
963 |
||
964 |
for (int nFiles = 0; nFiles < numEntries; nFiles++) { |
|
965 |
// Read the name bytes |
|
966 |
int zfieNameBytesLen = raf.readInt(); |
|
967 |
byte [] zfieNameBytes = new byte[zfieNameBytesLen]; |
|
968 |
raf.read(zfieNameBytes); |
|
969 |
String eName = new String(zfieNameBytes, "UTF-8"); |
|
970 |
||
971 |
// Read isDir |
|
972 |
boolean eIsDir = raf.readByte() == (byte)0 ? false : true; |
|
973 |
||
974 |
// Read offset of bytes in the real Jar/Zip file |
|
975 |
int eOffset = raf.readInt(); |
|
976 |
||
977 |
// Read size of the file in the real Jar/Zip file |
|
978 |
int eSize = raf.readInt(); |
|
979 |
||
980 |
// Read compressed size of the file in the real Jar/Zip file |
|
981 |
int eCsize = raf.readInt(); |
|
982 |
||
983 |
// Read java time stamp of the file in the real Jar/Zip file |
|
984 |
long eJavaTimestamp = raf.readLong(); |
|
985 |
||
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
986 |
Entry rfie = new Entry(dirName, eName); |
10 | 987 |
rfie.isDir = eIsDir; |
988 |
rfie.offset = eOffset; |
|
989 |
rfie.size = eSize; |
|
990 |
rfie.compressedSize = eCsize; |
|
991 |
rfie.javatime = eJavaTimestamp; |
|
992 |
entries.add(rfie); |
|
993 |
} |
|
994 |
} catch (Throwable t) { |
|
995 |
// Do nothing |
|
996 |
} finally { |
|
997 |
try { |
|
998 |
if (raf == null) { |
|
999 |
raf.close(); |
|
1000 |
} |
|
1001 |
} catch (Throwable t) { |
|
1002 |
// Do nothing |
|
1003 |
} |
|
1004 |
} |
|
1005 |
} |
|
1006 |
} |
|
1007 |
||
1008 |
entriesInited = true; |
|
1009 |
} |
|
1010 |
||
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1011 |
List<Entry> getEntriesAsCollection() { |
10 | 1012 |
initEntries(); |
1013 |
||
1014 |
return entries; |
|
1015 |
} |
|
1016 |
} |
|
1017 |
||
1018 |
private boolean readIndex() { |
|
1019 |
if (triedToReadIndex || !usePreindexedCache) { |
|
1020 |
return false; |
|
1021 |
} |
|
1022 |
||
1023 |
boolean ret = false; |
|
1024 |
lock.lock(); |
|
1025 |
try { |
|
1026 |
triedToReadIndex = true; |
|
1027 |
RandomAccessFile raf = null; |
|
1028 |
try { |
|
1029 |
File indexFileName = getIndexFile(); |
|
1030 |
raf = new RandomAccessFile(indexFileName, "r"); |
|
1031 |
||
1032 |
long fileStamp = raf.readLong(); |
|
1033 |
if (zipFile.lastModified() != fileStamp) { |
|
1034 |
ret = false; |
|
1035 |
} else { |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1036 |
directories = new HashMap<RelativeDirectory, DirectoryEntry>(); |
10 | 1037 |
int numDirs = raf.readInt(); |
1038 |
for (int nDirs = 0; nDirs < numDirs; nDirs++) { |
|
1039 |
int dirNameBytesLen = raf.readInt(); |
|
1040 |
byte [] dirNameBytes = new byte[dirNameBytesLen]; |
|
1041 |
raf.read(dirNameBytes); |
|
1042 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1043 |
RelativeDirectory dirNameStr = getRelativeDirectory(new String(dirNameBytes, "UTF-8")); |
10 | 1044 |
DirectoryEntry de = new DirectoryEntry(dirNameStr, this); |
1045 |
de.numEntries = raf.readInt(); |
|
1046 |
de.writtenOffsetOffset = raf.readLong(); |
|
1047 |
directories.put(dirNameStr, de); |
|
1048 |
} |
|
1049 |
ret = true; |
|
1050 |
zipFileLastModified = fileStamp; |
|
1051 |
} |
|
1052 |
} catch (Throwable t) { |
|
1053 |
// Do nothing |
|
1054 |
} finally { |
|
1055 |
if (raf != null) { |
|
1056 |
try { |
|
1057 |
raf.close(); |
|
1058 |
} catch (Throwable tt) { |
|
1059 |
// Do nothing |
|
1060 |
} |
|
1061 |
} |
|
1062 |
} |
|
1063 |
if (ret == true) { |
|
1064 |
readFromIndex = true; |
|
1065 |
} |
|
1066 |
} |
|
1067 |
finally { |
|
1068 |
lock.unlock(); |
|
1069 |
} |
|
1070 |
||
1071 |
return ret; |
|
1072 |
} |
|
1073 |
||
1074 |
private boolean writeIndex() { |
|
1075 |
boolean ret = false; |
|
1076 |
if (readFromIndex || !usePreindexedCache) { |
|
1077 |
return true; |
|
1078 |
} |
|
1079 |
||
1080 |
if (!writeIndex) { |
|
1081 |
return true; |
|
1082 |
} |
|
1083 |
||
1084 |
File indexFile = getIndexFile(); |
|
1085 |
if (indexFile == null) { |
|
1086 |
return false; |
|
1087 |
} |
|
1088 |
||
1089 |
RandomAccessFile raf = null; |
|
1090 |
long writtenSoFar = 0; |
|
1091 |
try { |
|
1092 |
raf = new RandomAccessFile(indexFile, "rw"); |
|
1093 |
||
1094 |
raf.writeLong(zipFileLastModified); |
|
1095 |
writtenSoFar += 8; |
|
1096 |
||
1097 |
List<DirectoryEntry> directoriesToWrite = new ArrayList<DirectoryEntry>(); |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1098 |
Map<RelativeDirectory, Long> offsets = new HashMap<RelativeDirectory, Long>(); |
10 | 1099 |
raf.writeInt(directories.keySet().size()); |
1100 |
writtenSoFar += 4; |
|
1101 |
||
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1102 |
for (RelativeDirectory dirName: directories.keySet()) { |
10 | 1103 |
DirectoryEntry dirEntry = directories.get(dirName); |
1104 |
||
1105 |
directoriesToWrite.add(dirEntry); |
|
1106 |
||
1107 |
// Write the dir name bytes |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1108 |
byte [] dirNameBytes = dirName.getPath().getBytes("UTF-8"); |
10 | 1109 |
int dirNameBytesLen = dirNameBytes.length; |
1110 |
raf.writeInt(dirNameBytesLen); |
|
1111 |
writtenSoFar += 4; |
|
1112 |
||
1113 |
raf.write(dirNameBytes); |
|
1114 |
writtenSoFar += dirNameBytesLen; |
|
1115 |
||
1116 |
// Write the number of files in the dir |
|
1789
7ac8c0815000
6765045: Remove rawtypes warnings from langtools
mcimadamore
parents:
1205
diff
changeset
|
1117 |
List<Entry> dirEntries = dirEntry.getEntriesAsCollection(); |
10 | 1118 |
raf.writeInt(dirEntries.size()); |
1119 |
writtenSoFar += 4; |
|
1120 |
||
1121 |
offsets.put(dirName, new Long(writtenSoFar)); |
|
1122 |
||
1123 |
// Write the offset of the file's data in the dir |
|
1124 |
dirEntry.writtenOffsetOffset = 0L; |
|
1125 |
raf.writeLong(0L); |
|
1126 |
writtenSoFar += 8; |
|
1127 |
} |
|
1128 |
||
1129 |
for (DirectoryEntry de : directoriesToWrite) { |
|
1130 |
// Fix up the offset in the directory table |
|
1131 |
long currFP = raf.getFilePointer(); |
|
1132 |
||
1133 |
long offsetOffset = offsets.get(de.dirName).longValue(); |
|
1134 |
raf.seek(offsetOffset); |
|
1135 |
raf.writeLong(writtenSoFar); |
|
1136 |
||
1137 |
raf.seek(currFP); |
|
1138 |
||
1139 |
// Now write each of the files in the DirectoryEntry |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1140 |
List<Entry> entries = de.getEntriesAsCollection(); |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1141 |
for (Entry zfie : entries) { |
10 | 1142 |
// Write the name bytes |
1143 |
byte [] zfieNameBytes = zfie.name.getBytes("UTF-8"); |
|
1144 |
int zfieNameBytesLen = zfieNameBytes.length; |
|
1145 |
raf.writeInt(zfieNameBytesLen); |
|
1146 |
writtenSoFar += 4; |
|
1147 |
raf.write(zfieNameBytes); |
|
1148 |
writtenSoFar += zfieNameBytesLen; |
|
1149 |
||
1150 |
// Write isDir |
|
1151 |
raf.writeByte(zfie.isDir ? (byte)1 : (byte)0); |
|
1152 |
writtenSoFar += 1; |
|
1153 |
||
1154 |
// Write offset of bytes in the real Jar/Zip file |
|
1155 |
raf.writeInt(zfie.offset); |
|
1156 |
writtenSoFar += 4; |
|
1157 |
||
1158 |
// Write size of the file in the real Jar/Zip file |
|
1159 |
raf.writeInt(zfie.size); |
|
1160 |
writtenSoFar += 4; |
|
1161 |
||
1162 |
// Write compressed size of the file in the real Jar/Zip file |
|
1163 |
raf.writeInt(zfie.compressedSize); |
|
1164 |
writtenSoFar += 4; |
|
1165 |
||
1166 |
// Write java time stamp of the file in the real Jar/Zip file |
|
1167 |
raf.writeLong(zfie.getLastModified()); |
|
1168 |
writtenSoFar += 8; |
|
1169 |
} |
|
1170 |
} |
|
1171 |
} catch (Throwable t) { |
|
1172 |
// Do nothing |
|
1173 |
} finally { |
|
1174 |
try { |
|
1175 |
if (raf != null) { |
|
1176 |
raf.close(); |
|
1177 |
} |
|
1178 |
} catch(IOException ioe) { |
|
1179 |
// Do nothing |
|
1180 |
} |
|
1181 |
} |
|
1182 |
||
1183 |
return ret; |
|
1184 |
} |
|
1185 |
||
1186 |
public boolean writeZipIndex() { |
|
1187 |
lock.lock(); |
|
1188 |
try { |
|
1189 |
return writeIndex(); |
|
1190 |
} |
|
1191 |
finally { |
|
1192 |
lock.unlock(); |
|
1193 |
} |
|
1194 |
} |
|
1195 |
||
1196 |
private File getIndexFile() { |
|
1197 |
if (zipIndexFile == null) { |
|
1198 |
if (zipFile == null) { |
|
1199 |
return null; |
|
1200 |
} |
|
1201 |
||
1202 |
zipIndexFile = new File((preindexedCacheLocation == null ? "" : preindexedCacheLocation) + |
|
1203 |
zipFile.getName() + ".index"); |
|
1204 |
} |
|
1205 |
||
1206 |
return zipIndexFile; |
|
1207 |
} |
|
1208 |
||
1209 |
public File getZipFile() { |
|
1210 |
return zipFile; |
|
1211 |
} |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1212 |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1213 |
private RelativeDirectory getRelativeDirectory(String path) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1214 |
RelativeDirectory rd; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1215 |
SoftReference<RelativeDirectory> ref = relativeDirectoryCache.get(path); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1216 |
if (ref != null) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1217 |
rd = ref.get(); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1218 |
if (rd != null) |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1219 |
return rd; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1220 |
} |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1221 |
rd = new RelativeDirectory(path); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1222 |
relativeDirectoryCache.put(path, new SoftReference<RelativeDirectory>(rd)); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1223 |
return rd; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1224 |
} |
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1225 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1226 |
static class Entry implements Comparable<Entry> { |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1227 |
public static final Entry[] EMPTY_ARRAY = {}; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1228 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1229 |
// Directory related |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1230 |
RelativeDirectory dir; |
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1231 |
boolean isDir; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1232 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1233 |
// File related |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1234 |
String name; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1235 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1236 |
int offset; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1237 |
int size; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1238 |
int compressedSize; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1239 |
long javatime; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1240 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1241 |
private int nativetime; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1242 |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1243 |
public Entry(RelativePath path) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1244 |
this(path.dirname(), path.basename()); |
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1245 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1246 |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1247 |
public Entry(RelativeDirectory directory, String name) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1248 |
this.dir = directory; |
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1249 |
this.name = name; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1250 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1251 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1252 |
public String getName() { |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1253 |
return new RelativeFile(dir, name).getPath(); |
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1254 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1255 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1256 |
public String getFileName() { |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1257 |
return name; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1258 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1259 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1260 |
public long getLastModified() { |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1261 |
if (javatime == 0) { |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1262 |
javatime = dosToJavaTime(nativetime); |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1263 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1264 |
return javatime; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1265 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1266 |
|
865
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1267 |
// based on dosToJavaTime in java.util.Zip, but avoiding the |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1268 |
// use of deprecated Date constructor |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1269 |
private static long dosToJavaTime(int dtime) { |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1270 |
Calendar c = Calendar.getInstance(); |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1271 |
c.set(Calendar.YEAR, ((dtime >> 25) & 0x7f) + 1980); |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1272 |
c.set(Calendar.MONTH, ((dtime >> 21) & 0x0f) - 1); |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1273 |
c.set(Calendar.DATE, ((dtime >> 16) & 0x1f)); |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1274 |
c.set(Calendar.HOUR_OF_DAY, ((dtime >> 11) & 0x1f)); |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1275 |
c.set(Calendar.MINUTE, ((dtime >> 5) & 0x3f)); |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1276 |
c.set(Calendar.SECOND, ((dtime << 1) & 0x3e)); |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1277 |
c.set(Calendar.MILLISECOND, 0); |
21668f049d28
6725036: javac returns incorrect value for lastModifiedTime() when source is a zip file archive
jjg
parents:
810
diff
changeset
|
1278 |
return c.getTimeInMillis(); |
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1279 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1280 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1281 |
void setNativeTime(int natTime) { |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1282 |
nativetime = natTime; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1283 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1284 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1285 |
public boolean isDirectory() { |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1286 |
return isDir; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1287 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1288 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1289 |
public int compareTo(Entry other) { |
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1290 |
RelativeDirectory otherD = other.dir; |
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1291 |
if (dir != otherD) { |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1292 |
int c = dir.compareTo(otherD); |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1293 |
if (c != 0) |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1294 |
return c; |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1295 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1296 |
return name.compareTo(other.name); |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1297 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1298 |
|
1205
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1299 |
@Override |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1300 |
public boolean equals(Object o) { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1301 |
if (!(o instanceof Entry)) |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1302 |
return false; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1303 |
Entry other = (Entry) o; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1304 |
return dir.equals(other.dir) && name.equals(other.name); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1305 |
} |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1306 |
|
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1307 |
@Override |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1308 |
public int hashCode() { |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1309 |
int hash = 7; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1310 |
hash = 97 * hash + (this.dir != null ? this.dir.hashCode() : 0); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1311 |
hash = 97 * hash + (this.name != null ? this.name.hashCode() : 0); |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1312 |
return hash; |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1313 |
} |
b316e32eb90c
6508981: cleanup file separator handling in JavacFileManager
jjg
parents:
865
diff
changeset
|
1314 |
|
810
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1315 |
|
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1316 |
public String toString() { |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1317 |
return isDir ? ("Dir:" + dir + " : " + name) : |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1318 |
(dir + ":" + name); |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1319 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1320 |
} |
e4b6a6d206e6
6714365: refactor JavacFileManager to move nested classes to top level
jjg
parents:
731
diff
changeset
|
1321 |
|
10 | 1322 |
} |