Replace some FreeBSD collectors with pure Go versions #385
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| // Copyright 2015 The Prometheus Authors | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // +build !nofilesystem | ||
|
|
||
| package collector | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "unsafe" | ||
|
|
||
| "github.com/prometheus/common/log" | ||
| "golang.org/x/sys/unix" | ||
| ) | ||
|
|
||
| const ( | ||
| defIgnoredMountPoints = "^/(dev)($|/)" | ||
| defIgnoredFSTypes = "^devfs$" | ||
| MNT_RDONLY = 0x1 | ||
| MNT_NOWAIT = 0x2 | ||
| ) | ||
|
|
||
| func gostring(b []int8) string { | ||
| bb := *(*[]byte)(unsafe.Pointer(&b)) | ||
| idx := bytes.IndexByte(bb, 0) | ||
| if idx < 0 { | ||
| return "" | ||
| } | ||
| return string(bb[:idx]) | ||
| } | ||
|
|
||
| // Expose filesystem fullness. | ||
| func (c *filesystemCollector) GetStats() (stats []filesystemStats, err error) { | ||
| buf := make([]unix.Statfs_t, 16) | ||
| for { | ||
| n, err := unix.Getfsstat(buf, MNT_NOWAIT) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| if n < len(buf) { | ||
| buf = buf[:n] | ||
| break | ||
| } | ||
| buf = make([]unix.Statfs_t, len(buf)*2) | ||
| } | ||
| stats = []filesystemStats{} | ||
| for _, fs := range buf { | ||
| mountpoint := gostring(fs.Mntonname[:]) | ||
| if c.ignoredMountPointsPattern.MatchString(mountpoint) { | ||
| log.Debugf("Ignoring mount point: %s", mountpoint) | ||
| continue | ||
| } | ||
|
|
||
| device := gostring(fs.Mntfromname[:]) | ||
| fstype := gostring(fs.Fstypename[:]) | ||
| if c.ignoredFSTypesPattern.MatchString(fstype) { | ||
| log.Debugf("Ignoring fs type: %s", fstype) | ||
| continue | ||
| } | ||
|
|
||
| var ro float64 | ||
| if (fs.Flags & MNT_RDONLY) != 0 { | ||
| ro = 1 | ||
| } | ||
|
|
||
| labelValues := []string{device, mountpoint, fstype} | ||
| stats = append(stats, filesystemStats{ | ||
| labelValues: labelValues, | ||
| size: float64(fs.Blocks) * float64(fs.Bsize), | ||
| free: float64(fs.Bfree) * float64(fs.Bsize), | ||
| avail: float64(fs.Bavail) * float64(fs.Bsize), | ||
| files: float64(fs.Files), | ||
| filesFree: float64(fs.Ffree), | ||
| ro: ro, | ||
| }) | ||
| } | ||
| return stats, nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // +build !noloadavg | ||
|
|
||
| package collector | ||
|
|
||
| import ( | ||
| "unsafe" | ||
|
|
||
| "golang.org/x/sys/unix" | ||
| ) | ||
|
|
||
| func getLoad() ([]float64, error) { | ||
| type loadavg struct { | ||
| load [3]uint32 | ||
| scale int | ||
| } | ||
| b, err := unix.SysctlRaw("vm.loadavg") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| load := *(*loadavg)(unsafe.Pointer((&b[0]))) | ||
|
There was a problem hiding this comment. Minor, |
||
| scale := float64(load.scale) | ||
| return []float64{ | ||
| float64(load.load[0]) / scale, | ||
| float64(load.load[1]) / scale, | ||
| float64(load.load[2]) / scale, | ||
| }, nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is equivalent to
if fs.Flags&MNT_RDONLY != 0 {, which is simpler and equally readable I think, sincegofmtremoves the spaces around&to help visualize the order of operations.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The suggested alternative looks like a blob of ink to me, precisely because of how gofmt formats it. Parentheses also help visualize the order of operations, but render much more readable in the case of bitmasks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, keeping it like it is is readable IMO