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

Merge pull request #7361 from dcantah/epoll-ev-rm

Browse Source
This commit is contained in:
Fu Wei 2022-09-06 07:36:29 +08:00 committed by GitHub
commit 50a201b6c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 return
} }
for i := 0; i < n; i++ { 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) { func (o *oomCollector) process(fd uintptr) {
// make sure to always flush the fd // make sure to always flush the eventfd
flush(fd) flushEventfd(fd)
o.mu.Lock() o.mu.Lock()
info, ok := o.set[fd] 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 var buf [8]byte
_, err := unix.Read(int(fd), buf[:]) _, err := unix.Read(int(efd), buf[:])
return err return err
} }