feat: optimize log system and time statistics system

idisfkj · Dec 27, 2021 · 785ac5d · 785ac5d
1 parent 0c4ce07
commit 785ac5d
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 23 deletions.
diff --git a/android-startup/src/main/java/com/rousetime/android_startup/StartupManager.kt b/android-startup/src/main/java/com/rousetime/android_startup/StartupManager.kt
@@ -53,7 +53,7 @@ class StartupManager private constructor(
         mAwaitCountDownLatch = CountDownLatch(needAwaitCount.get())
 
         if (startupList.isNullOrEmpty()) {
-            StartupLogUtils.e("startupList is empty in the current process.")
+            StartupLogUtils.e { "startupList is empty in the current process." }
             return@apply
         }
 

diff --git a/...tartup/src/main/java/com/rousetime/android_startup/dispatcher/StartupManagerDispatcher.kt b/...tartup/src/main/java/com/rousetime/android_startup/dispatcher/StartupManagerDispatcher.kt
@@ -33,12 +33,12 @@ internal class StartupManagerDispatcher(
     }
 
     override fun dispatch(startup: Startup<*>, sortStore: StartupSortStore) {
-        StartupLogUtils.d("${startup::class.java.simpleName} being dispatching, onMainThread ${startup.callCreateOnMainThread()}.")
+        StartupLogUtils.d { "${startup::class.java.simpleName} being dispatching, onMainThread ${startup.callCreateOnMainThread()}." }
 
         if (StartupCacheManager.instance.hadInitialized(startup::class.java)) {
             val result = StartupCacheManager.instance.obtainInitializedResult<Any>(startup::class.java)
 
-            StartupLogUtils.d("${startup::class.java.simpleName} was completed, result from cache.")
+            StartupLogUtils.d { "${startup::class.java.simpleName} was completed, result from cache." }
 
             notifyChildren(startup, result, sortStore)
         } else {

diff --git a/android-startup/src/main/java/com/rousetime/android_startup/run/StartupRunnable.kt b/android-startup/src/main/java/com/rousetime/android_startup/run/StartupRunnable.kt
@@ -26,17 +26,17 @@ internal class StartupRunnable(
     override fun run() {
         Process.setThreadPriority(startup::class.java.getAnnotation(ThreadPriority::class.java)?.priority ?: Process.THREAD_PRIORITY_DEFAULT)
         startup.toWait()
-        StartupLogUtils.d("${startup::class.java.simpleName} being create.")
+        StartupLogUtils.d { "${startup::class.java.simpleName} being create." }
 
         TraceCompat.beginSection(startup::class.java.simpleName)
-        StartupCostTimesUtils.recordStart(startup::class.java, startup.callCreateOnMainThread(), startup.waitOnMainThread())
+        StartupCostTimesUtils.recordStart { Triple(startup::class.java, startup.callCreateOnMainThread(), startup.waitOnMainThread()) }
         val result = startup.create(context)
-        StartupCostTimesUtils.recordEnd(startup::class.java)
+        StartupCostTimesUtils.recordEnd { startup::class.java }
         TraceCompat.endSection()
 
         // To save result of initialized component.
         StartupCacheManager.instance.saveInitializedComponent(startup::class.java, ResultModel(result))
-        StartupLogUtils.d("${startup::class.java.simpleName} was completed.")
+        StartupLogUtils.d { "${startup::class.java.simpleName} was completed." }
 
         dispatcher.notifyChildren(startup, result, sortStore)
     }

diff --git a/android-startup/src/main/java/com/rousetime/android_startup/sort/TopologySort.kt b/android-startup/src/main/java/com/rousetime/android_startup/sort/TopologySort.kt
@@ -125,6 +125,6 @@ internal object TopologySort {
                 append("|================================================================")
             }
         }
-        StartupLogUtils.d(printBuilder)
+        StartupLogUtils.d { printBuilder }
     }
 }
diff --git a/android-startup/src/main/java/com/rousetime/android_startup/utils/StartupCostTimesUtils.kt b/android-startup/src/main/java/com/rousetime/android_startup/utils/StartupCostTimesUtils.kt
@@ -22,20 +22,22 @@ internal object StartupCostTimesUtils {
     val mainThreadTimes
         get() = (endTime ?: System.nanoTime()) - startTime
 
-    fun recordStart(startup: Class<out Startup<*>>, callOnMainThread: Boolean, waitOnMainThread: Boolean) {
+    fun recordStart(block: () -> Triple<Class<out Startup<*>>, Boolean, Boolean>) {
         if (checkOpenStatistics()) {
-            costTimesMap[startup.getUniqueKey()] = CostTimesModel(
-                startup.simpleName,
-                callOnMainThread,
-                waitOnMainThread,
-                System.nanoTime() / ACCURACY
-            )
+            block().run {
+                costTimesMap[first.getUniqueKey()] = CostTimesModel(
+                    first.simpleName,
+                    second,
+                    third,
+                    System.nanoTime() / ACCURACY
+                )
+            }
         }
     }
 
-    fun recordEnd(startup: Class<out Startup<*>>) {
+    fun recordEnd(block: () -> Class<out Startup<*>>) {
         if (checkOpenStatistics()) {
-            costTimesMap[startup.getUniqueKey()]?.let {
+            costTimesMap[block().getUniqueKey()]?.let {
                 it.endTime = System.nanoTime() / ACCURACY
             }
         }
@@ -49,7 +51,7 @@ internal object StartupCostTimesUtils {
     }
 
     fun printAll() {
-        StartupLogUtils.d(buildString {
+        StartupLogUtils.d { buildString {
             append("startup cost times detail:")
             append("\n")
             append("|=================================================================")
@@ -75,7 +77,7 @@ internal object StartupCostTimesUtils {
             append("| Total Main Thread Times |   ${mainThreadTimes / ACCURACY} ms")
             append("\n")
             append("|=================================================================")
-        })
+        } }
     }
 
     private fun checkOpenStatistics() = StartupCacheManager.instance.initializedConfig?.openStatistic == true

diff --git a/android-startup/src/main/java/com/rousetime/android_startup/utils/StartupLogUtils.kt b/android-startup/src/main/java/com/rousetime/android_startup/utils/StartupLogUtils.kt
@@ -13,12 +13,12 @@ internal object StartupLogUtils {
     private const val TAG = "StartupTrack"
     var level: LoggerLevel = LoggerLevel.NONE
 
-    fun e(message: String) {
-        if (level >= LoggerLevel.ERROR) print(Log.ERROR, TAG, message)
+    fun e(block: () -> String) {
+        if (level >= LoggerLevel.ERROR) print(Log.ERROR, TAG, block())
     }
 
-    fun d(message: String) {
-        if (level >= LoggerLevel.DEBUG) print(Log.DEBUG, TAG, message)
+    fun d(block: () -> String) {
+        if (level >= LoggerLevel.DEBUG) print(Log.DEBUG, TAG, block())
     }
 
     /**