keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Negatively cache failed class lookups, should help with @SideOnly performance issues.

Browse source
This commit is contained in:
Christian 2012-10-30 21:17:17 -04:00
parent 1bd53fe75f
commit 5197e98fb1
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fml/common/cpw/mods/fml/relauncher/RelaunchClassLoader.java
View file

@ -27,6 +27,7 @@ public class RelaunchClassLoader extends URLClassLoader
private List<IClassTransformer> transformers;
private Map<String, Class> cachedClasses;
private Set<String> invalidClasses;
private Set<String> classLoaderExceptions = new HashSet<String>();
private Set<String> transformerExceptions = new HashSet<String>();
@ -37,6 +38,7 @@ public class RelaunchClassLoader extends URLClassLoader
this.sources = new ArrayList<URL>(Arrays.asList(sources));
this.parent = getClass().getClassLoader();
this.cachedClasses = new HashMap<String,Class>(1000);
this.invalidClasses = new HashSet<String>(1000);
this.transformers = new ArrayList<IClassTransformer>(2);
// ReflectionHelper.setPrivateValue(ClassLoader.class, null, this, "scl");
Thread.currentThread().setContextClassLoader(this);
@ -69,6 +71,10 @@ public class RelaunchClassLoader extends URLClassLoader
@Override
public Class<?> findClass(String name) throws ClassNotFoundException
{
if (invalidClasses.contains(name))
{
throw new ClassNotFoundException(name);
}
// NEI/CCC compatibility code
if (excludedPackages.length != 0)
{
@ -98,9 +104,17 @@ public class RelaunchClassLoader extends URLClassLoader
{
if (name.startsWith(st))
{
Class<?> cl = super.findClass(name);
cachedClasses.put(name, cl);
return cl;
try
{
Class<?> cl = super.findClass(name);
cachedClasses.put(name, cl);
return cl;
}
catch (ClassNotFoundException e)
{
invalidClasses.add(name);
throw e;
}
}
}
@ -123,6 +137,7 @@ public class RelaunchClassLoader extends URLClassLoader
}
catch (Throwable e)
{
invalidClasses.add(name);
throw new ClassNotFoundException(name, e);
}
}