Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Separate /proc/stat disk stat parsing logic #477

Merged
merged 1 commit into from
Dec 17, 2022
Merged

Separate /proc/stat disk stat parsing logic #477

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 18 additions & 7 deletions blockdevice/stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package blockdevice

import (
"bufio"
"errors"
"fmt"
"io"
"os"
Expand Down Expand Up @@ -251,9 +252,15 @@ func (fs FS) ProcDiskstats() ([]Diskstats, error) {
return nil, err
}
defer file.Close()
return parseProcDiskstats(file)
}

diskstats := []Diskstats{}
scanner := bufio.NewScanner(file)
func parseProcDiskstats(r io.Reader) ([]Diskstats, error) {
var (
diskstats []Diskstats
scanner = bufio.NewScanner(r)
err error
)
for scanner.Scan() {
d := &Diskstats{}
d.IoStatsCount, err = fmt.Sscanf(scanner.Text(), procDiskstatsFormat,
Expand All @@ -280,7 +287,7 @@ func (fs FS) ProcDiskstats() ([]Diskstats, error) {
)
// The io.EOF error can be safely ignored because it just means we read fewer than
// the full 20 fields.
if err != nil && err != io.EOF {
if err != nil && !errors.Is(err, io.EOF) {
return diskstats, err
}
if d.IoStatsCount >= 14 {
Expand All @@ -307,12 +314,16 @@ func (fs FS) SysBlockDevices() ([]string, error) {
// The number of stats read will be 15 if the discard stats are available (kernel 4.18+)
// and 11 if they are not available.
func (fs FS) SysBlockDeviceStat(device string) (IOStats, int, error) {
stat := IOStats{}
bytes, err := os.ReadFile(fs.sys.Path(sysBlockPath, device, "stat"))
if err != nil {
return stat, 0, err
return IOStats{}, 0, err
}
count, err := fmt.Sscanf(strings.TrimSpace(string(bytes)), sysBlockStatFormat,
return parseSysBlockDeviceStat(bytes)
}

func parseSysBlockDeviceStat(data []byte) (IOStats, int, error) {
stat := IOStats{}
count, err := fmt.Sscanf(strings.TrimSpace(string(data)), sysBlockStatFormat,
&stat.ReadIOs,
&stat.ReadMerges,
&stat.ReadSectors,
Expand All @@ -332,7 +343,7 @@ func (fs FS) SysBlockDeviceStat(device string) (IOStats, int, error) {
&stat.TimeSpentFlushing,
)
// An io.EOF error is ignored because it just means we read fewer than the full 15 fields.
if err == io.EOF {
if errors.Is(err, io.EOF) {
return stat, count, nil
}
return stat, count, err
Expand Down