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

Complete core functions #9

Merged
FatttSnake merged 171 commits from FatttSnake into dev 2024-02-23 11:56:35 +08:00
Conversation 0 Commits 171 Files Changed 381 +6 -3
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 971a7007c7 - Show all commits

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

@@ -72,8 +72,8 @@ class StatisticsServiceImpl : IStatisticsService {
val softirq =
ticks[CentralProcessor.TickType.SOFTIRQ.index] - prevTicks[CentralProcessor.TickType.SOFTIRQ.index]
val steal = ticks[CentralProcessor.TickType.STEAL.index] - prevTicks[CentralProcessor.TickType.STEAL.index]
return CpuInfoVo(user, nice, system, idle, iowait, irq, softirq, steal, mutableListOf()).apply {
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 {
val processorTicks = processorTicksList[index]
@@ -93,6 +93,7 @@ class StatisticsServiceImpl : IStatisticsService {
processorTicks[CentralProcessor.TickType.SOFTIRQ.index] - processorPrevTicks[CentralProcessor.TickType.SOFTIRQ.index]
val processorSteal =
processorTicks[CentralProcessor.TickType.STEAL.index] - processorPrevTicks[CentralProcessor.TickType.STEAL.index]
val processorTotal = processorUser + processorNice + processorSystem + processorIdle + processorIowait + processorIrq + processorSoftirq + processorSteal
processors?.add(
CpuInfoVo(
processorUser,
@@ -102,7 +103,8 @@ class StatisticsServiceImpl : IStatisticsService {
processorIowait,
processorIrq,
processorSoftirq,
processorSteal
processorSteal,
processorTotal
)
)
}

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

@@ -12,5 +12,6 @@ data class CpuInfoVo(
val irq: Long,
val softirq: Long,
val steal: Long,
val total: Long,
val processors: MutableList<CpuInfoVo>? = null
)