Optimize code
This commit is contained in:
@@ -79,9 +79,17 @@ class StatisticsServiceImpl : IStatisticsService {
|
||||
ticks[CentralProcessor.TickType.SOFTIRQ.index] - prevTicks[CentralProcessor.TickType.SOFTIRQ.index]
|
||||
val steal = ticks[CentralProcessor.TickType.STEAL.index] - prevTicks[CentralProcessor.TickType.STEAL.index]
|
||||
val total = user + nice + system + idle + iowait + irq + softirq + steal
|
||||
return CpuInfoVo(user, nice, system, idle, iowait, irq, softirq, steal, total, mutableListOf()).apply {
|
||||
processorPrevTicksList.forEachIndexed { index, processorPrevTicks ->
|
||||
run {
|
||||
return CpuInfoVo(
|
||||
user,
|
||||
nice,
|
||||
system,
|
||||
idle,
|
||||
iowait,
|
||||
irq,
|
||||
softirq,
|
||||
steal,
|
||||
total,
|
||||
listOf(*processorPrevTicksList.mapIndexed { index, processorPrevTicks ->
|
||||
val processorTicks = processorTicksList[index]
|
||||
val processorUser =
|
||||
processorTicks[CentralProcessor.TickType.USER.index] - processorPrevTicks[CentralProcessor.TickType.USER.index]
|
||||
@@ -101,7 +109,6 @@ class StatisticsServiceImpl : IStatisticsService {
|
||||
processorTicks[CentralProcessor.TickType.STEAL.index] - processorPrevTicks[CentralProcessor.TickType.STEAL.index]
|
||||
val processorTotal =
|
||||
processorUser + processorNice + processorSystem + processorIdle + processorIowait + processorIrq + processorSoftirq + processorSteal
|
||||
processors?.add(
|
||||
CpuInfoVo(
|
||||
processorUser,
|
||||
processorNice,
|
||||
@@ -113,11 +120,10 @@ class StatisticsServiceImpl : IStatisticsService {
|
||||
processorSteal,
|
||||
processorTotal
|
||||
)
|
||||
|
||||
}.toTypedArray())
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun storage() = StorageInfoVo(
|
||||
memoryTotal = systemInfo.hardware.memory.total,
|
||||
|
||||
@@ -101,7 +101,6 @@ data class CpuInfoVo(
|
||||
* @since 1.0.0
|
||||
*/
|
||||
val total: Long,
|
||||
val processors: MutableList<CpuInfoVo>? = null
|
||||
|
||||
/**
|
||||
* List of CPU processors information
|
||||
@@ -109,4 +108,5 @@ data class CpuInfoVo(
|
||||
* @author FatttSnake, fatttsnake@gmail.com
|
||||
* @since 1.0.0
|
||||
*/
|
||||
val processors: List<CpuInfoVo>? = null
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user