Merge pull request moby#4042 from thaJeztah/0.12_backport_windows_no_proc

Author: jedevc

executor/resources/sys.go

@@ -1,95 +1,9 @@
 package resources
 
-import (
-	"os"
-	"time"
-
-	"github.com/moby/buildkit/executor/resources/types"
-	"github.com/prometheus/procfs"
-)
+import "github.com/moby/buildkit/executor/resources/types"
 
 type SysSampler = Sub[*types.SysSample]
 
 func NewSysSampler() (*Sampler[*types.SysSample], error) {
-	procfs, err := procfs.NewDefaultFS()
-	if err != nil {
-		return nil, err
-	}
-
-	return NewSampler(2*time.Second, 20, func(tm time.Time) (*types.SysSample, error) {
-		return sampleSys(procfs, tm)
-	}), nil
-}
-
-func sampleSys(proc procfs.FS, tm time.Time) (*types.SysSample, error) {
-	stat, err := proc.Stat()
-	if err != nil {
-		return nil, err
-	}
-
-	s := &types.SysSample{
-		Timestamp_: tm,
-	}
-
-	s.CPUStat = &types.SysCPUStat{
-		User:      stat.CPUTotal.User,
-		Nice:      stat.CPUTotal.Nice,
-		System:    stat.CPUTotal.System,
-		Idle:      stat.CPUTotal.Idle,
-		Iowait:    stat.CPUTotal.Iowait,
-		IRQ:       stat.CPUTotal.IRQ,
-		SoftIRQ:   stat.CPUTotal.SoftIRQ,
-		Steal:     stat.CPUTotal.Steal,
-		Guest:     stat.CPUTotal.Guest,
-		GuestNice: stat.CPUTotal.GuestNice,
-	}
-
-	s.ProcStat = &types.ProcStat{
-		ContextSwitches:  stat.ContextSwitches,
-		ProcessCreated:   stat.ProcessCreated,
-		ProcessesRunning: stat.ProcessesRunning,
-	}
-
-	mem, err := proc.Meminfo()
-	if err != nil {
-		return nil, err
-	}
-
-	s.MemoryStat = &types.SysMemoryStat{
-		Total:     mem.MemTotal,
-		Free:      mem.MemFree,
-		Buffers:   mem.Buffers,
-		Cached:    mem.Cached,
-		Active:    mem.Active,
-		Inactive:  mem.Inactive,
-		Swap:      mem.SwapTotal,
-		Available: mem.MemAvailable,
-		Dirty:     mem.Dirty,
-		Writeback: mem.Writeback,
-		Slab:      mem.Slab,
-	}
-
-	if _, err := os.Lstat("/proc/pressure"); err != nil {
-		return s, nil
-	}
-
-	cp, err := parsePressureFile("/proc/pressure/cpu")
-	if err != nil {
-		return nil, err
-	}
-	s.CPUPressure = cp
-
-	mp, err := parsePressureFile("/proc/pressure/memory")
-	if err != nil {
-		return nil, err
-	}
-	s.MemoryPressure = mp
-
-	ip, err := parsePressureFile("/proc/pressure/io")
-	if err != nil {
-		return nil, err
-	}
-	s.IOPressure = ip
-
-	return s, nil
+	return newSysSampler()
 }

executor/resources/sys_linux.go

@@ -0,0 +1,93 @@
+package resources
+
+import (
+	"os"
+	"time"
+
+	"github.com/moby/buildkit/executor/resources/types"
+	"github.com/prometheus/procfs"
+)
+
+func newSysSampler() (*Sampler[*types.SysSample], error) {
+	pfs, err := procfs.NewDefaultFS()
+	if err != nil {
+		return nil, err
+	}
+
+	return NewSampler(2*time.Second, 20, func(tm time.Time) (*types.SysSample, error) {
+		return sampleSys(pfs, tm)
+	}), nil
+}
+
+func sampleSys(proc procfs.FS, tm time.Time) (*types.SysSample, error) {
+	stat, err := proc.Stat()
+	if err != nil {
+		return nil, err
+	}
+
+	s := &types.SysSample{
+		Timestamp_: tm,
+	}
+
+	s.CPUStat = &types.SysCPUStat{
+		User:      stat.CPUTotal.User,
+		Nice:      stat.CPUTotal.Nice,
+		System:    stat.CPUTotal.System,
+		Idle:      stat.CPUTotal.Idle,
+		Iowait:    stat.CPUTotal.Iowait,
+		IRQ:       stat.CPUTotal.IRQ,
+		SoftIRQ:   stat.CPUTotal.SoftIRQ,
+		Steal:     stat.CPUTotal.Steal,
+		Guest:     stat.CPUTotal.Guest,
+		GuestNice: stat.CPUTotal.GuestNice,
+	}
+
+	s.ProcStat = &types.ProcStat{
+		ContextSwitches:  stat.ContextSwitches,
+		ProcessCreated:   stat.ProcessCreated,
+		ProcessesRunning: stat.ProcessesRunning,
+	}
+
+	mem, err := proc.Meminfo()
+	if err != nil {
+		return nil, err
+	}
+
+	s.MemoryStat = &types.SysMemoryStat{
+		Total:     mem.MemTotal,
+		Free:      mem.MemFree,
+		Buffers:   mem.Buffers,
+		Cached:    mem.Cached,
+		Active:    mem.Active,
+		Inactive:  mem.Inactive,
+		Swap:      mem.SwapTotal,
+		Available: mem.MemAvailable,
+		Dirty:     mem.Dirty,
+		Writeback: mem.Writeback,
+		Slab:      mem.Slab,
+	}
+
+	if _, err := os.Lstat("/proc/pressure"); err != nil {
+		return s, nil
+	}
+
+	cp, err := parsePressureFile("/proc/pressure/cpu")
+	if err != nil {
+		return nil, err
+	}
+	s.CPUPressure = cp
+
+	mp, err := parsePressureFile("/proc/pressure/memory")
+	if err != nil {
+		return nil, err
+	}
+	s.MemoryPressure = mp
+
+	ip, err := parsePressureFile("/proc/pressure/io")
+	if err != nil {
+		return nil, err
+	}
+	s.IOPressure = ip
+
+	return s, nil
+}

executor/resources/sys_nolinux.go

@@ -0,0 +1,9 @@
+//go:build !linux
+
+package resources
+
+import "github.com/moby/buildkit/executor/resources/types"
+
+func newSysSampler() (*Sampler[*types.SysSample], error) {
+	return nil, nil
+}

solver/llbsolver/solver.go

@@ -416,8 +416,11 @@ func (s *Solver) Solve(ctx context.Context, id string, sessionID string, req fro
 
 	defer j.Discard()
 
-	usage := s.sysSampler.Record()
-	defer usage.Close(false)
+	var usage *resources.Sub[*resourcetypes.SysSample]
+	if s.sysSampler != nil {
+		usage = s.sysSampler.Record()
+		defer usage.Close(false)
+	}
 
 	var res *frontend.Result
 	var resProv *Result