Skip to content

Made P.NCs cache use regular HashMap to improve performance #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Maya-Fey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Made P.NCs cache use regular HashMap to improve performance #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions src/is/L42/flyweight/P.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
import static is.L42.tools.General.bug;

import java.io.ObjectStreamException;
import java.lang.ref.WeakReference;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import com.google.common.cache.CacheBuilder;

import is.L42.common.Constants;
import is.L42.common.Parse;
import is.L42.flyweight.P.NCs;
import is.L42.generated.Core;
import is.L42.generated.Full;
import is.L42.generated.Mdf;
Expand Down Expand Up @@ -76,7 +77,14 @@ public boolean hasUniqueNum() {
return false;
}
private static record NCsI(int n, List<C> cs) {}
private static final Map<NCsI, NCs> created = CacheBuilder.newBuilder().weakValues().<NCsI, NCs>build().asMap();
//So... why not just use a cache?
//Yes this would avoid the ternary on of()
//However, something about caches of NCsI->NCs has an
//inefficient computeIfAbsent method. I don't
//know why this doesn't apply to X.of(), but
//implementing it this way is over 2x as fast
//according to profiling
private static final Map<NCsI, WeakReference<NCs>> created = new HashMap<>();
private static void perfCountNCsOf(NCsI ci) {
PerfCounters.inc("invoke.P.NCs.init.total");
if(!created.containsKey(ci)) {
Expand All @@ -86,15 +94,15 @@ private static void perfCountNCsOf(NCsI ci) {
public static NCs of(int n, List<C> cs) {
NCsI ci = new NCsI(n, cs);
if(PerfCounters.isEnabled()) { perfCountNCsOf(ci); }
return created.computeIfAbsent(ci, ci2->new NCs(ci2.n, ci2.cs));
return created.compute(ci, (ci2, ref)->(ref == null || ref.get() == null) ? new WeakReference<>(new NCs(ci2.n, ci2.cs)) : ref).get();
}
Object readResolve() throws ObjectStreamException {
return of(this.n, this.cs);
}
private NCs(final int n, final List<C> cs) {
this.n = n;
//This is necessary for some reason. Serialization exceptions?
this.cs = List.copyOf(cs);
this.cs = cs;
}
public int n() { return this.n; }
public List<C> cs() { return this.cs; }
Expand Down