Merge pull request #142 from velocitycareerlabs/VL-8447-v2.6.7-refactor-thread-executor

v2.6.7 refactor thread executor

Author: michaelavoyan

VCL/build.gradle

@@ -12,8 +12,8 @@ android {
     defaultConfig {
         minSdk 24
         targetSdk 34
-        versionName "2.6.6"
-        versionCode 150
+        versionName "2.6.7"
+        versionCode 151
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
     }

VCL/src/main/java/io/velocitycareerlabs/impl/data/infrastructure/executors/ExecutorImpl.kt

@@ -10,14 +10,22 @@ package io.velocitycareerlabs.impl.data.infrastructure.executors
 import android.os.Handler
 import android.os.Looper
 import io.velocitycareerlabs.impl.domain.infrastructure.executors.Executor
+import io.velocitycareerlabs.impl.utils.VCLLog
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 
-internal class ExecutorImpl: Executor {
+internal class ExecutorImpl : Executor {
+
+    private val TAG = ExecutorImpl::class.simpleName
 
     private val mainThread: Handler = Handler(Looper.getMainLooper())
-    private val backgroundThreadPool: ExecutorService = Executors.newFixedThreadPool(10)
+
+    private var numberOfCores = Runtime.getRuntime().availableProcessors()
+    private var optimalThreadCount = minOf(numberOfCores * 2, 8) // Limit max to 8 threads
+
+    private val executorService: ExecutorService =
+        Executors.newFixedThreadPool(optimalThreadCount, Executors.defaultThreadFactory())
 
     override fun runOnMain(block: () -> Unit) {
         mainThread.post {
@@ -26,13 +34,24 @@ internal class ExecutorImpl: Executor {
     }
 
     override fun runOnBackground(block: () -> Unit) {
-        backgroundThreadPool.submit {
-            block()
+        executorService.submit {
+            try {
+                block()
+            } catch (e: Exception) {
+                VCLLog.e(TAG, "", e)
+            }
         }
     }
 
     override fun shutdown() {
-        backgroundThreadPool.shutdown()
-        backgroundThreadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.SECONDS)
+        executorService.shutdown()
+        try {
+            if (!executorService.awaitTermination(60 * 3, TimeUnit.SECONDS)) {
+                executorService.shutdownNow() // Force shutdown if not completed within 3 minutes
+            }
+        } catch (e: InterruptedException) {
+            executorService.shutdownNow() // Force shutdown on interruption
+            Thread.currentThread().interrupt()
+        }
     }
-}
+}