181: build fix: IdeaForkJoinWorkerThreadFactory.setupForkJoinCommonPool
now has parameter headless
This commit is contained in:
committed by
Nikolay Krasko
parent
8e20d540d5
commit
5f96b5c4d0
+77
@@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2016 JetBrains s.r.o.
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.idea
|
||||||
|
|
||||||
|
import com.intellij.concurrency.IdeaForkJoinWorkerThreadFactory
|
||||||
|
import com.intellij.testFramework.ThreadTracker
|
||||||
|
import java.lang.reflect.Modifier
|
||||||
|
import java.util.concurrent.ForkJoinPool
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
|
|
||||||
|
/*
|
||||||
|
Workaround for ThreadTracker.checkLeak() failures on TeamCity.
|
||||||
|
|
||||||
|
Currently TeamCity runs tests in classloader without boot.jar where IdeaForkJoinWorkerThreadFactory is defined. That
|
||||||
|
makes ForkJoinPool.commonPool() silently ignores java.util.concurrent.ForkJoinPool.common.threadFactory
|
||||||
|
(because of java.lang.ClassNotFoundException) option during factory initialization.
|
||||||
|
|
||||||
|
Standard names for ForkJoinPool threads doesn't pass ThreadTracker.checkLeak() check and that ruins tests constantly.
|
||||||
|
As it's allowed to reorder tests on TeamCity and any test can be first at some point, this patch should be applied at
|
||||||
|
some common place.
|
||||||
|
*/
|
||||||
|
object ThreadTrackerPatcherForTeamCityTesting {
|
||||||
|
private val patched = AtomicBoolean(false)
|
||||||
|
|
||||||
|
fun patchThreadTracker() {
|
||||||
|
if (patched.get()) return
|
||||||
|
|
||||||
|
patched.compareAndSet(false, true)
|
||||||
|
|
||||||
|
IdeaForkJoinWorkerThreadFactory.setupForkJoinCommonPool(true)
|
||||||
|
|
||||||
|
// Check setup was successful and patching isn't needed
|
||||||
|
val commonPoolFactoryName = ForkJoinPool.commonPool().factory::class.java.name
|
||||||
|
if (commonPoolFactoryName == IdeaForkJoinWorkerThreadFactory::class.java.name) {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
val wellKnownOffendersField = try {
|
||||||
|
ThreadTracker::class.java.getDeclaredField("wellKnownOffenders")
|
||||||
|
}
|
||||||
|
catch (communityPropertyNotFoundEx: NoSuchFieldException) {
|
||||||
|
ThreadTracker::class.java.declaredFields.single {
|
||||||
|
Modifier.isStatic(it.modifiers) && MutableSet::class.java.isAssignableFrom(it.type)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
wellKnownOffendersField.isAccessible = true
|
||||||
|
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
val wellKnownOffenders = wellKnownOffendersField.get(null) as MutableSet<String>
|
||||||
|
|
||||||
|
wellKnownOffenders.add("ForkJoinPool.commonPool-worker-")
|
||||||
|
println("Patching ThreadTracker was successful")
|
||||||
|
}
|
||||||
|
catch (e: NoSuchFieldException) {
|
||||||
|
println("Patching ThreadTracker failed: " + e)
|
||||||
|
}
|
||||||
|
catch (e: IllegalAccessException) {
|
||||||
|
println("Patching ThreadTracker failed: " + e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user