open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1246 from DataDog/mar-kolya/improve-hash-calclulation-cache-pool 

improve hash calculation cache pool
This commit is contained in:
Nikolay Martynov 2020-02-26 16:22:38 +01:00 committed by GitHub
parent 39e577ad97 96f74d0fef
commit 338f517db2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/DDCachingPoolStrategy.java
View File

@ -42,7 +42,7 @@ public class DDCachingPoolStrategy implements PoolStrategy {
static final int LOADER_CAPACITY = 64;
static final int TYPE_CAPACITY = 64;
static final int BOOTSTRAP_HASH = 0;
static final int BOOTSTRAP_HASH = 7236344; // Just a random number
/**
* Cache of recent ClassLoader WeakReferences; used to...
@ -89,7 +89,7 @@ public class DDCachingPoolStrategy implements PoolStrategy {
loaderRefCache.put(classLoader, loaderRef);
}
int loaderHash = classLoader.hashCode();
final int loaderHash = classLoader.hashCode();
return createCachingTypePool(loaderHash, loaderRef, classFileLocator);
}
@ -140,7 +140,7 @@ public class DDCachingPoolStrategy implements PoolStrategy {
this.loaderRef = loaderRef;
this.className = className;
hashCode = (int) (31 * this.loaderHash) ^ className.hashCode();
hashCode = 31 * this.loaderHash + className.hashCode();
}
@Override
@ -150,18 +150,23 @@ public class DDCachingPoolStrategy implements PoolStrategy {
@Override
public boolean equals(final Object obj) {
if (!(obj instanceof TypeCacheKey)) return false;
if (!(obj instanceof TypeCacheKey)) {
return false;
}
TypeCacheKey that = (TypeCacheKey) obj;
final TypeCacheKey that = (TypeCacheKey) obj;
if (loaderHash != that.loaderHash) return false;
if (loaderHash != that.loaderHash) {
return false;
}
if (className.equals(that.className)) {
// Fastpath loaderRef equivalence -- works because of WeakReference cache used
// Also covers the bootstrap null loaderRef case
if (loaderRef == that.loaderRef) {
// still need to check name
return className.equals(that.className);
} else if (className.equals(that.className)) {
return true;
}
// need to perform a deeper loader check -- requires calling Reference.get
// which can strengthen the Reference, so deliberately done last
@ -172,11 +177,15 @@ public class DDCachingPoolStrategy implements PoolStrategy {
// In this case, it is fine because that means the ClassLoader is no
// longer live, so the entries will never match anyway and will fall
// out of the cache.
ClassLoader thisLoader = loaderRef.get();
if (thisLoader == null) return false;
final ClassLoader thisLoader = loaderRef.get();
if (thisLoader == null) {
return false;
}
ClassLoader thatLoader = that.loaderRef.get();
if (thatLoader == null) return false;
final ClassLoader thatLoader = that.loaderRef.get();
if (thatLoader == null) {
return false;
}
return (thisLoader == thatLoader);
} else {
@ -205,9 +214,11 @@ public class DDCachingPoolStrategy implements PoolStrategy {
@Override
public TypePool.Resolution find(final String className) {
TypePool.Resolution existingResolution =
final TypePool.Resolution existingResolution =
sharedResolutionCache.getIfPresent(new TypeCacheKey(loaderHash, loaderRef, className));
if (existingResolution != null) return existingResolution;
if (existingResolution != null) {
return existingResolution;
}
if (OBJECT_NAME.equals(className)) {
return OBJECT_RESOLUTION;