azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplifying cleanup in gradle plugin after introducing ZipHandle.clearFileAccessorCache method in the platform, minor refactoring

Browse Source
This commit is contained in:
Ilya Chernikov
2015-10-29 16:51:59 +01:00
parent 90bb8b2be9
commit 63e1fa4cc0
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/compiler.pro
+5
View File
@@ -78,6 +78,11 @@ messages/**)
public InputStream getInputStream();
}
# needed for jar cache cleanup in the gradle plugin and compile daemon
-keepclassmembers class com.intellij.openapi.vfs.impl.ZipHandler {
public static void clearFileAccessorCache();
}
-keep class jet.** {
public protected *;
}
libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/plugin/FinishBuildListener.kt
+6 -20
View File
@@ -125,32 +125,18 @@ class CompilerServicesCleanup(private var pluginClassLoader: ClassLoader?) {
val shortName = classFqName.substring(classFqName.lastIndexOf('.') + 1)
log.kotlinDebug("Looking for $shortName class")
val lowMemoryWatcherClass = Class.forName(classFqName, false, pluginClassLoader)
val cls = pluginClassLoader!!.loadClass(classFqName)
log.kotlinDebug("Looking for $methodName() method")
val shutdownMethod = lowMemoryWatcherClass.getMethod(methodName)
val method = cls.getMethod(methodName)
log.kotlinDebug("Call $shortName.$methodName()")
shutdownMethod.invoke(null)
method.invoke(null)
}
private fun cleanJarCache() {
val zipHandlerClass = pluginClassLoader!!.loadClass("com.intellij.openapi.vfs.impl.ZipHandler")
val privateCacheField = zipHandlerClass.getDeclaredField("ourZipFileFileAccessorCache")
privateCacheField.isAccessible = true
privateCacheField.get(null)?.let {
val innerCache = privateCacheField.type.getDeclaredField("myCache")
innerCache.isAccessible = true
innerCache.get(it)?.let {
val clearMethod = innerCache.type.getMethod("clear")
if (clearMethod != null) {
clearMethod.invoke(it)
log.kotlinDebug("successfuly cleared ZipHandler.ourZipFileFileAccessorCache.myCache")
}
else {
log.kotlinDebug("unable to access ZipHandler.ourZipFileFileAccessorCache.myCache.clear")
}
} ?: log.kotlinDebug("unable to access ZipHandler.ourZipFileFileAccessorCache.myCache (${innerCache.get(it)})")
} ?: log.kotlinDebug("unable to access ZipHandler.ourZipFileFileAccessorCache (${privateCacheField.get(null)})")
log.kotlinDebug("Clean JAR cache")
callVoidStaticMethod("com.intellij.openapi.vfs.impl.ZipHandler", "clearFileAccessorCache")
log.kotlinDebug("JAR cache cleared")
}
}