github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

metrics/cgroups/v1: Remove unused event parameter

Browse Source 
The event parameter wasn't actually used when processing oom events,
likely because it's only ever available for reads.

Additionally clarify flush is for eventfds, and point to where the
buffer size of 8 is coming from.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
This commit is contained in:
Daniel Canter 2022-09-02 20:31:35 -07:00
parent edd59aa360
commit 3a2197f5fe
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
metrics/cgroups/v1/oom.go
View File

@ -121,14 +121,14 @@ func (o *oomCollector) start() {
return
}
for i := 0; i < n; i++ {
o.process(uintptr(events[i].Fd), events[i].Events)
o.process(uintptr(events[i].Fd))
}
}
}
func (o *oomCollector) process(fd uintptr, event uint32) {
// make sure to always flush the fd
flush(fd)
func (o *oomCollector) process(fd uintptr) {
// make sure to always flush the eventfd
flushEventfd(fd)
o.mu.Lock()
info, ok := o.set[fd]
@ -152,8 +152,10 @@ func (o *oomCollector) process(fd uintptr, event uint32) {
}
}
func flush(fd uintptr) error {
func flushEventfd(efd uintptr) error {
// Buffer must be >= 8 bytes for eventfd reads
// https://man7.org/linux/man-pages/man2/eventfd.2.html
var buf [8]byte
_, err := unix.Read(int(fd), buf[:])
_, err := unix.Read(int(efd), buf[:])
return err
}