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