platform pagesize (#936)

livekit · Jan 6, 2025 · 83e359f · 83e359f
1 parent 409558f
commit 83e359f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/utils/hwstats/cpu.go b/utils/hwstats/cpu.go
@@ -20,7 +20,6 @@ import (
 	"github.com/frostbyte73/core"
 	"github.com/prometheus/procfs"
 	"go.uber.org/atomic"
-	"golang.org/x/sys/unix"
 
 	"github.com/livekit/protocol/logger"
 )
@@ -129,10 +128,7 @@ func (c *CPUStats) monitorCPULoad() {
 
 func (c *CPUStats) monitorProcesses() {
 	numCPU := c.platform.numCPU()
-	pageSize := unix.Getpagesize()
-	if pageSize == 0 {
-		pageSize = 4096
-	}
+	pageSize := getPageSize()
 
 	fs, err := procfs.NewFS(procfs.DefaultMountPoint)
 	if err != nil {

diff --git a/utils/hwstats/cpu_darwin.go b/utils/hwstats/cpu_darwin.go
@@ -20,6 +20,7 @@ import (
 	"runtime"
 
 	"github.com/prometheus/procfs"
+	"golang.org/x/sys/unix"
 )
 
 func newPlatformCPUMonitor() (platformCPUMonitor, error) {
@@ -29,3 +30,7 @@ func newPlatformCPUMonitor() (platformCPUMonitor, error) {
 func getHostCPUCount(fs procfs.FS) (float64, error) {
 	return float64(runtime.NumCPU()), nil
 }
+
+func getPageSize() int {
+	return unix.Getpagesize()
+}
diff --git a/utils/hwstats/cpu_linux.go b/utils/hwstats/cpu_linux.go
@@ -26,6 +26,7 @@ import (
 	"time"
 
 	"github.com/prometheus/procfs"
+	"golang.org/x/sys/unix"
 
 	"github.com/livekit/protocol/logger"
 )
@@ -270,3 +271,7 @@ func getHostCPUCount(fs procfs.FS) (float64, error) {
 	}
 	return float64(len(cpuInfo)), nil
 }
+
+func getPageSize() int {
+	return unix.Getpagesize()
+}
diff --git a/utils/hwstats/cpu_null.go b/utils/hwstats/cpu_null.go
@@ -42,3 +42,7 @@ func newPlatformCPUMonitor() (platformCPUMonitor, error) {
 func getHostCPUCount(fs procfs.FS) (float64, error) {
 	return float64(runtime.NumCPU()), nil
 }
+
+func getPageSize() int {
+	return 4096
+}