PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[2/n] Refactor StartupLatencyLogger 1. Use kt stirng's $substitutions for StartupLatencyLogger 2. Add "otherwise =" for @VisibleForTesting" into udc-dev

Browse Source
This commit is contained in:
Fengjiang Li
2023-05-04 13:39:08 +00:00
committed by Android (Google) Code Review
parent 2725473272 91503ecbd6
commit efb0c4e98c
1 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/logging/StartupLatencyLogger.kt
+16 -26
View File
@@ -21,11 +21,15 @@ open class StartupLatencyLogger(val latencyType: LatencyType) {
const val UNSET_LONG = -1L const val UNSET_LONG = -1L
} }
@VisibleForTesting val startTimeByEvent = SparseLongArray() @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
@VisibleForTesting val endTimeByEvent = SparseLongArray() val startTimeByEvent = SparseLongArray()
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
val endTimeByEvent = SparseLongArray()
@VisibleForTesting var cardinality: Int = UNSET_INT @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
@VisibleForTesting var workspaceLoadStartTime: Long = UNSET_LONG var cardinality: Int = UNSET_INT
@VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
var workspaceLoadStartTime: Long = UNSET_LONG
private var isInTest = false private var isInTest = false
@@ -116,7 +120,7 @@ open class StartupLatencyLogger(val latencyType: LatencyType) {
return true return true
} }
if (startTimeByEvent.contains(event.id)) { if (startTimeByEvent.contains(event.id)) {
Log.e(TAG, String.format("Cannot restart same %s event", event.name)) Log.e(TAG, "Cannot restart same ${event.name} event")
return false return false
} else if ( } else if (
startTimeByEvent.isEmpty() && startTimeByEvent.isEmpty() &&
@@ -124,10 +128,8 @@ open class StartupLatencyLogger(val latencyType: LatencyType) {
) { ) {
Log.e( Log.e(
TAG, TAG,
String.format( "The first log start event must be " +
"The first log start event must be %s.", "${LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_TOTAL_DURATION.name}.",
LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_TOTAL_DURATION.name
)
) )
return false return false
} else if ( } else if (
@@ -138,11 +140,7 @@ open class StartupLatencyLogger(val latencyType: LatencyType) {
) { ) {
Log.e( Log.e(
TAG, TAG,
String.format( "Cannot start ${LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_SYNC.name} event after ${LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_ASYNC.name} starts",
"Cannot start %s event after %s starts",
LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_SYNC.name,
LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_ASYNC.name
)
) )
return false return false
} else if ( } else if (
@@ -153,11 +151,7 @@ open class StartupLatencyLogger(val latencyType: LatencyType) {
) { ) {
Log.e( Log.e(
TAG, TAG,
String.format( "Cannot start ${LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_ASYNC.name} event after ${LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_SYNC.name} starts",
"Cannot start %s event after %s starts",
LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_ASYNC.name,
LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_WORKSPACE_LOADER_SYNC.name
)
) )
return false return false
} }
@@ -172,10 +166,10 @@ open class StartupLatencyLogger(val latencyType: LatencyType) {
return true return true
} }
if (!startTimeByEvent.contains(event.id)) { if (!startTimeByEvent.contains(event.id)) {
Log.e(TAG, String.format("Cannot end %s event before starting it", event.name)) Log.e(TAG, "Cannot end ${event.name} event before starting it")
return false return false
} else if (endTimeByEvent.contains(event.id)) { } else if (endTimeByEvent.contains(event.id)) {
Log.e(TAG, String.format("Cannot end same %s event again", event.name)) Log.e(TAG, "Cannot end same ${event.name} event again")
return false return false
} else if ( } else if (
event != LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_TOTAL_DURATION && event != LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_TOTAL_DURATION &&
@@ -185,11 +179,7 @@ open class StartupLatencyLogger(val latencyType: LatencyType) {
) { ) {
Log.e( Log.e(
TAG, TAG,
String.format( "Cannot end ${event.name} event after ${LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_TOTAL_DURATION.name}",
"Cannot end %s event after %s",
event.name,
LauncherLatencyEvent.LAUNCHER_LATENCY_STARTUP_TOTAL_DURATION.name
)
) )
return false return false
} }