Skip to content

[disk][process][freebsd]: remove binary.go from common #1907

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

Merged
shirou merged 1 commit into from
Aug 28, 2025
Merged

[disk][process][freebsd]: remove binary.go from common #1907

Show file tree
Hide file tree
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
4 changes: 1 addition & 3 deletions disk/disk_freebsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,7 @@ func (b bintime) Compute() float64 {
func parsedevstat(buf []byte) (devstat, error) {
var ds devstat
br := bytes.NewReader(buf)
// err := binary.Read(br, binary.LittleEndian, &ds)
err := common.Read(br, binary.LittleEndian, &ds)
if err != nil {
if err := binary.Read(br, binary.LittleEndian, &ds); err != nil {
return ds, err
}

Expand Down
2 changes: 1 addition & 1 deletion disk/disk_freebsd_386.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type devstat struct {
Flags uint32
Device_type uint32
Priority uint32
Id *byte
Id [sizeofPtr]byte
Sequence1 uint32
}

Expand Down
2 changes: 1 addition & 1 deletion disk/disk_freebsd_amd64.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ type devstat struct {
Device_type uint32
Priority uint32
Pad_cgo_1 [4]byte
ID *byte
ID [sizeofPtr]byte
Sequence1 uint32
Pad_cgo_2 [4]byte
}
Expand Down
2 changes: 1 addition & 1 deletion disk/disk_freebsd_arm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ type devstat struct {
Flags uint32
Device_type uint32
Priority uint32
Id *byte
Id [sizeofPtr]byte
Sequence1 uint32
}

Expand Down
2 changes: 1 addition & 1 deletion disk/disk_freebsd_arm64.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions disk/disk_openbsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,7 @@ func IOCountersWithContext(_ context.Context, names ...string) (map[string]IOCou
func parseDiskstats(buf []byte) (Diskstats, error) {
var ds Diskstats
br := bytes.NewReader(buf)
// err := binary.Read(br, binary.LittleEndian, &ds)
err := common.Read(br, binary.LittleEndian, &ds)
if err != nil {
if err := binary.Read(br, binary.LittleEndian, &ds); err != nil {
return ds, err
}

Expand Down
4 changes: 3 additions & 1 deletion disk/types_freebsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
// SPDX-License-Identifier: BSD-3-Clause
//go:build ignore

// Hand writing: _Ctype_struct___0
// Hand writing:
// - add _Ctype_struct___0 struct
// - devstat.ID *byte -> [sizeOfPtr]byte in order to use binary.Read

/*
Input to cgo -godefs.
Expand Down
Loading
Loading