MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

build scripts: compilation parts: fix ThreadPoolExecutor threads count when packing/fetching parts

Browse Source 
GitOrigin-RevId: 1aec38599dd420e62966911aa188d0c9abf52b48
This commit is contained in:
Vladislav Rassokhin
2019-07-23 17:44:15 +03:00
committed by intellij-monorepo-bot
parent c5a057d744
commit cb678fa56c
1 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/CompilationPartsUtil.groovy
+46 -21
View File
@@ -151,19 +151,26 @@ class CompilationPartsUtil {
}
messages.block("Building zip archives") {
runUnderStatisticsTimer(messages, 'compile-parts:pack:time') {
contexts.each { PackAndUploadContext ctx ->
executor.submit {
pack(messages, context.ant, ctx, incremental)
try {
runUnderStatisticsTimer(messages, 'compile-parts:pack:time') {
contexts.each { PackAndUploadContext ctx ->
def childMessages = messages.forkForParallelTask(ctx.name)
executor.submit {
withForkedMessages(childMessages) { BuildMessages msgs ->
pack(msgs, context.ant, ctx, incremental)
}
}
}
}
executor.waitForAllComplete(messages)
executor.waitForAllComplete(messages)
}
executor.reportErrors(messages)
}
finally {
messages.onAllForksFinished()
}
}
executor.reportErrors(messages)
// TODO: Remove hardcoded constant
String uploadPrefix = "intellij-compile/v1/$branch".toString()
@@ -487,20 +494,28 @@ class CompilationPartsUtil {
}
messages.block("Unpack compiled classes archives") {
long start = System.nanoTime()
toUnpack.each { ctx ->
executor.submit {
unpack(messages, ctx)
try {
long start = System.nanoTime()
toUnpack.each { ctx ->
def childMessages = messages.forkForParallelTask("Unpacking $ctx.name")
executor.submit {
withForkedMessages(childMessages) { BuildMessages msgs ->
unpack(msgs, ctx)
}
}
}
executor.waitForAllComplete(messages)
messages.reportStatisticValue('compile-parts:unpacked:bytes', toUnpack.collect { it.jar.size() }.sum(0l).toString())
messages.reportStatisticValue('compile-parts:unpacked:count', toUnpack.size().toString())
messages.reportStatisticValue('compile-parts:unpack:time',
TimeUnit.NANOSECONDS.toMillis((System.nanoTime() - start)).toString())
executor.reportErrors(messages)
}
finally {
messages.onAllForksFinished()
}
executor.waitForAllComplete(messages)
messages.reportStatisticValue('compile-parts:unpacked:bytes', toUnpack.collect { it.jar.size() }.sum(0l).toString())
messages.reportStatisticValue('compile-parts:unpacked:count', toUnpack.size().toString())
messages.reportStatisticValue('compile-parts:unpack:time',
TimeUnit.NANOSECONDS.toMillis((System.nanoTime() - start)).toString())
executor.reportErrors(messages)
}
executor.close()
@@ -610,7 +625,7 @@ class CompilationPartsUtil {
private final ConcurrentLinkedDeque<Throwable> errors = new ConcurrentLinkedDeque<Throwable>()
NamedThreadPoolExecutor(String threadNamePrefix, int maximumPoolSize) {
super(1, maximumPoolSize, 1, TimeUnit.MINUTES, new LinkedBlockingDeque(2048))
super(maximumPoolSize, maximumPoolSize, 1, TimeUnit.MINUTES, new LinkedBlockingDeque(2048))
setThreadFactory(new ThreadFactory() {
@NotNull
@Override
@@ -694,4 +709,14 @@ class CompilationPartsUtil {
messages.reportStatisticValue(name, time.toString())
}
}
private static <V> V withForkedMessages(BuildMessages messages, Closure<V> body) {
messages.onForkStarted()
try {
return body.call(messages)
}
finally {
messages.onForkFinished()
}
}
}