mirrors
/
javassist
mirror of https://github.com/jboss-javassist/javassist.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 57 Wiki Activity
Browse Source

performance tuning 

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@540 30ef5769-5b8d-40dd-aea6-55b5d6557bb3
tags/rel_3_17_1_ga
chiba 14 years ago
parent
90a63c7637
commit
5a38e854c0
1 changed files with 83 additions and 14 deletions
Split View Show Diff Stats
  1. 83
    14
      src/main/javassist/bytecode/ConstPool.java

+ 83
- 14
src/main/javassist/bytecode/ConstPool.java View File

@@ -32,10 +32,28 @@ import javassist.CtClass;
*/
public final class ConstPool {
LongVector items;
int numOfItems;
int numOfItems;
HashMap classes;
HashMap strings;
int thisClassInfo;
ConstInfo[] constInfoCache;
int[] constInfoIndexCache;
int thisClassInfo;

private static final int CACHE_SIZE = 32;

/**
* A hash function for CACHE_SIZE
*/
private static int hashFunc(int a, int b) {
int h = -2128831035;
final int prime = 16777619;
h = (h ^ (a & 0xff)) * prime;
h = (h ^ (b & 0xff)) * prime;

// changing the hash key size from 32bit to 5bit
h = (h >> 5) ^ (h & 0x1f);
return h & 0x1f; // 0..31
}

/**
* <code>CONSTANT_Class</code>
@@ -110,6 +128,8 @@ public final class ConstPool {
addItem(null); // index 0 is reserved by the JVM.
classes = new HashMap();
strings = new HashMap();
constInfoCache = new ConstInfo[CACHE_SIZE];
constInfoIndexCache = new int[CACHE_SIZE];
thisClassInfo = addClassInfo(thisclass);
}

@@ -121,6 +141,8 @@ public final class ConstPool {
public ConstPool(DataInputStream in) throws IOException {
classes = new HashMap();
strings = new HashMap();
constInfoCache = new ConstInfo[CACHE_SIZE];
constInfoIndexCache = new int[CACHE_SIZE];
thisClassInfo = 0;
/* read() initializes items and numOfItems, and do addItem(null).
*/
@@ -130,6 +152,8 @@ public final class ConstPool {
void prune() {
classes = new HashMap();
strings = new HashMap();
constInfoCache = new ConstInfo[CACHE_SIZE];
constInfoIndexCache = new int[CACHE_SIZE];
}

/**
@@ -159,7 +183,7 @@ public final class ConstPool {
}

ConstInfo getItem(int n) {
return (ConstInfo)items.elementAt(n);
return items.elementAt(n);
}

/**
@@ -733,7 +757,17 @@ public final class ConstPool {
* @return the index of the added entry.
*/
public int addNameAndTypeInfo(int name, int type) {
return addItem(new NameAndTypeInfo(name, type));
int h = hashFunc(name, type);
ConstInfo ci = constInfoCache[h];
if (ci != null && ci instanceof NameAndTypeInfo && ci.hashCheck(name, type))
return constInfoIndexCache[h];
else {
NameAndTypeInfo item = new NameAndTypeInfo(name, type);
constInfoCache[h] = item;
int i = addItem(item);
constInfoIndexCache[h] = i;
return i;
}
}

/**
@@ -762,7 +796,17 @@ public final class ConstPool {
* @return the index of the added entry.
*/
public int addFieldrefInfo(int classInfo, int nameAndTypeInfo) {
return addItem(new FieldrefInfo(classInfo, nameAndTypeInfo));
int h = hashFunc(classInfo, nameAndTypeInfo);
ConstInfo ci = constInfoCache[h];
if (ci != null && ci instanceof FieldrefInfo && ci.hashCheck(classInfo, nameAndTypeInfo))
return constInfoIndexCache[h];
else {
FieldrefInfo item = new FieldrefInfo(classInfo, nameAndTypeInfo);
constInfoCache[h] = item;
int i = addItem(item);
constInfoIndexCache[h] = i;
return i;
}
}

/**
@@ -791,7 +835,17 @@ public final class ConstPool {
* @return the index of the added entry.
*/
public int addMethodrefInfo(int classInfo, int nameAndTypeInfo) {
return addItem(new MethodrefInfo(classInfo, nameAndTypeInfo));
int h = hashFunc(classInfo, nameAndTypeInfo);
ConstInfo ci = constInfoCache[h];
if (ci != null && ci instanceof MethodrefInfo && ci.hashCheck(classInfo, nameAndTypeInfo))
return constInfoIndexCache[h];
else {
MethodrefInfo item = new MethodrefInfo(classInfo, nameAndTypeInfo);
constInfoCache[h] = item;
int i = addItem(item);
constInfoIndexCache[h] = i;
return i;
}
}

/**
@@ -824,8 +878,17 @@ public final class ConstPool {
*/
public int addInterfaceMethodrefInfo(int classInfo,
int nameAndTypeInfo) {
return addItem(new InterfaceMethodrefInfo(classInfo,
nameAndTypeInfo));
int h = hashFunc(classInfo, nameAndTypeInfo);
ConstInfo ci = constInfoCache[h];
if (ci != null && ci instanceof InterfaceMethodrefInfo && ci.hashCheck(classInfo, nameAndTypeInfo))
return constInfoIndexCache[h];
else {
InterfaceMethodrefInfo item =new InterfaceMethodrefInfo(classInfo, nameAndTypeInfo);
constInfoCache[h] = item;
int i = addItem(item);
constInfoIndexCache[h] = i;
return i;
}
}

/**
@@ -918,7 +981,7 @@ public final class ConstPool {
LongVector v = items;
int size = numOfItems;
for (int i = 1; i < size; ++i) {
String className = ((ConstInfo) v.elementAt(i)).getClassName(this);
String className = v.elementAt(i).getClassName(this);
if (className != null)
result.add(className);
}
@@ -936,7 +999,7 @@ public final class ConstPool {
int size = numOfItems;
classes = new HashMap(classes.size() * 2);
for (int i = 1; i < size; ++i) {
ConstInfo ci = (ConstInfo)v.elementAt(i);
ConstInfo ci = v.elementAt(i);
ci.renameClass(this, oldName, newName);
ci.makeHashtable(this);
}
@@ -953,7 +1016,7 @@ public final class ConstPool {
int size = numOfItems;
classes = new HashMap(classes.size() * 2);
for (int i = 1; i < size; ++i) {
ConstInfo ci = (ConstInfo)v.elementAt(i);
ConstInfo ci = v.elementAt(i);
ci.renameClass(this, classnames);
ci.makeHashtable(this);
}
@@ -976,7 +1039,7 @@ public final class ConstPool {

int i = 1;
while (true) {
ConstInfo info = (ConstInfo)items.elementAt(i++);
ConstInfo info = items.elementAt(i++);
if (info == null)
break;
else
@@ -1039,7 +1102,7 @@ public final class ConstPool {
LongVector v = items;
int size = numOfItems;
for (int i = 1; i < size; ++i)
((ConstInfo)v.elementAt(i)).write(out);
v.elementAt(i).write(out);
}

/**
@@ -1057,7 +1120,7 @@ public final class ConstPool {
for (int i = 1; i < size; ++i) {
out.print(i);
out.print(" ");
((ConstInfo)items.elementAt(i)).print(out);
items.elementAt(i).print(out);
}
}
}
@@ -1076,6 +1139,8 @@ abstract class ConstInfo {

void makeHashtable(ConstPool cp) {} // called after read() finishes in ConstPool.

boolean hashCheck(int a, int b) { return false; }

public String toString() {
ByteArrayOutputStream bout = new ByteArrayOutputStream();
PrintWriter out = new PrintWriter(bout);
@@ -1188,6 +1253,8 @@ class NameAndTypeInfo extends ConstInfo {
typeDescriptor = in.readUnsignedShort();
}

boolean hashCheck(int a, int b) { return a == memberName && b == typeDescriptor; }

public int getTag() { return tag; }

public void renameClass(ConstPool cp, String oldName, String newName) {
@@ -1246,6 +1313,8 @@ abstract class MemberrefInfo extends ConstInfo {
return copy2(dest, classIndex2, ntIndex2);
}

boolean hashCheck(int a, int b) { return a == classIndex && b == nameAndTypeIndex; }

abstract protected int copy2(ConstPool dest, int cindex, int ntindex);

public void write(DataOutputStream out) throws IOException {

Write Preview
Loading…
Cancel
Save