feat(linux): add procPeak measurement for peak thread count in the co…

…ntainer Linux kernel >= 6.1 && cgroup v2 only
criyle · Feb 20, 2025 · efa629a · efa629a
1 parent 9dc3380
commit efa629a
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 4 deletions.
diff --git a/README.cn.md b/README.cn.md
@@ -161,6 +161,7 @@ interface Result {
     exitStatus: number; // 程序返回值
     time: number;   // 程序运行 CPU 时间，单位纳秒
     memory: number; // 程序运行内存，单位 byte
+    procPeak?: number; // 程序运行最大线程数量（需要内核版本>=6.1，且开启 cgroup v2）
     runTime: number; // 程序运行现实时间，单位纳秒
     // copyOut 和 pipeCollector 指定的文件内容
     files?: {[name:string]:string};

diff --git a/README.md b/README.md
@@ -167,6 +167,7 @@ interface Result {
     time: number;   // ns (cgroup recorded time)
     memory: number; // byte
     runTime: number; // ns (wall clock time)
+    procPeak?: number; // peak number of process (cgroup v2, kernel >= 6.1)
     // copyFile name -> content
     files?: {[name:string]:string};
     // copyFileCached name -> fileId

diff --git a/cmd/go-judge/main.go b/cmd/go-judge/main.go
@@ -551,6 +551,7 @@ func generateHandleVersion(conf *config.Config, builderParam map[string]any) fun
 			"symlink":           true,
 			"addressSpaceLimit": true,
 			"stream":            true,
+			"procPeak":          true,
 		})
 	}
 }
@@ -563,6 +564,7 @@ func generateHandleConfig(conf *config.Config, builderParam map[string]any) func
 			"symlink":           true,
 			"addressSpaceLimit": true,
 			"stream":            true,
+			"procPeak":          true,
 			"fileStorePath":     conf.Dir,
 			"runnerConfig":      builderParam,
 		})

