raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

chore: Remove ExecutorServiceFactoryProvider from ThreadPoolConfig (#2175)

Browse source
This commit is contained in:
He-Pin(kerr) 2025-09-07 20:10:16 +08:00 • committed by GitHub
parent 8d9450b19e
commit 7b96bb8385
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 57 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

4
actor/src/main/mima-filters/2.0.x.backwards.excludes/remove-deprecated-methods.excludes
View file

@ -145,3 +145,7 @@ ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.japi.pf.Un
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.japi.pf.UnitPFBuilder.matchEquals")
ProblemFilters.exclude[IncompatibleMethTypeProblem]("org.apache.pekko.japi.pf.UnitPFBuilder.matchAny")
ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.japi.JAPI")
ProblemFilters.exclude[MissingTypesProblem]("org.apache.pekko.dispatch.ThreadPoolConfig")
ProblemFilters.exclude[DirectMissingMethodProblem]("org.apache.pekko.dispatch.ThreadPoolConfig.createExecutorServiceFactory")
ProblemFilters.exclude[MissingClassProblem]("org.apache.pekko.dispatch.ThreadPoolConfig$ThreadPoolExecutorServiceFactory")

50
actor/src/main/scala/org/apache/pekko/dispatch/AbstractDispatcher.scala
View file

@ -23,7 +23,7 @@ import scala.util.control.NonFatal
import org.apache.pekko
import pekko.actor._
import pekko.annotation.InternalStableApi
import pekko.annotation.{ InternalApi, InternalStableApi }
import pekko.dispatch.affinity.AffinityPoolConfigurator
import pekko.dispatch.sysmsg._
import pekko.event.EventStream
@ -464,10 +464,49 @@ final class VirtualThreadExecutorConfigurator(config: Config, prerequisites: Dis
}
}
class ThreadPoolExecutorConfigurator(config: Config, prerequisites: DispatcherPrerequisites)
extends ExecutorServiceConfigurator(config, prerequisites) {
/**
* INTERNAL API
*/
@InternalApi
trait ThreadPoolExecutorServiceFactoryProvider extends ExecutorServiceFactoryProvider {
def threadPoolConfig: ThreadPoolConfig
def createExecutorServiceFactory(id: String, threadFactory: ThreadFactory): ExecutorServiceFactory = {
class ThreadPoolExecutorServiceFactory(threadFactory: ThreadFactory) extends ExecutorServiceFactory {
def createExecutorService: ExecutorService = {
val config = threadPoolConfig
val service: ThreadPoolExecutor = new ThreadPoolExecutor(
config.corePoolSize,
config.maxPoolSize,
config.threadTimeout.length,
config.threadTimeout.unit,
config.queueFactory(),
threadFactory,
config.rejectionPolicy) with LoadMetrics {
def atFullThrottle(): Boolean = this.getActiveCount >= this.getPoolSize
}
service.allowCoreThreadTimeOut(config.allowCorePoolTimeout)
service
}
}
val threadPoolConfig: ThreadPoolConfig = createThreadPoolConfigBuilder(config, prerequisites).config
def createExecutorServiceFactory(id: String, threadFactory: ThreadFactory): ExecutorServiceFactory = {
val tf = threadFactory match {
case m: MonitorableThreadFactory =>
// add the dispatcher id to the thread names
m.withName(m.name + "-" + id)
case other => other
}
new ThreadPoolExecutorServiceFactory(tf)
}
createExecutorServiceFactory(id, threadFactory)
}
}
class ThreadPoolExecutorConfigurator(config: Config, prerequisites: DispatcherPrerequisites)
extends ExecutorServiceConfigurator(config, prerequisites)
with ThreadPoolExecutorServiceFactoryProvider {
override val threadPoolConfig: ThreadPoolConfig = createThreadPoolConfigBuilder(config, prerequisites).config
protected def createThreadPoolConfigBuilder(
config: Config,
@ -505,9 +544,6 @@ class ThreadPoolExecutorConfigurator(config: Config, prerequisites: DispatcherPr
else
builder.setFixedPoolSize(config.getInt("fixed-pool-size"))
}
def createExecutorServiceFactory(id: String, threadFactory: ThreadFactory): ExecutorServiceFactory =
threadPoolConfig.createExecutorServiceFactory(id, threadFactory)
}
class DefaultExecutorServiceConfigurator(

4
actor/src/main/scala/org/apache/pekko/dispatch/PinnedDispatcher.scala
View file

@ -36,7 +36,9 @@ class PinnedDispatcher(
_id,
Int.MaxValue,
Duration.Zero,
_threadPoolConfig.copy(corePoolSize = 1, maxPoolSize = 1),
new ThreadPoolExecutorServiceFactoryProvider() {
override def threadPoolConfig: ThreadPoolConfig = _threadPoolConfig.copy(corePoolSize = 1, maxPoolSize = 1)
},
_shutdownTimeout) {
@volatile

37
actor/src/main/scala/org/apache/pekko/dispatch/ThreadPoolBuilder.scala
View file

@ -13,6 +13,8 @@
package org.apache.pekko.dispatch
import org.apache.pekko.annotation.InternalApi
import java.util.Collection
import java.util.concurrent.{
ArrayBlockingQueue,
@ -30,7 +32,6 @@ import java.util.concurrent.{
TimeUnit
}
import java.util.concurrent.atomic.{ AtomicLong, AtomicReference }
import scala.concurrent.{ BlockContext, CanAwait }
import scala.concurrent.duration.Duration
@ -76,16 +77,18 @@ trait ExecutorServiceFactoryProvider {
}
/**
* A small configuration DSL to create ThreadPoolExecutors that can be provided as an ExecutorServiceFactoryProvider to Dispatcher
* INTERNAL API
*
* Configuration object for ThreadPoolExecutor
*/
@InternalApi
final case class ThreadPoolConfig(
allowCorePoolTimeout: Boolean = ThreadPoolConfig.defaultAllowCoreThreadTimeout,
corePoolSize: Int = ThreadPoolConfig.defaultCorePoolSize,
maxPoolSize: Int = ThreadPoolConfig.defaultMaxPoolSize,
threadTimeout: Duration = ThreadPoolConfig.defaultTimeout,
queueFactory: ThreadPoolConfig.QueueFactory = ThreadPoolConfig.linkedBlockingQueue(),
rejectionPolicy: RejectedExecutionHandler = ThreadPoolConfig.defaultRejectionPolicy)
extends ExecutorServiceFactoryProvider {
rejectionPolicy: RejectedExecutionHandler = ThreadPoolConfig.defaultRejectionPolicy) {
// Written explicitly to permit non-inlined defn; this is necessary for downstream instrumentation that stores extra
// context information on the config
@noinline
@ -98,32 +101,6 @@ final case class ThreadPoolConfig(
rejectionPolicy: RejectedExecutionHandler = rejectionPolicy
): ThreadPoolConfig =
ThreadPoolConfig(allowCorePoolTimeout, corePoolSize, maxPoolSize, threadTimeout, queueFactory, rejectionPolicy)
class ThreadPoolExecutorServiceFactory(val threadFactory: ThreadFactory) extends ExecutorServiceFactory {
def createExecutorService: ExecutorService = {
val service: ThreadPoolExecutor = new ThreadPoolExecutor(
corePoolSize,
maxPoolSize,
threadTimeout.length,
threadTimeout.unit,
queueFactory(),
threadFactory,
rejectionPolicy) with LoadMetrics {
def atFullThrottle(): Boolean = this.getActiveCount >= this.getPoolSize
}
service.allowCoreThreadTimeOut(allowCorePoolTimeout)
service
}
}
def createExecutorServiceFactory(id: String, threadFactory: ThreadFactory): ExecutorServiceFactory = {
val tf = threadFactory match {
case m: MonitorableThreadFactory =>
// add the dispatcher id to the thread names
m.withName(m.name + "-" + id)
case other => other
}
new ThreadPoolExecutorServiceFactory(tf)
}
}
/**