Tenboro: Try this.
startupInitCache() does not have to be all that code but the part about "walkFile dw = new walkFile();" is like that. I only changed the walkFile.
private void startupInitCache() throws IOException {
long oldestLastModified = System.currentTimeMillis();
long recentlyAccessedCutoff = oldestLastModified - 604800000;
String oldestStaticRangeElement = null;
// if --verify-cache was specified, we use this shiny new FileValidator to avoid having to create a new MessageDigest and ByteBuffer for every single file in the cache
FileValidator validator = null;
int printFreq;
if(Settings.isVerifyCache()) {
Out.info("CacheHandler: Loading cache with full file verification. Depending on the size of your cache, this can take a long time.");
validator = new FileValidator();
printFreq = 1000;
}
else {
Out.info("CacheHandler: Loading cache...");
printFreq = 10000;
}
walkFile dw = new walkFile();
dw.recentlyAccessedCutoff = recentlyAccessedCutoff;
dw.validator = validator;
dw.oldestLastModified = oldestLastModified;
dw.printFreq = printFreq;
Files.walkFileTree(cachedir.toPath(), EnumSet.of(FileVisitOption.FOLLOW_LINKS), 3, dw);
oldestStaticRangeElement = (String) dw.oldestStaticRangeElement;
if(oldestStaticRangeElement != null) {
// unless something is really weird, if we have any aged static ranges at all, one of them will be the one with the oldest file
// if this is not the case, we just start the LRU scan from the first range
lruStaticRangePointer = agedStaticRanges.indexOf(oldestStaticRangeElement);
if(lruStaticRangePointer < 0) {
lruStaticRangePointer = 0;
Out.debug("CacheHandler: Static range with oldest element was not found or is not aged, LRU will scan starting from first range");
}
else {
Out.debug("CacheHandler: Static range with oldest element has been marked as " + oldestStaticRangeElement + " (index=" + lruStaticRangePointer + ")");
}
}
// if the cache gets near the limit, start pruning files up to a day newer than the oldest file found
lruLastModifiedPruneCutoff = oldestLastModified + 86400000;
lruCurrentPassOldest = System.currentTimeMillis();
Out.info("CacheHandler: Finished initializing the cache (" + cacheCount + " files, " + cacheSize + " bytes)");
updateStats();
}
private class walkFile extends SimpleFileVisitor<Path> {
long oldestLastModified = 0;
long fileLastModified = 0;
int printFreq = 0;
Path cfile = null;
private FileValidator validator;
private long recentlyAccessedCutoff;
private Object oldestStaticRangeElement;
private LinkedList<DirPath> dirs = new LinkedList<>();
class DirPath{
String name;
boolean empty = true;
}
@Override
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
DirPath dirPath = new DirPath();
dirPath.name = dir.getFileName().toString();
dirs.addLast(dirPath);
return FileVisitResult.CONTINUE;
}
public FileVisitResult visitFile(Path cfile, BasicFileAttributes attr) throws IOException {
HVFile hvFile = HVFile.getHVFileExistsFile(cfile, attr, validator);
if (hvFile == null) {
Out.debug("CacheHandler: The file " + cfile + " was corrupt.");
Files.delete(cfile);
} else if (!Settings.isStaticRange(hvFile.getFileid())) {
Out.debug("CacheHandler: The file " + cfile + " was not in an active static range.");
Files.delete(cfile);
} else {
addFileToActiveCache(hvFile);
fileLastModified = attr.lastModifiedTime().toMillis();
if (fileLastModified > recentlyAccessedCutoff) {
// if lastModified is from the last week, mark this
// as recently accessed in the LRU cache. (this does
// not update the metadata)
markRecentlyAccessed(hvFile, true);
}
// dir has files
for(DirPath dir : dirs){
dir.empty = false;
}
}
if (fileLastModified < oldestLastModified) {
// cache this as the static range directory with the
// currently oldest file. this is used whenever we need
// to free up some space, to avoid having to start over
// from the first range after every restart.
oldestLastModified = fileLastModified;
oldestStaticRangeElement = cfile.getFileName().toString().substring(0, 4);
String staticRange = dirs.get(dirs.size() - 2).name + dirs.getLast().name;
staticRangeOldest.put(staticRange, oldestLastModified);
}
if (cacheCount % printFreq == 0) {
Out.info("CacheHandler: Loaded " + cacheCount + " files so far...");
}
return FileVisitResult.CONTINUE;
}
@Override
public FileVisitResult postVisitDirectory(Path dir, IOException attr) throws IOException {
DirPath visited = dirs.removeLast();
if(visited.empty){
Files.delete(dir);
} else if (dirs.size() == 1){
if(++foundStaticRanges % 100 == 0) {
Out.info("CacheHandler: Found " + foundStaticRanges + " static ranges with files so far...");
}
}
return FileVisitResult.CONTINUE;
}
}
The getHVFileExistsFile() is the same as before. I pasted here to remind it.
public static HVFile getHVFileExistsFile(Path file, BasicFileAttributes attr, FileValidator validator) {
String fileid = file.getFileName().toString();
try {
HVFile hvFile = getHVFileFromFileid(fileid);
if(attr.size() != hvFile.getSize()) {
return null;
}
if(validator != null) {
if(!validator.validateFile(file, fileid.substring(0, 40))) {
return null;
}
}
return hvFile;
}
catch(java.io.IOException e) {
e.printStackTrace();
Out.warning("Warning: Encountered IO error computing the hash value of " + file);
}
return null;
}
I was told my english is bad. I tried to make it easier to read. Was I easier to read in this post?
Hentai@Home 1.3, We will build a wall, and Mexico is going to read it
Nov 19 2016, 11:36
