runtime/v2/shim: remove unused SetScore() and remove sys.OOMScoreMaxKillable

thaJeztah · thaJeztah · commit 7bb73da6b9f1 · 2021-04-07T19:16:58.000+02:00
The shim.SetScore() utility was no longer used since 7dfc605. Checking for uses outside of this repository, I found only one external use of this in gVisor; https://github.com/google/gvisor/blob/a9441aea2780da8c93da1c73da860219f98438de/pkg/shim/service.go#L262-L264 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/runtime/v2/shim/util_unix.go b/runtime/v2/shim/util_unix.go
@@ -46,11 +46,6 @@ func getSysProcAttr() *syscall.SysProcAttr {
 	}
 }
 
-// SetScore sets the oom score for a process
-func SetScore(pid int) error {
-	return sys.SetOOMScore(pid, sys.OOMScoreMaxKillable)
-}
-
 // AdjustOOMScore sets the OOM score for the process to the parents OOM score +1
 // to ensure that they parent has a lower* score than the shim
 // if not already at the maximum OOM Score
diff --git a/sys/oom_linux.go b/sys/oom_linux.go
@@ -28,8 +28,6 @@ import (
 )
 
 const (
-	// OOMScoreMaxKillable is the maximum score keeping the process killable by the oom killer
-	OOMScoreMaxKillable = -999
 	// OOMScoreAdjMin is from OOM_SCORE_ADJ_MIN https://github.com/torvalds/linux/blob/v5.10/include/uapi/linux/oom.h#L9
 	OOMScoreAdjMin = -1000
 	// OOMScoreAdjMax is from OOM_SCORE_ADJ_MAX https://github.com/torvalds/linux/blob/v5.10/include/uapi/linux/oom.h#L10

Original file line number	Diff line number	Diff line change
`@@ -46,11 +46,6 @@ func getSysProcAttr() *syscall.SysProcAttr {`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`-// SetScore sets the oom score for a process`
`50`		`-func SetScore(pid int) error {`
`51`		`- return sys.SetOOMScore(pid, sys.OOMScoreMaxKillable)`
`52`		`-}`
`53`		`-`
`54`	`49`	`// AdjustOOMScore sets the OOM score for the process to the parents OOM score +1`
`55`	`50`	`// to ensure that they parent has a lower* score than the shim`
`56`	`51`	`// if not already at the maximum OOM Score`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,6 @@ import (`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`const (`
`31`		`- // OOMScoreMaxKillable is the maximum score keeping the process killable by the oom killer`
`32`		`- OOMScoreMaxKillable = -999`
`33`	`31`	`// OOMScoreAdjMin is from OOM_SCORE_ADJ_MIN https://github.com/torvalds/linux/blob/v5.10/include/uapi/linux/oom.h#L9`
`34`	`32`	`OOMScoreAdjMin = -1000`
`35`	`33`	`// OOMScoreAdjMax is from OOM_SCORE_ADJ_MAX https://github.com/torvalds/linux/blob/v5.10/include/uapi/linux/oom.h#L10`