R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve speed of cache building

Browse Source
This commit is contained in:
embeddedt 2023-04-16 13:15:13 -04:00
parent 0f3c701d2a
commit f8c5c50ce4
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java
View File

@ -64,11 +64,11 @@ public abstract class ModFileResourcePackMixin {
.map(path -> root.relativize(path.toAbsolutePath())) .map(path -> root.relativize(path.toAbsolutePath()))
.filter(this::isValidCachedResourcePath) .filter(this::isValidCachedResourcePath)
.forEach(path -> { .forEach(path -> {
if(!path.toString().endsWith(".mcmeta")) { CachedResourcePath listing = new CachedResourcePath(path);
rootListingPaths.add(new CachedResourcePath(path)); if(!listing.getFileName().endsWith(".mcmeta")) {
rootListingPaths.add(listing);
} }
String mergedPath = slashJoiner.join(type.getDirectory(), namespace, path); this.containedPaths.add(new CachedResourcePath(new String[] { type.getDirectory(), namespace }, listing));
this.containedPaths.add(new CachedResourcePath(mergedPath));
}); });
rootListingPaths.trimToSize(); rootListingPaths.trimToSize();
rootListingForNamespaces.put(namespace, rootListingPaths); rootListingForNamespaces.put(namespace, rootListingPaths);

60
src/main/java/org/embeddedt/modernfix/util/CachedResourcePath.java
View File

@ -9,32 +9,58 @@ import com.google.common.collect.Streams;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
public class CachedResourcePath { public class CachedResourcePath {
private final ImmutableList<String> pathComponents; private final String[] pathComponents;
private int hashCode = 0; private int hashCode = 0;
private static final Interner<String> PATH_COMPONENT_INTERNER = Interners.newStrongInterner(); private static final Interner<String> PATH_COMPONENT_INTERNER = Interners.newStrongInterner();
private static final Splitter SLASH_SPLITTER = Splitter.on('/'); private static final Splitter SLASH_SPLITTER = Splitter.on('/');
private static final Joiner SLASH_JOINER = Joiner.on('/'); private static final Joiner SLASH_JOINER = Joiner.on('/');
private WeakReference<String> fullPathCache = new WeakReference<>(null); private WeakReference<String> fullPathCache = new WeakReference<>(null);
private static final String[] NO_PREFIX = new String[0];
public CachedResourcePath(Iterable<String> components) {
ImmutableList.Builder<String> b = ImmutableList.builder();
for(String s : components) {
if(s == null || s.length() == 0)
continue;
b.add(PATH_COMPONENT_INTERNER.intern(s));
}
pathComponents = b.build();
}
public CachedResourcePath(Path path) { public CachedResourcePath(Path path) {
this(() -> Streams.stream(path.iterator()).map(Path::toString).iterator()); this(NO_PREFIX, path, path.getNameCount());
} }
public CachedResourcePath(String s) { public CachedResourcePath(String s) {
this(SLASH_SPLITTER.split(s)); this(NO_PREFIX, SLASH_SPLITTER.splitToList(s));
}
public <T> CachedResourcePath(String[] prefixElements, Collection<T> collection) {
this(prefixElements, collection, collection.size());
}
public <T> CachedResourcePath(String[] prefixElements, Iterable<T> path, int count) {
String[] components = new String[prefixElements.length + count];
int i = 0;
while(i < prefixElements.length) {
components[i] = PATH_COMPONENT_INTERNER.intern(prefixElements[i]);
i++;
}
for(Object component : path) {
String s = component.toString();
if(s.length() == 0)
continue;
components[i] = PATH_COMPONENT_INTERNER.intern(s);
}
pathComponents = components;
}
public CachedResourcePath(String[] prefixElements, CachedResourcePath other) {
String[] components = new String[prefixElements.length + other.pathComponents.length];
int i = 0;
while(i < prefixElements.length) {
components[i] = PATH_COMPONENT_INTERNER.intern(prefixElements[i]);
i++;
}
System.arraycopy(other.pathComponents, 0, components, i, other.pathComponents.length);
pathComponents = components;
} }
@Override @Override
@ -42,7 +68,7 @@ public class CachedResourcePath {
int result = hashCode; int result = hashCode;
if(result != 0) if(result != 0)
return result; return result;
hashCode = pathComponents.hashCode(); hashCode = Arrays.hashCode(pathComponents);
return hashCode; return hashCode;
} }
@ -51,15 +77,15 @@ public class CachedResourcePath {
if (this == o) return true; if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false; if (o == null || getClass() != o.getClass()) return false;
CachedResourcePath that = (CachedResourcePath) o; CachedResourcePath that = (CachedResourcePath) o;
return pathComponents.equals(that.pathComponents); return Arrays.equals(pathComponents, that.pathComponents);
} }
public String getFileName() { public String getFileName() {
return pathComponents.get(pathComponents.size() - 1); return pathComponents[pathComponents.length - 1];
} }
public int getNameCount() { public int getNameCount() {
return pathComponents.size(); return pathComponents.length;
} }
public String getFullPath() { public String getFullPath() {