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

if mountinfo not found, use mounts

Browse Source
This commit is contained in:
JHE 2019-02-05 23:30:19 +08:00
parent d141349619
commit a5cb715e64
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
disk/disk_linux.go
View File

@ -224,9 +224,10 @@ func Partitions(all bool) ([]PartitionStat, error) {
} }
func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, error) { func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, error) {
UseMounts := false
filename := common.HostProc("self/mountinfo") filename := common.HostProc("self/mountinfo")
lines, err := common.ReadLines(filename) lines, err := common.ReadLines(filename)
UseMounts := false
if err != nil { if err != nil {
UseMounts = true UseMounts = true
} }
@ -234,7 +235,7 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
//if kernel not support self/mountinfo //if kernel not support self/mountinfo
if UseMounts == true { if UseMounts == true {
filename := common.HostProc("self/mounts") filename := common.HostProc("self/mounts")
lines, err := common.ReadLines(filename) lines, err = common.ReadLines(filename)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -247,6 +248,8 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
ret := make([]PartitionStat, 0, len(lines)) ret := make([]PartitionStat, 0, len(lines))
var d PartitionStat
for _, line := range lines { for _, line := range lines {
// a line of self/mountinfo has the following structure: // a line of self/mountinfo has the following structure:
// 36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue // 36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue
@ -256,12 +259,18 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
if UseMounts == true { if UseMounts == true {
fields := strings.Fields(line) fields := strings.Fields(line)
d := PartitionStat{ d = PartitionStat{
Device: fields[0], Device: fields[0],
Mountpoint: unescapeFstab(fields[1]), Mountpoint: unescapeFstab(fields[1]),
Fstype: fields[2], Fstype: fields[2],
Opts: fields[3], Opts: fields[3],
} }
if all == false {
if d.Device == "none" || !common.StringsHas(fs, d.Fstype) {
continue
}
}
} else { } else {
parts := strings.Split(line, " - ") parts := strings.Split(line, " - ")
if len(parts) != 2 { if len(parts) != 2 {
@ -277,21 +286,19 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro
fstype := fields[0] fstype := fields[0]
device := fields[1] device := fields[1]
d := PartitionStat{ d = PartitionStat{
Device: device, Device: device,
Mountpoint: mountPoint, Mountpoint: mountPoint,
Fstype: fstype, Fstype: fstype,
Opts: mountOpts, Opts: mountOpts,
} }
}
if all == false { if all == false {
if d.Device == "none" || !common.StringsHas(fs, d.Fstype) { if d.Device == "none" || !common.StringsHas(fs, d.Fstype) {
continue continue
}
} }
}
if UseMounts == true {
// /dev/root is not the real device name // /dev/root is not the real device name
// so we get the real device name from its major/minor number // so we get the real device name from its major/minor number
if d.Device == "/dev/root" { if d.Device == "/dev/root" {