OrgGo/shirou_gopsutil
1
0
Fork 0
mirror of https://github.com/shirou/gopsutil.git synced 2025-04-28 13:48:49 +08:00
Code Issues Projects Releases Wiki Activity

[mem][solaris] fix wrong variable name.

Browse Source
This commit is contained in:
shirou 2021-10-09 14:17:22 +00:00
parent 63210193c2
commit 3e7da36a46
2 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
mem/mem_solaris.go
View File

@ -122,7 +122,7 @@ func nonGlobalZoneMemoryCapacity() (uint64, error) {
return memSizeBytes, nil return memSizeBytes, nil
} }
const swapsCommand = "swap" const swapCommand = "swap"
// The blockSize as reported by `swap -l`. See https://docs.oracle.com/cd/E23824_01/html/821-1459/fsswap-52195.html // The blockSize as reported by `swap -l`. See https://docs.oracle.com/cd/E23824_01/html/821-1459/fsswap-52195.html
const blockSize = 512 const blockSize = 512
@ -141,13 +141,13 @@ func SwapDevices() ([]*SwapDevice, error) {
} }
func SwapDevicesWithContext(ctx context.Context) ([]*SwapDevice, error) { func SwapDevicesWithContext(ctx context.Context) ([]*SwapDevice, error) {
swapsCommandPath, err := exec.LookPath(swapsCommand) swapCommandPath, err := exec.LookPath(swapCommand)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not find command %q: %w", swapCommand, err) return nil, fmt.Errorf("could not find command %q: %w", swapCommand, err)
} }
output, err := invoke.CommandWithContext(swapsCommandPath, "-l") output, err := invoke.CommandWithContext(swapCommandPath, "-l")
if err != nil { if err != nil {
return nil, fmt.Errorf("could not execute %q: %w", swapsCommand, err) return nil, fmt.Errorf("could not execute %q: %w", swapCommand, err)
} }
return parseSwapsCommandOutput(string(output)) return parseSwapsCommandOutput(string(output))
@ -156,22 +156,22 @@ func SwapDevicesWithContext(ctx context.Context) ([]*SwapDevice, error) {
func parseSwapsCommandOutput(output string) ([]*SwapDevice, error) { func parseSwapsCommandOutput(output string) ([]*SwapDevice, error) {
lines := strings.Split(output, "\n") lines := strings.Split(output, "\n")
if len(lines) == 0 { if len(lines) == 0 {
return nil, fmt.Errorf("could not parse output of %q: no lines in %q", swapsCommand, output) return nil, fmt.Errorf("could not parse output of %q: no lines in %q", swapCommand, output)
} }
// Check header headerFields are as expected. // Check header headerFields are as expected.
headerFields := strings.Fields(lines[0]) headerFields := strings.Fields(lines[0])
if len(headerFields) < freeBlocksCol { if len(headerFields) < freeBlocksCol {
return nil, fmt.Errorf("couldn't parse %q: too few fields in header %q", swapsCommand, lines[0]) return nil, fmt.Errorf("couldn't parse %q: too few fields in header %q", swapCommand, lines[0])
} }
if headerFields[nameCol] != "swapfile" { if headerFields[nameCol] != "swapfile" {
return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapsCommand, headerFields[nameCol], "swapfile") return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapCommand, headerFields[nameCol], "swapfile")
} }
if headerFields[totalBlocksCol] != "blocks" { if headerFields[totalBlocksCol] != "blocks" {
return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapsCommand, headerFields[totalBlocksCol], "blocks") return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapCommand, headerFields[totalBlocksCol], "blocks")
} }
if headerFields[freeBlocksCol] != "free" { if headerFields[freeBlocksCol] != "free" {
return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapsCommand, headerFields[freeBlocksCol], "free") return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapCommand, headerFields[freeBlocksCol], "free")
} }
var swapDevices []*SwapDevice var swapDevices []*SwapDevice
@ -181,17 +181,17 @@ func parseSwapsCommandOutput(output string) ([]*SwapDevice, error) {
} }
fields := strings.Fields(line) fields := strings.Fields(line)
if len(fields) < freeBlocksCol { if len(fields) < freeBlocksCol {
return nil, fmt.Errorf("couldn't parse %q: too few fields", swapsCommand) return nil, fmt.Errorf("couldn't parse %q: too few fields", swapCommand)
} }
totalBlocks, err := strconv.ParseUint(fields[totalBlocksCol], 10, 64) totalBlocks, err := strconv.ParseUint(fields[totalBlocksCol], 10, 64)
if err != nil { if err != nil {
return nil, fmt.Errorf("couldn't parse 'Size' column in %q: %w", swapsCommand, err) return nil, fmt.Errorf("couldn't parse 'Size' column in %q: %w", swapCommand, err)
} }
freeBlocks, err := strconv.ParseUint(fields[freeBlocksCol], 10, 64) freeBlocks, err := strconv.ParseUint(fields[freeBlocksCol], 10, 64)
if err != nil { if err != nil {
return nil, fmt.Errorf("couldn't parse 'Used' column in %q: %w", swapsCommand, err) return nil, fmt.Errorf("couldn't parse 'Used' column in %q: %w", swapCommand, err)
} }
swapDevices = append(swapDevices, &SwapDevice{ swapDevices = append(swapDevices, &SwapDevice{

26
v3/mem/mem_solaris.go
View File

@ -122,7 +122,7 @@ func nonGlobalZoneMemoryCapacity() (uint64, error) {
return memSizeBytes, nil return memSizeBytes, nil
} }
const swapsCommand = "swap" const swapCommand = "swap"
// The blockSize as reported by `swap -l`. See https://docs.oracle.com/cd/E23824_01/html/821-1459/fsswap-52195.html // The blockSize as reported by `swap -l`. See https://docs.oracle.com/cd/E23824_01/html/821-1459/fsswap-52195.html
const blockSize = 512 const blockSize = 512
@ -141,13 +141,13 @@ func SwapDevices() ([]*SwapDevice, error) {
} }
func SwapDevicesWithContext(ctx context.Context) ([]*SwapDevice, error) { func SwapDevicesWithContext(ctx context.Context) ([]*SwapDevice, error) {
swapsCommandPath, err := exec.LookPath(swapsCommand) swapCommandPath, err := exec.LookPath(swapCommand)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not find command %q: %w", swapsCommand, err) return nil, fmt.Errorf("could not find command %q: %w", swapCommand, err)
} }
output, err := invoke.CommandWithContext(ctx, swapsCommandPath, "-l") output, err := invoke.CommandWithContext(ctx, swapCommandPath, "-l")
if err != nil { if err != nil {
return nil, fmt.Errorf("could not execute %q: %w", swapsCommand, err) return nil, fmt.Errorf("could not execute %q: %w", swapCommand, err)
} }
return parseSwapsCommandOutput(string(output)) return parseSwapsCommandOutput(string(output))
@ -156,22 +156,22 @@ func SwapDevicesWithContext(ctx context.Context) ([]*SwapDevice, error) {
func parseSwapsCommandOutput(output string) ([]*SwapDevice, error) { func parseSwapsCommandOutput(output string) ([]*SwapDevice, error) {
lines := strings.Split(output, "\n") lines := strings.Split(output, "\n")
if len(lines) == 0 { if len(lines) == 0 {
return nil, fmt.Errorf("could not parse output of %q: no lines in %q", swapsCommand, output) return nil, fmt.Errorf("could not parse output of %q: no lines in %q", swapCommand, output)
} }
// Check header headerFields are as expected. // Check header headerFields are as expected.
headerFields := strings.Fields(lines[0]) headerFields := strings.Fields(lines[0])
if len(headerFields) < freeBlocksCol { if len(headerFields) < freeBlocksCol {
return nil, fmt.Errorf("couldn't parse %q: too few fields in header %q", swapsCommand, lines[0]) return nil, fmt.Errorf("couldn't parse %q: too few fields in header %q", swapCommand, lines[0])
} }
if headerFields[nameCol] != "swapfile" { if headerFields[nameCol] != "swapfile" {
return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapsCommand, headerFields[nameCol], "swapfile") return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapCommand, headerFields[nameCol], "swapfile")
} }
if headerFields[totalBlocksCol] != "blocks" { if headerFields[totalBlocksCol] != "blocks" {
return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapsCommand, headerFields[totalBlocksCol], "blocks") return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapCommand, headerFields[totalBlocksCol], "blocks")
} }
if headerFields[freeBlocksCol] != "free" { if headerFields[freeBlocksCol] != "free" {
return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapsCommand, headerFields[freeBlocksCol], "free") return nil, fmt.Errorf("couldn't parse %q: expected %q to be %q", swapCommand, headerFields[freeBlocksCol], "free")
} }
var swapDevices []*SwapDevice var swapDevices []*SwapDevice
@ -181,17 +181,17 @@ func parseSwapsCommandOutput(output string) ([]*SwapDevice, error) {
} }
fields := strings.Fields(line) fields := strings.Fields(line)
if len(fields) < freeBlocksCol { if len(fields) < freeBlocksCol {
return nil, fmt.Errorf("couldn't parse %q: too few fields", swapsCommand) return nil, fmt.Errorf("couldn't parse %q: too few fields", swapCommand)
} }
totalBlocks, err := strconv.ParseUint(fields[totalBlocksCol], 10, 64) totalBlocks, err := strconv.ParseUint(fields[totalBlocksCol], 10, 64)
if err != nil { if err != nil {
return nil, fmt.Errorf("couldn't parse 'Size' column in %q: %w", swapsCommand, err) return nil, fmt.Errorf("couldn't parse 'Size' column in %q: %w", swapCommand, err)
} }
freeBlocks, err := strconv.ParseUint(fields[freeBlocksCol], 10, 64) freeBlocks, err := strconv.ParseUint(fields[freeBlocksCol], 10, 64)
if err != nil { if err != nil {
return nil, fmt.Errorf("couldn't parse 'Used' column in %q: %w", swapsCommand, err) return nil, fmt.Errorf("couldn't parse 'Used' column in %q: %w", swapCommand, err)
} }
swapDevices = append(swapDevices, &SwapDevice{ swapDevices = append(swapDevices, &SwapDevice{