Lomanic
/
gopsutil
mirror of https://github.com/shirou/gopsutil
1
0
Fork 0
Code Issues Releases Activity

Merge pull request #29 from jamescun/master

Browse Source 
Unify JSON tags to snake_case
tags/0.9.9
shirou 11 years ago
parent 2b6366a26d bddb35d0c6
commit 512ba09921
8 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

10
cpu.go
Unescape Escape View File

@ -23,16 +23,16 @@ type CPUTimesStat struct {
type CPUInfoStat struct { type CPUInfoStat struct {
CPU int32 `json:"cpu"` CPU int32 `json:"cpu"`
VendorID string `json:"vendorId"` VendorID string `json:"vendor_id"`
Family string `json:"family"` Family string `json:"family"`
Model string `json:"model"` Model string `json:"model"`
Stepping int32 `json:"stepping"` Stepping int32 `json:"stepping"`
PhysicalID string `json:"physicalId"` PhysicalID string `json:"physical_id"`
CoreID string `json:"coreId"` CoreID string `json:"core_id"`
Cores int32 `json:"cores"` Cores int32 `json:"cores"`
ModelName string `json:"modelName"` ModelName string `json:"model_name"`
Mhz float64 `json:"mhz"` Mhz float64 `json:"mhz"`
CacheSize int32 `json:"cacheSize"` CacheSize int32 `json:"cache_size"`
Flags []string `json:"flags"` Flags []string `json:"flags"`
} }

26
disk.go
Unescape Escape View File

@ -9,11 +9,11 @@ type DiskUsageStat struct {
Total uint64 `json:"total"` Total uint64 `json:"total"`
Free uint64 `json:"free"` Free uint64 `json:"free"`
Used uint64 `json:"used"` Used uint64 `json:"used"`
UsedPercent float64 `json:"usedPercent"` UsedPercent float64 `json:"used_percent"`
InodesTotal uint64 `json:"inodesTotal"` InodesTotal uint64 `json:"inodes_total"`
InodesUsed uint64 `json:"inodesUsed"` InodesUsed uint64 `json:"inodes_used"`
InodesFree uint64 `json:"inodesFree"` InodesFree uint64 `json:"inodes_free"`
InodesUsedPercent float64 `json:"inodesUsedPercent"` InodesUsedPercent float64 `json:"inodes_used_percent"`
} }
type DiskPartitionStat struct { type DiskPartitionStat struct {
@ -24,15 +24,15 @@ type DiskPartitionStat struct {
} }
type DiskIOCountersStat struct { type DiskIOCountersStat struct {
ReadCount uint64 `json:"readCount"` ReadCount uint64 `json:"read_count"`
WriteCount uint64 `json:"writeCount"` WriteCount uint64 `json:"write_count"`
ReadBytes uint64 `json:"readBytes"` ReadBytes uint64 `json:"read_bytes"`
WriteBytes uint64 `json:"writeBytes"` WriteBytes uint64 `json:"write_bytes"`
ReadTime uint64 `json:"readTime"` ReadTime uint64 `json:"read_time"`
WriteTime uint64 `json:"writeTime"` WriteTime uint64 `json:"write_time"`
Name string `json:"name"` Name string `json:"name"`
IoTime uint64 `json:"ioTime"` IoTime uint64 `json:"io_time"`
SerialNumber string `json:"serialNumber"` SerialNumber string `json:"serial_number"`
} }
func (d DiskUsageStat) String() string { func (d DiskUsageStat) String() string {

4
disk_test.go
Unescape Escape View File

@ -58,7 +58,7 @@ func TestDiskUsageStat_String(t *testing.T) {
InodesFree: 6000, InodesFree: 6000,
InodesUsedPercent: 49.1, InodesUsedPercent: 49.1,
} }
e := `{"path":"/","total":1000,"free":2000,"used":3000,"usedPercent":50.1,"inodesTotal":4000,"inodesUsed":5000,"inodesFree":6000,"inodesUsedPercent":49.1}` e := `{"path":"/","total":1000,"free":2000,"used":3000,"used_percent":50.1,"inodes_total":4000,"inodes_used":5000,"inodes_free":6000,"inodes_used_percent":49.1}`
if e != fmt.Sprintf("%v", v) { if e != fmt.Sprintf("%v", v) {
t.Errorf("DiskUsageStat string is invalid: %v", v) t.Errorf("DiskUsageStat string is invalid: %v", v)
} }
@ -86,7 +86,7 @@ func TestDiskIOCountersStat_String(t *testing.T) {
WriteBytes: 400, WriteBytes: 400,
SerialNumber: "SERIAL", SerialNumber: "SERIAL",
} }
e := `{"readCount":100,"writeCount":200,"readBytes":300,"writeBytes":400,"readTime":0,"writeTime":0,"name":"sd01","ioTime":0,"serialNumber":"SERIAL"}` e := `{"read_count":100,"write_count":200,"read_bytes":300,"write_bytes":400,"read_time":0,"write_time":0,"name":"sd01","io_time":0,"serial_number":"SERIAL"}`
if e != fmt.Sprintf("%v", v) { if e != fmt.Sprintf("%v", v) {
t.Errorf("DiskUsageStat string is invalid: %v", v) t.Errorf("DiskUsageStat string is invalid: %v", v)
} }

2
docker_linux.go
Unescape Escape View File

@ -11,7 +11,7 @@ import (
) )
type CgroupMemStat struct { type CgroupMemStat struct {
ContainerID string `json:"containerid"` ContainerID string `json:"container_id"`
Cache uint64 `json:"cache"` Cache uint64 `json:"cache"`
RSS uint64 `json:"rss"` RSS uint64 `json:"rss"`
RSSHuge uint64 `json:"rss_huge"` RSSHuge uint64 `json:"rss_huge"`

14
host.go
Unescape Escape View File

@ -9,13 +9,13 @@ import (
type HostInfoStat struct { type HostInfoStat struct {
Hostname string `json:"hostname"` Hostname string `json:"hostname"`
Uptime uint64 `json:"uptime"` Uptime uint64 `json:"uptime"`
Procs uint64 `json:"procs"` // number of processes Procs uint64 `json:"procs"` // number of processes
OS string `json:"os"` // ex: freebsd, linux OS string `json:"os"` // ex: freebsd, linux
Platform string `json:"platform"` // ex: ubuntu, linuxmint Platform string `json:"platform"` // ex: ubuntu, linuxmint
PlatformFamily string `json:"platformFamily"` // ex: debian, rhel PlatformFamily string `json:"platform_family"` // ex: debian, rhel
PlatformVersion string `json:"platformVersion"` PlatformVersion string `json:"platform_version"`
VirtualizationSystem string `json:"virtualizationSystem"` VirtualizationSystem string `json:"virtualization_system"`
VirtualizationRole string `json:"virtualizationRole"` // guest or host VirtualizationRole string `json:"virtualization_role"` // guest or host
} }

2
host_test.go
Unescape Escape View File

@ -47,7 +47,7 @@ func TestHostInfoStat_String(t *testing.T) {
OS: "linux", OS: "linux",
Platform: "ubuntu", Platform: "ubuntu",
} }
e := `{"hostname":"test","uptime":3000,"procs":100,"os":"linux","platform":"ubuntu","platformFamily":"","platformVersion":"","virtualizationSystem":"","virtualizationRole":""}` e := `{"hostname":"test","uptime":3000,"procs":100,"os":"linux","platform":"ubuntu","platform_family":"","platform_version":"","virtualization_system":"","virtualization_role":""}`
if e != fmt.Sprintf("%v", v) { if e != fmt.Sprintf("%v", v) {
t.Errorf("HostInfoStat string is invalid: %v", v) t.Errorf("HostInfoStat string is invalid: %v", v)
} }

4
mem.go
Unescape Escape View File

@ -8,7 +8,7 @@ type VirtualMemoryStat struct {
Total uint64 `json:"total"` Total uint64 `json:"total"`
Available uint64 `json:"available"` Available uint64 `json:"available"`
Used uint64 `json:"used"` Used uint64 `json:"used"`
UsedPercent float64 `json:"usedPercent"` UsedPercent float64 `json:"used_percent"`
Free uint64 `json:"free"` Free uint64 `json:"free"`
Active uint64 `json:"active"` Active uint64 `json:"active"`
Inactive uint64 `json:"inactive"` Inactive uint64 `json:"inactive"`
@ -22,7 +22,7 @@ type SwapMemoryStat struct {
Total uint64 `json:"total"` Total uint64 `json:"total"`
Used uint64 `json:"used"` Used uint64 `json:"used"`
Free uint64 `json:"free"` Free uint64 `json:"free"`
UsedPercent float64 `json:"usedPercent"` UsedPercent float64 `json:"used_percent"`
Sin uint64 `json:"sin"` Sin uint64 `json:"sin"`
Sout uint64 `json:"sout"` Sout uint64 `json:"sout"`
} }

4
mem_test.go
Unescape Escape View File

@ -35,7 +35,7 @@ func TestVirtualMemoryStat_String(t *testing.T) {
UsedPercent: 30.1, UsedPercent: 30.1,
Free: 40, Free: 40,
} }
e := `{"total":10,"available":20,"used":30,"usedPercent":30.1,"free":40,"active":0,"inactive":0,"buffers":0,"cached":0,"wired":0,"shared":0}` e := `{"total":10,"available":20,"used":30,"used_percent":30.1,"free":40,"active":0,"inactive":0,"buffers":0,"cached":0,"wired":0,"shared":0}`
if e != fmt.Sprintf("%v", v) { if e != fmt.Sprintf("%v", v) {
t.Errorf("VirtualMemoryStat string is invalid: %v", v) t.Errorf("VirtualMemoryStat string is invalid: %v", v)
} }
@ -48,7 +48,7 @@ func TestSwapMemoryStat_String(t *testing.T) {
Free: 40, Free: 40,
UsedPercent: 30.1, UsedPercent: 30.1,
} }
e := `{"total":10,"used":30,"free":40,"usedPercent":30.1,"sin":0,"sout":0}` e := `{"total":10,"used":30,"free":40,"used_percent":30.1,"sin":0,"sout":0}`
if e != fmt.Sprintf("%v", v) { if e != fmt.Sprintf("%v", v) {
t.Errorf("SwapMemoryStat string is invalid: %v", v) t.Errorf("SwapMemoryStat string is invalid: %v", v)
} }

Write Preview
Loading…
Cancel
Save