FatttSnake/oxygen-api
1
0
Fork 0
Code Pull Requests Activity

Optimize code

Browse Source
This commit is contained in:
Fat Snake
2023-12-11 14:14:35 +08:00
parent cebeaff054
commit a1d61f8ada
2 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/main/kotlin/top/fatweb/api/service/system/impl/StatisticsServiceImpl.kt
View File

@@ -79,44 +79,50 @@ 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,
val processorTicks = processorTicksList[index] system,
val processorUser = idle,
processorTicks[CentralProcessor.TickType.USER.index] - processorPrevTicks[CentralProcessor.TickType.USER.index] iowait,
val processorNice = irq,
processorTicks[CentralProcessor.TickType.NICE.index] - processorPrevTicks[CentralProcessor.TickType.NICE.index] softirq,
val processorSystem = steal,
processorTicks[CentralProcessor.TickType.SYSTEM.index] - processorPrevTicks[CentralProcessor.TickType.SYSTEM.index] total,
val processorIdle = listOf(*processorPrevTicksList.mapIndexed { index, processorPrevTicks ->
processorTicks[CentralProcessor.TickType.IDLE.index] - processorPrevTicks[CentralProcessor.TickType.IDLE.index] val processorTicks = processorTicksList[index]
val processorIowait = val processorUser =
processorTicks[CentralProcessor.TickType.IOWAIT.index] - processorPrevTicks[CentralProcessor.TickType.IOWAIT.index] processorTicks[CentralProcessor.TickType.USER.index] - processorPrevTicks[CentralProcessor.TickType.USER.index]
val processorIrq = val processorNice =
processorTicks[CentralProcessor.TickType.IRQ.index] - processorPrevTicks[CentralProcessor.TickType.IRQ.index] processorTicks[CentralProcessor.TickType.NICE.index] - processorPrevTicks[CentralProcessor.TickType.NICE.index]
val processorSoftirq = val processorSystem =
processorTicks[CentralProcessor.TickType.SOFTIRQ.index] - processorPrevTicks[CentralProcessor.TickType.SOFTIRQ.index] processorTicks[CentralProcessor.TickType.SYSTEM.index] - processorPrevTicks[CentralProcessor.TickType.SYSTEM.index]
val processorSteal = val processorIdle =
processorTicks[CentralProcessor.TickType.STEAL.index] - processorPrevTicks[CentralProcessor.TickType.STEAL.index] processorTicks[CentralProcessor.TickType.IDLE.index] - processorPrevTicks[CentralProcessor.TickType.IDLE.index]
val processorTotal = val processorIowait =
processorUser + processorNice + processorSystem + processorIdle + processorIowait + processorIrq + processorSoftirq + processorSteal processorTicks[CentralProcessor.TickType.IOWAIT.index] - processorPrevTicks[CentralProcessor.TickType.IOWAIT.index]
processors?.add( val processorIrq =
CpuInfoVo( processorTicks[CentralProcessor.TickType.IRQ.index] - processorPrevTicks[CentralProcessor.TickType.IRQ.index]
processorUser, val processorSoftirq =
processorNice, processorTicks[CentralProcessor.TickType.SOFTIRQ.index] - processorPrevTicks[CentralProcessor.TickType.SOFTIRQ.index]
processorSystem, val processorSteal =
processorIdle, processorTicks[CentralProcessor.TickType.STEAL.index] - processorPrevTicks[CentralProcessor.TickType.STEAL.index]
processorIowait, val processorTotal =
processorIrq, processorUser + processorNice + processorSystem + processorIdle + processorIowait + processorIrq + processorSoftirq + processorSteal
processorSoftirq, CpuInfoVo(
processorSteal, processorUser,
processorTotal processorNice,
) processorSystem,
) processorIdle,
} processorIowait,
} processorIrq,
} processorSoftirq,
processorSteal,
processorTotal
)
}.toTypedArray())
)
} }
override fun storage() = StorageInfoVo( override fun storage() = StorageInfoVo(

2
src/main/kotlin/top/fatweb/api/vo/system/CpuInfoVo.kt
View File

@@ -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
) )