Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Canread
Gopsutil
提交
4b5bf22b
G
Gopsutil
项目概览
Canread
/
Gopsutil
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
Gopsutil
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4b5bf22b
编写于
2月 13, 2015
作者:
S
Shirou WAKAYAMA
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change CPUTimes type from float32 to float64 to resolve precision issue.
上级
18ab22b6
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
56 addition
and
56 deletion
+56
-56
cpu/cpu.go
cpu/cpu.go
+15
-15
cpu/cpu_darwin.go
cpu/cpu_darwin.go
+5
-5
cpu/cpu_freebsd.go
cpu/cpu_freebsd.go
+5
-5
cpu/cpu_linux.go
cpu/cpu_linux.go
+27
-27
cpu/cpu_test.go
cpu/cpu_test.go
+1
-1
cpu/cpu_windows.go
cpu/cpu_windows.go
+3
-3
未找到文件。
cpu/cpu.go
浏览文件 @
4b5bf22b
...
...
@@ -8,17 +8,17 @@ import (
type
CPUTimesStat
struct
{
CPU
string
`json:"cpu"`
User
float
32
`json:"user"`
System
float
32
`json:"system"`
Idle
float
32
`json:"idle"`
Nice
float
32
`json:"nice"`
Iowait
float
32
`json:"iowait"`
Irq
float
32
`json:"irq"`
Softirq
float
32
`json:"softirq"`
Steal
float
32
`json:"steal"`
Guest
float
32
`json:"guest"`
GuestNice
float
32
`json:"guest_nice"`
Stolen
float
32
`json:"stolen"`
User
float
64
`json:"user"`
System
float
64
`json:"system"`
Idle
float
64
`json:"idle"`
Nice
float
64
`json:"nice"`
Iowait
float
64
`json:"iowait"`
Irq
float
64
`json:"irq"`
Softirq
float
64
`json:"softirq"`
Steal
float
64
`json:"steal"`
Guest
float
64
`json:"guest"`
GuestNice
float
64
`json:"guest_nice"`
Stolen
float
64
`json:"stolen"`
}
type
CPUInfoStat
struct
{
...
...
@@ -43,14 +43,14 @@ func CPUCounts(logical bool) (int, error) {
var
lastCPUTimes
[]
CPUTimesStat
var
lastPerCPUTimes
[]
CPUTimesStat
func
CPUPercent
(
interval
time
.
Duration
,
percpu
bool
)
([]
float
32
,
error
)
{
getAllBusy
:=
func
(
t
CPUTimesStat
)
(
float
32
,
float32
)
{
func
CPUPercent
(
interval
time
.
Duration
,
percpu
bool
)
([]
float
64
,
error
)
{
getAllBusy
:=
func
(
t
CPUTimesStat
)
(
float
64
,
float64
)
{
busy
:=
t
.
User
+
t
.
System
+
t
.
Nice
+
t
.
Iowait
+
t
.
Irq
+
t
.
Softirq
+
t
.
Steal
+
t
.
Guest
+
t
.
GuestNice
+
t
.
Stolen
return
busy
+
t
.
Idle
,
busy
}
calculate
:=
func
(
t1
,
t2
CPUTimesStat
)
float
32
{
calculate
:=
func
(
t1
,
t2
CPUTimesStat
)
float
64
{
t1All
,
t1Busy
:=
getAllBusy
(
t1
)
t2All
,
t2Busy
:=
getAllBusy
(
t2
)
...
...
@@ -81,7 +81,7 @@ func CPUPercent(interval time.Duration, percpu bool) ([]float32, error) {
}
}
ret
:=
make
([]
float
32
,
len
(
cpuTimes
))
ret
:=
make
([]
float
64
,
len
(
cpuTimes
))
if
!
percpu
{
ret
[
0
]
=
calculate
(
lastCPUTimes
[
0
],
cpuTimes
[
0
])
lastCPUTimes
=
cpuTimes
...
...
cpu/cpu_darwin.go
浏览文件 @
4b5bf22b
...
...
@@ -46,23 +46,23 @@ func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
for
i
:=
0
;
i
<
ncpu
;
i
++
{
offset
:=
CPUStates
*
i
user
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPUser
+
offset
],
32
)
user
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPUser
+
offset
],
64
)
if
err
!=
nil
{
return
ret
,
err
}
nice
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPNice
+
offset
],
32
)
nice
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPNice
+
offset
],
64
)
if
err
!=
nil
{
return
ret
,
err
}
sys
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPSys
+
offset
],
32
)
sys
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPSys
+
offset
],
64
)
if
err
!=
nil
{
return
ret
,
err
}
idle
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPIdle
+
offset
],
32
)
idle
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPIdle
+
offset
],
64
)
if
err
!=
nil
{
return
ret
,
err
}
intr
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPIntr
+
offset
],
32
)
intr
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPIntr
+
offset
],
64
)
if
err
!=
nil
{
return
ret
,
err
}
...
...
cpu/cpu_freebsd.go
浏览文件 @
4b5bf22b
...
...
@@ -46,23 +46,23 @@ func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
for
i
:=
0
;
i
<
ncpu
;
i
++
{
offset
:=
CPUStates
*
i
user
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPUser
+
offset
],
32
)
user
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPUser
+
offset
],
64
)
if
err
!=
nil
{
return
ret
,
err
}
nice
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPNice
+
offset
],
32
)
nice
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPNice
+
offset
],
64
)
if
err
!=
nil
{
return
ret
,
err
}
sys
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPSys
+
offset
],
32
)
sys
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPSys
+
offset
],
64
)
if
err
!=
nil
{
return
ret
,
err
}
idle
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPIdle
+
offset
],
32
)
idle
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPIdle
+
offset
],
64
)
if
err
!=
nil
{
return
ret
,
err
}
intr
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPIntr
+
offset
],
32
)
intr
,
err
:=
strconv
.
ParseFloat
(
cpuTimes
[
CPIntr
+
offset
],
64
)
if
err
!=
nil
{
return
ret
,
err
}
...
...
cpu/cpu_linux.go
浏览文件 @
4b5bf22b
...
...
@@ -62,7 +62,7 @@ func CPUInfo() ([]CPUInfoStat, error) {
switch
key
{
case
"processor"
:
c
=
CPUInfoStat
{}
t
,
err
:=
strconv
.
ParseInt
(
value
,
10
,
32
)
t
,
err
:=
strconv
.
ParseInt
(
value
,
10
,
64
)
if
err
!=
nil
{
return
ret
,
err
}
...
...
@@ -76,7 +76,7 @@ func CPUInfo() ([]CPUInfoStat, error) {
case
"model name"
:
c
.
ModelName
=
value
case
"stepping"
:
t
,
err
:=
strconv
.
ParseInt
(
value
,
10
,
32
)
t
,
err
:=
strconv
.
ParseInt
(
value
,
10
,
64
)
if
err
!=
nil
{
return
ret
,
err
}
...
...
@@ -88,7 +88,7 @@ func CPUInfo() ([]CPUInfoStat, error) {
}
c
.
Mhz
=
t
case
"cache size"
:
t
,
err
:=
strconv
.
ParseInt
(
strings
.
Replace
(
value
,
" KB"
,
""
,
1
),
10
,
32
)
t
,
err
:=
strconv
.
ParseInt
(
strings
.
Replace
(
value
,
" KB"
,
""
,
1
),
10
,
64
)
if
err
!=
nil
{
return
ret
,
err
}
...
...
@@ -98,7 +98,7 @@ func CPUInfo() ([]CPUInfoStat, error) {
case
"core id"
:
c
.
CoreID
=
value
case
"cpu cores"
:
t
,
err
:=
strconv
.
ParseInt
(
value
,
10
,
32
)
t
,
err
:=
strconv
.
ParseInt
(
value
,
10
,
64
)
if
err
!=
nil
{
return
ret
,
err
}
...
...
@@ -122,71 +122,71 @@ func parseStatLine(line string) (*CPUTimesStat, error) {
if
cpu
==
"cpu"
{
cpu
=
"cpu-total"
}
user
,
err
:=
strconv
.
ParseFloat
(
fields
[
1
],
32
)
user
,
err
:=
strconv
.
ParseFloat
(
fields
[
1
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
nice
,
err
:=
strconv
.
ParseFloat
(
fields
[
2
],
32
)
nice
,
err
:=
strconv
.
ParseFloat
(
fields
[
2
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
system
,
err
:=
strconv
.
ParseFloat
(
fields
[
3
],
32
)
system
,
err
:=
strconv
.
ParseFloat
(
fields
[
3
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
idle
,
err
:=
strconv
.
ParseFloat
(
fields
[
4
],
32
)
idle
,
err
:=
strconv
.
ParseFloat
(
fields
[
4
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
iowait
,
err
:=
strconv
.
ParseFloat
(
fields
[
5
],
32
)
iowait
,
err
:=
strconv
.
ParseFloat
(
fields
[
5
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
irq
,
err
:=
strconv
.
ParseFloat
(
fields
[
6
],
32
)
irq
,
err
:=
strconv
.
ParseFloat
(
fields
[
6
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
softirq
,
err
:=
strconv
.
ParseFloat
(
fields
[
7
],
32
)
softirq
,
err
:=
strconv
.
ParseFloat
(
fields
[
7
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
stolen
,
err
:=
strconv
.
ParseFloat
(
fields
[
8
],
32
)
stolen
,
err
:=
strconv
.
ParseFloat
(
fields
[
8
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
cpu_tick
:=
float
32
(
100
)
// TODO: how to get _SC_CLK_TCK ?
cpu_tick
:=
float
64
(
100
)
// TODO: how to get _SC_CLK_TCK ?
ct
:=
&
CPUTimesStat
{
CPU
:
cpu
,
User
:
float
32
(
user
)
/
cpu_tick
,
Nice
:
float
32
(
nice
)
/
cpu_tick
,
System
:
float
32
(
system
)
/
cpu_tick
,
Idle
:
float
32
(
idle
)
/
cpu_tick
,
Iowait
:
float
32
(
iowait
)
/
cpu_tick
,
Irq
:
float
32
(
irq
)
/
cpu_tick
,
Softirq
:
float
32
(
softirq
)
/
cpu_tick
,
Stolen
:
float
32
(
stolen
)
/
cpu_tick
,
User
:
float
64
(
user
)
/
cpu_tick
,
Nice
:
float
64
(
nice
)
/
cpu_tick
,
System
:
float
64
(
system
)
/
cpu_tick
,
Idle
:
float
64
(
idle
)
/
cpu_tick
,
Iowait
:
float
64
(
iowait
)
/
cpu_tick
,
Irq
:
float
64
(
irq
)
/
cpu_tick
,
Softirq
:
float
64
(
softirq
)
/
cpu_tick
,
Stolen
:
float
64
(
stolen
)
/
cpu_tick
,
}
if
len
(
fields
)
>
9
{
// Linux >= 2.6.11
steal
,
err
:=
strconv
.
ParseFloat
(
fields
[
9
],
32
)
steal
,
err
:=
strconv
.
ParseFloat
(
fields
[
9
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
ct
.
Steal
=
float
32
(
steal
)
ct
.
Steal
=
float
64
(
steal
)
}
if
len
(
fields
)
>
10
{
// Linux >= 2.6.24
guest
,
err
:=
strconv
.
ParseFloat
(
fields
[
10
],
32
)
guest
,
err
:=
strconv
.
ParseFloat
(
fields
[
10
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
ct
.
Guest
=
float
32
(
guest
)
ct
.
Guest
=
float
64
(
guest
)
}
if
len
(
fields
)
>
11
{
// Linux >= 3.2.0
guestNice
,
err
:=
strconv
.
ParseFloat
(
fields
[
11
],
32
)
guestNice
,
err
:=
strconv
.
ParseFloat
(
fields
[
11
],
64
)
if
err
!=
nil
{
return
nil
,
err
}
ct
.
GuestNice
=
float
32
(
guestNice
)
ct
.
GuestNice
=
float
64
(
guestNice
)
}
return
ct
,
nil
...
...
cpu/cpu_test.go
浏览文件 @
4b5bf22b
...
...
@@ -74,7 +74,7 @@ func testCPUPercent(t *testing.T, percpu bool) {
t
.
Errorf
(
"error %v"
,
err
)
}
for
_
,
percent
:=
range
v
{
if
percent
<
0.0
||
percent
>
100.0
*
float
32
(
numcpu
)
{
if
percent
<
0.0
||
percent
>
100.0
*
float
64
(
numcpu
)
{
t
.
Fatalf
(
"CPUPercent value is invalid: %f"
,
percent
)
}
}
...
...
cpu/cpu_windows.go
浏览文件 @
4b5bf22b
...
...
@@ -32,9 +32,9 @@ func CPUTimes(percpu bool) ([]CPUTimesStat, error) {
system
:=
(
kernel
-
idle
)
ret
=
append
(
ret
,
CPUTimesStat
{
Idle
:
float
32
(
idle
),
User
:
float
32
(
user
),
System
:
float
32
(
system
),
Idle
:
float
64
(
idle
),
User
:
float
64
(
user
),
System
:
float
64
(
system
),
})
return
ret
,
nil
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录