diff --git a/cmd/go-judge/model/model.go b/cmd/go-judge/model/model.go
@@ -113,6 +113,7 @@ type Result struct {
 	Time       uint64            `json:"time"`
 	Memory     uint64            `json:"memory"`
 	RunTime    uint64            `json:"runTime"`
+	ProcPeak   uint64            `json:"procPeak,omitempty"`
 	Files      map[string]string `json:"files,omitempty"`
 	FileIDs    map[string]string `json:"fileIds,omitempty"`
 	FileError  []FileError       `json:"fileError,omitempty"`
@@ -128,6 +129,7 @@ func (r Result) String() string {
 		Error      string
 		Time       time.Duration
 		RunTime    time.Duration
+		ProcPeak   uint64
 		Memory     envexec.Size
 		Files      map[string]string
 		FileIDs    map[string]string
@@ -140,6 +142,7 @@ func (r Result) String() string {
 		Time:       time.Duration(r.Time),
 		RunTime:    time.Duration(r.RunTime),
 		Memory:     envexec.Size(r.Memory),
+		ProcPeak:   r.ProcPeak,
 		Files:      make(map[string]string),
 		FileIDs:    r.FileIDs,
 		FileError:  r.FileError,
@@ -250,6 +253,7 @@ func convertResult(r worker.Result, mmap bool) (Result, error) {
 		Time:       uint64(r.Time),
 		RunTime:    uint64(r.RunTime),
 		Memory:     uint64(r.Memory),
+		ProcPeak:   r.ProcPeak,
 		FileIDs:    r.FileIDs,
 		FileError:  r.FileError,
 	}

diff --git a/env/linuxcontainer/cgroup_wrapper_linux.go b/env/linuxcontainer/cgroup_wrapper_linux.go
@@ -48,6 +48,10 @@ func (c *wCgroup) MaxMemory() (envexec.Size, error) {
 	return envexec.Size(s), err
 }
 
+func (c *wCgroup) ProcPeak() (uint64, error) {
+	return c.cg.ProcessPeak()
+}
+
 func (c *wCgroup) AddProc(pid int) error {
 	return c.cg.AddProc(pid)
 }

diff --git a/env/linuxcontainer/cgrouppool_linux.go b/env/linuxcontainer/cgrouppool_linux.go
@@ -17,6 +17,7 @@ type Cgroup interface {
 	CPUUsage() (time.Duration, error)
 	CurrentMemory() (envexec.Size, error)
 	MaxMemory() (envexec.Size, error)
+	ProcPeak() (uint64, error)
 
 	AddProc(int) error
 	Reset() error

diff --git a/env/linuxcontainer/envprocess_linux.go b/env/linuxcontainer/envprocess_linux.go
@@ -42,6 +42,9 @@ func (p *process) collectUsage() {
 	if m, err := p.cg.MaxMemory(); err == nil && m > 0 {
 		p.rt.Memory = m
 	}
+	if pp, err := p.cg.ProcPeak(); err == nil && pp > 0 {
+		p.rt.ProcPeak = pp
+	}
 }
 
 func (p *process) Done() <-chan struct{} {

diff --git a/envexec/cmd.go b/envexec/cmd.go
@@ -75,9 +75,10 @@ type Result struct {
 
 	Error string // error
 
-	Time    time.Duration
-	RunTime time.Duration
-	Memory  Size // byte
+	Time     time.Duration
+	RunTime  time.Duration
+	Memory   Size   // byte
+	ProcPeak uint64 // maximum processes ever running
 
 	// Files stores copy out files
 	Files map[string]*os.File

diff --git a/envexec/run_single.go b/envexec/run_single.go
@@ -39,6 +39,7 @@ func runSingle(pc context.Context, c *Cmd, fds []*os.File, ptc []pipeCollector,
 		Time:       rt.Time,
 		RunTime:    rt.RunningTime,
 		Memory:     rt.Memory,
+		ProcPeak:   rt.ProcPeak,
 		Files:      files,
 		FileError:  fe,
 	}

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.23
 require (
 	github.com/coreos/go-systemd/v22 v22.5.0
 	github.com/creack/pty v1.1.24
-	github.com/criyle/go-sandbox v0.10.7
+	github.com/criyle/go-sandbox v0.10.8
 	github.com/elastic/go-seccomp-bpf v1.5.0
 	github.com/elastic/go-ucfg v0.8.8
 	github.com/gin-contrib/zap v1.1.4

diff --git a/go.sum b/go.sum
@@ -20,6 +20,8 @@ github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/criyle/go-sandbox v0.10.7 h1:KTBzdzkCCu0mV+JE4fb00WUmvV0qMo6zG91wLDWb9Ew=
 github.com/criyle/go-sandbox v0.10.7/go.mod h1:9IZSv7cxcDkVaPSRufhMPLUg+7M7lTPAt8hjd/iMKFo=
+github.com/criyle/go-sandbox v0.10.8 h1:A99ywIJfgeiW5byzRR2kXB4a3YbwV7Wkc4lLTfNP33o=
+github.com/criyle/go-sandbox v0.10.8/go.mod h1:9IZSv7cxcDkVaPSRufhMPLUg+7M7lTPAt8hjd/iMKFo=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

diff --git a/worker/model.go b/worker/model.go
@@ -59,6 +59,7 @@ type Result struct {
 	Time       time.Duration
 	RunTime    time.Duration
 	Memory     Size
+	ProcPeak   uint64
 	Files      map[string]*os.File
 	FileIDs    map[string]string
 	FileError  []FileError
@@ -79,6 +80,7 @@ func (r Result) String() string {
 		Time       time.Duration
 		RunTime    time.Duration
 		Memory     Size
+		ProcPeak   uint64
 		Files      map[string]string
 		FileIDs    map[string]string
 		FileError  []FileError
@@ -90,6 +92,7 @@ func (r Result) String() string {
 		Time:       r.Time,
 		RunTime:    r.RunTime,
 		Memory:     r.Memory,
+		ProcPeak:   r.ProcPeak,
 		Files:      make(map[string]string),
 		FileIDs:    r.FileIDs,
 		FileError:  r.FileError,

diff --git a/worker/worker.go b/worker/worker.go
@@ -263,6 +263,7 @@ func (w *worker) convertResult(result envexec.Result, cmd Cmd) (res Result) {
 	res.Time = result.Time
 	res.RunTime = result.RunTime
 	res.Memory = result.Memory
+	res.ProcPeak = result.ProcPeak
 	res.FileError = result.FileError
 	res.Files = make(map[string]*os.File)
 	res.FileIDs = make(map[string]string)