Skip to content

instrumentationClassManager cache performance fix #45

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
DonatoClun wants to merge 2 commits into
base: master
Choose a base branch
from
Open

instrumentationClassManager cache performance fix #45

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c67dbe
instrumentationClassManager cache performance fix
DonatoClun Dec 19, 2019
737de9d
Merge pull request #1 from DonatoClun/DClun-instrum-cache-patch
DonatoClun Dec 19, 2019
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
15 changes: 8 additions & 7 deletions src/main/java/za/ac/sun/cs/coastal/instrument/InstrumentationClassManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ public class InstrumentationClassManager {
private final AtomicLong postInstrumentedSize = new AtomicLong(0);

private final Map<String, byte[]> clearCache = new HashMap<>();
private static final byte[] LOAD_FILE_FAILED = new byte[0];

private final Map<String, byte[]> heavyCache = new HashMap<>();

Expand Down Expand Up @@ -161,7 +162,7 @@ public void endLoad(long time) {
public byte[] loadUninstrumented(String name) {
long t = System.currentTimeMillis();
byte[] unInstrumented = clearCache.get(name);
if (unInstrumented == null) {
if (unInstrumented == null || unInstrumented == LOAD_FILE_FAILED) {
unInstrumented = loadUninstrumented0(name);
} else {
cacheHitCount.incrementAndGet();
Expand All @@ -176,22 +177,22 @@ private synchronized byte[] loadUninstrumented0(String name) {
unInstrumented = loadFile(name.replace('.', '/').concat(".class"), false, false);
clearCache.put(name, unInstrumented);
}
return unInstrumented;
return unInstrumented != LOAD_FILE_FAILED ? unInstrumented : null;
}

/*
* private static class PrefixingClassReader extends ClassReader { private final
* String prefix;
*
*
* PrefixingClassReader(InputStream content, String prefix) throws IOException {
* super(content); this.prefix = prefix; }
*
*
* @Override public void accept(ClassVisitor cv, Attribute[] attrs, int flags) {
* cv = new ClassRemapper( cv, new Remapper() {
*
*
* @Override public String map(String typeName) { return prefix(typeName); } });
* super.accept(cv, attrs, flags); }
*
*
* Prefixes core library class names with prefix. private String prefix(String
* typeName) { if (shouldPrefix(typeName)) { return prefix + typeName; } return
* typeName; } }
Expand Down Expand Up @@ -403,7 +404,7 @@ private byte[] loadFile(String filename, boolean tryResource, boolean tryJar) {
}
}
}
return null;
return LOAD_FILE_FAILED;
}

private byte[] loadFromJar(String jarFilename, String filename) {
Expand Down