refactor: move CPUType to cpu.go

Author: lufia

cpu.go

@@ -1,8 +1,11 @@
 package stats
 
 import (
+	"bufio"
+	"bytes"
 	"context"
 	"errors"
+	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
@@ -12,6 +15,96 @@ import (
 	"time"
 )
 
+// CPUType represents /dev/cputype.
+type CPUType struct {
+	Name  string
+	Clock int // clock rate in MHz
+}
+
+func ReadCPUType(ctx context.Context, opts ...Option) (*CPUType, error) {
+	cfg := newConfig(opts...)
+	var c CPUType
+	if err := readCPUType(cfg.rootdir, &c); err != nil {
+		return nil, err
+	}
+	return &c, nil
+}
+
+type SysStats struct {
+	ID           int
+	NumCtxSwitch int64
+	NumInterrupt int64
+	NumSyscall   int64
+	NumFault     int64
+	NumTLBFault  int64
+	NumTLBPurge  int64
+	LoadAvg      int64 // in units of milli-CPUs and is decayed over time
+	Idle         int   // percentage
+	Interrupt    int   // percentage
+}
+
+// ReadSysStats reads system statistics from /dev/sysstat.
+func ReadSysStats(ctx context.Context, opts ...Option) ([]*SysStats, error) {
+	cfg := newConfig(opts...)
+	file := filepath.Join(cfg.rootdir, "/dev/sysstat")
+	f, err := os.Open(file)
+	if err != nil {
+		return nil, err
+	}
+	defer f.Close()
+
+	scanner := bufio.NewScanner(f)
+	var stats []*SysStats
+	for scanner.Scan() {
+		a := strings.Fields(scanner.Text())
+		if len(a) != 10 {
+			continue
+		}
+		var (
+			p    intParser
+			stat SysStats
+		)
+		stat.ID = p.ParseInt(a[0], 10)
+		stat.NumCtxSwitch = p.ParseInt64(a[1], 10)
+		stat.NumInterrupt = p.ParseInt64(a[2], 10)
+		stat.NumSyscall = p.ParseInt64(a[3], 10)
+		stat.NumFault = p.ParseInt64(a[4], 10)
+		stat.NumTLBFault = p.ParseInt64(a[5], 10)
+		stat.NumTLBPurge = p.ParseInt64(a[6], 10)
+		stat.LoadAvg = p.ParseInt64(a[7], 10)
+		stat.Idle = p.ParseInt(a[8], 10)
+		stat.Interrupt = p.ParseInt(a[9], 10)
+		if err := p.Err(); err != nil {
+			return nil, err
+		}
+		stats = append(stats, &stat)
+	}
+	if err := scanner.Err(); err != nil {
+		return nil, err
+	}
+	return stats, nil
+}
+
+func readCPUType(rootdir string, c *CPUType) error {
+	file := filepath.Join(rootdir, "/dev/cputype")
+	b, err := ioutil.ReadFile(file)
+	if err != nil {
+		return err
+	}
+	b = bytes.TrimSpace(b)
+	i := bytes.LastIndexByte(b, ' ')
+	if i < 0 {
+		return fmt.Errorf("%s: invalid format", file)
+	}
+	clock, err := strconv.Atoi(string(b[i+1:]))
+	if err != nil {
+		return err
+	}
+	c.Name = string(b[:i])
+	c.Clock = clock
+	return nil
+}
+
 // Time represents /dev/time.
 type Time struct {
 	Unix     time.Duration
@@ -106,6 +199,7 @@ func ReadCPUStats(ctx context.Context, opts ...Option) (*CPUStats, error) {
 	if err := readTime(file, &t); err != nil {
 		return nil, err
 	}
+	// TODO(lufia): In multi-processor host, Idle should multiple by core numbers.
 	stat.Idle = t.Uptime() - stat.User - stat.Sys
 	return &stat, nil
 }

doc.go

@@ -0,0 +1,2 @@
+// Package stats provides statistic utilities for Plan 9.
+package stats

host.go

@@ -1,4 +1,3 @@
-// Package stats provides statistic utilities for Plan 9.
 package stats
 
 import (
@@ -21,17 +20,10 @@ var (
 // Host represents host status.
 type Host struct {
 	Sysname    string
-	CPU        *CPUType
 	Storages   []*Storage
 	Interfaces []*Interface
 }
 
-// CPUType
-type CPUType struct {
-	Name  string
-	Clock int // clock rate in MHz
-}
-
 // MemStats represents the memory statistics.
 type MemStats struct {
 	Total       int64 // total memory in byte
@@ -185,12 +177,6 @@ func ReadHost(ctx context.Context, opts ...Option) (*Host, error) {
 	}
 	h.Sysname = name
 
-	cpu, err := readCPUType(cfg.rootdir)
-	if err != nil {
-		return nil, err
-	}
-	h.CPU = cpu
-
 	a, err := readStorages(cfg.rootdir)
 	if err != nil {
 		return nil, err
@@ -217,27 +203,6 @@ func readSysname(rootdir string) (string, error) {
 	return string(bytes.TrimSpace(b)), nil
 }
 
-func readCPUType(rootdir string) (*CPUType, error) {
-	file := filepath.Join(rootdir, "/dev/cputype")
-	b, err := ioutil.ReadFile(file)
-	if err != nil {
-		return nil, err
-	}
-	b = bytes.TrimSpace(b)
-	i := bytes.LastIndexByte(b, ' ')
-	if i < 0 {
-		return nil, fmt.Errorf("%s: invalid format", file)
-	}
-	clock, err := strconv.Atoi(string(b[i+1:]))
-	if err != nil {
-		return nil, err
-	}
-	return &CPUType{
-		Name:  string(b[:i]),
-		Clock: clock,
-	}, nil
-}
-
 func readStorages(rootdir string) ([]*Storage, error) {
 	sdctl := filepath.Join(rootdir, "/dev/sdctl")
 	f, err := os.Open(sdctl)

host_test.go

@@ -15,10 +15,6 @@ func TestReadHost(t *testing.T) {
 	}
 	want := &Host{
 		Sysname: "gnot",
-		CPU: &CPUType{
-			Name:  "Core i7/Xeon",
-			Clock: 2403,
-		},
 		Storages: []*Storage{
 			&Storage{
 				Name:     "sdC0",

stats.go

@@ -8,61 +8,6 @@ import (
 	"strings"
 )
 
-type SysStats struct {
-	ID           int
-	NumCtxSwitch int64
-	NumInterrupt int64
-	NumSyscall   int64
-	NumFault     int64
-	NumTLBFault  int64
-	NumTLBPurge  int64
-	LoadAvg      int64 // in units of milli-CPUs and is decayed over time
-	Idle         int   // percentage
-	Interrupt    int   // percentage
-}
-
-// ReadSysStats reads system statistics from /dev/sysstat.
-func ReadSysStats(ctx context.Context, opts ...Option) ([]*SysStats, error) {
-	cfg := newConfig(opts...)
-	file := filepath.Join(cfg.rootdir, "/dev/sysstat")
-	f, err := os.Open(file)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	scanner := bufio.NewScanner(f)
-	var stats []*SysStats
-	for scanner.Scan() {
-		a := strings.Fields(scanner.Text())
-		if len(a) != 10 {
-			continue
-		}
-		var (
-			p    intParser
-			stat SysStats
-		)
-		stat.ID = p.ParseInt(a[0], 10)
-		stat.NumCtxSwitch = p.ParseInt64(a[1], 10)
-		stat.NumInterrupt = p.ParseInt64(a[2], 10)
-		stat.NumSyscall = p.ParseInt64(a[3], 10)
-		stat.NumFault = p.ParseInt64(a[4], 10)
-		stat.NumTLBFault = p.ParseInt64(a[5], 10)
-		stat.NumTLBPurge = p.ParseInt64(a[6], 10)
-		stat.LoadAvg = p.ParseInt64(a[7], 10)
-		stat.Idle = p.ParseInt(a[8], 10)
-		stat.Interrupt = p.ParseInt(a[9], 10)
-		if err := p.Err(); err != nil {
-			return nil, err
-		}
-		stats = append(stats, &stat)
-	}
-	if err := scanner.Err(); err != nil {
-		return nil, err
-	}
-	return stats, nil
-}
-
 type InterfaceStats struct {
 	PacketsReceived  int64 // in packets
 	Link             int   // link status