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 +45 -39
2 changed files with 45 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1d61f8ada - Show all commits

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]
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 {
val processorTicks = processorTicksList[index]
val processorUser =
processorTicks[CentralProcessor.TickType.USER.index] - processorPrevTicks[CentralProcessor.TickType.USER.index]
val processorNice =
processorTicks[CentralProcessor.TickType.NICE.index] - processorPrevTicks[CentralProcessor.TickType.NICE.index]
val processorSystem =
processorTicks[CentralProcessor.TickType.SYSTEM.index] - processorPrevTicks[CentralProcessor.TickType.SYSTEM.index]
val processorIdle =
processorTicks[CentralProcessor.TickType.IDLE.index] - processorPrevTicks[CentralProcessor.TickType.IDLE.index]
val processorIowait =
processorTicks[CentralProcessor.TickType.IOWAIT.index] - processorPrevTicks[CentralProcessor.TickType.IOWAIT.index]
val processorIrq =
processorTicks[CentralProcessor.TickType.IRQ.index] - processorPrevTicks[CentralProcessor.TickType.IRQ.index]
val processorSoftirq =
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,
processorNice,
processorSystem,
processorIdle,
processorIowait,
processorIrq,
processorSoftirq,
processorSteal,
processorTotal
)
)
}
}
}
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]
val processorNice =
processorTicks[CentralProcessor.TickType.NICE.index] - processorPrevTicks[CentralProcessor.TickType.NICE.index]
val processorSystem =
processorTicks[CentralProcessor.TickType.SYSTEM.index] - processorPrevTicks[CentralProcessor.TickType.SYSTEM.index]
val processorIdle =
processorTicks[CentralProcessor.TickType.IDLE.index] - processorPrevTicks[CentralProcessor.TickType.IDLE.index]
val processorIowait =
processorTicks[CentralProcessor.TickType.IOWAIT.index] - processorPrevTicks[CentralProcessor.TickType.IOWAIT.index]
val processorIrq =
processorTicks[CentralProcessor.TickType.IRQ.index] - processorPrevTicks[CentralProcessor.TickType.IRQ.index]
val processorSoftirq =
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
CpuInfoVo(
processorUser,
processorNice,
processorSystem,
processorIdle,
processorIowait,
processorIrq,
processorSoftirq,
processorSteal,
processorTotal
)
}.toTypedArray())
)
}
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
*/
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
)