cpuinfo: read data in place

Instead of reading the data to the buffer, then making a reader and a
scanner out of that buffer, let's analyze the data as we read it line by
line.

Signed-off-by: Kir Kolyshkin <[email protected]>

Author: kolyshkin

cpuinfo.go

@@ -17,13 +17,12 @@ package procfs
 
 import (
 	"bufio"
-	"bytes"
 	"errors"
+	"io"
+	"os"
 	"regexp"
 	"strconv"
 	"strings"
-
-	"github.com/prometheus/procfs/internal/util"
 )
 
 // CPUInfo contains general information about a system CPU found in /proc/cpuinfo
@@ -64,15 +63,16 @@ var (
 // CPUInfo returns information about current system CPUs.
 // See https://www.kernel.org/doc/Documentation/filesystems/proc.txt
 func (fs FS) CPUInfo() ([]CPUInfo, error) {
-	data, err := util.ReadFileNoStat(fs.proc.Path("cpuinfo"))
+	file, err := os.Open(fs.proc.Path("cpuinfo"))
 	if err != nil {
 		return nil, err
 	}
-	return parseCPUInfo(data)
+	defer file.Close()
+	return parseCPUInfo(file)
 }
 
-func parseCPUInfoX86(info []byte) ([]CPUInfo, error) {
-	scanner := bufio.NewScanner(bytes.NewReader(info))
+func parseCPUInfoX86(info io.Reader) ([]CPUInfo, error) {
+	scanner := bufio.NewScanner(info)
 
 	// find the first "processor" line
 	firstLine := firstNonEmptyLine(scanner)
@@ -186,8 +186,8 @@ func parseCPUInfoX86(info []byte) ([]CPUInfo, error) {
 	return cpuinfo, nil
 }
 
-func parseCPUInfoARM(info []byte) ([]CPUInfo, error) {
-	scanner := bufio.NewScanner(bytes.NewReader(info))
+func parseCPUInfoARM(info io.Reader) ([]CPUInfo, error) {
+	scanner := bufio.NewScanner(info)
 
 	cpuinfo := []CPUInfo{{}}
 	i := 0
@@ -236,8 +236,8 @@ func parseCPUInfoARM(info []byte) ([]CPUInfo, error) {
 	return cpuinfo, nil
 }
 
-func parseCPUInfoS390X(info []byte) ([]CPUInfo, error) {
-	scanner := bufio.NewScanner(bytes.NewReader(info))
+func parseCPUInfoS390X(info io.Reader) ([]CPUInfo, error) {
+	scanner := bufio.NewScanner(info)
 
 	firstLine := firstNonEmptyLine(scanner)
 	if !strings.HasPrefix(firstLine, "vendor_id") || !strings.Contains(firstLine, ":") {
@@ -304,8 +304,8 @@ func parseCPUInfoS390X(info []byte) ([]CPUInfo, error) {
 	return cpuinfo, nil
 }
 
-func parseCPUInfoPPC(info []byte) ([]CPUInfo, error) {
-	scanner := bufio.NewScanner(bytes.NewReader(info))
+func parseCPUInfoPPC(info io.Reader) ([]CPUInfo, error) {
+	scanner := bufio.NewScanner(info)
 
 	firstLine := firstNonEmptyLine(scanner)
 	if !strings.HasPrefix(firstLine, "processor") || !strings.Contains(firstLine, ":") {

cpuinfo_test.go

@@ -15,7 +15,10 @@
 
 package procfs
 
-import "testing"
+import (
+	"strings"
+	"testing"
+)
 
 const (
 	// non-SMP system before kernel v3.8, commit
@@ -177,7 +180,7 @@ func TestCPUInfoX86(t *testing.T) {
 }
 
 func TestCPUInfoParseARM6(t *testing.T) {
-	cpuinfo, err := parseCPUInfoARM([]byte(cpuinfoArm6))
+	cpuinfo, err := parseCPUInfoARM(strings.NewReader(cpuinfoArm6))
 	if err != nil || cpuinfo == nil {
 		t.Fatalf("unable to parse arm cpu info: %v", err)
 	}
@@ -192,7 +195,7 @@ func TestCPUInfoParseARM6(t *testing.T) {
 	}
 }
 func TestCPUInfoParseARM7old(t *testing.T) {
-	cpuinfo, err := parseCPUInfoARM([]byte(cpuinfoArm7old))
+	cpuinfo, err := parseCPUInfoARM(strings.NewReader(cpuinfoArm7old))
 	if err != nil || cpuinfo == nil {
 		t.Fatalf("unable to parse arm cpu info: %v", err)
 	}
@@ -208,7 +211,7 @@ func TestCPUInfoParseARM7old(t *testing.T) {
 }
 
 func TestCPUInfoParseARM(t *testing.T) {
-	cpuinfo, err := parseCPUInfoARM([]byte(cpuinfoArm7))
+	cpuinfo, err := parseCPUInfoARM(strings.NewReader(cpuinfoArm7))
 	if err != nil || cpuinfo == nil {
 		t.Fatalf("unable to parse arm cpu info: %v", err)
 	}
@@ -223,7 +226,7 @@ func TestCPUInfoParseARM(t *testing.T) {
 	}
 }
 func TestCPUInfoParseS390X(t *testing.T) {
-	cpuinfo, err := parseCPUInfoS390X([]byte(cpuinfoS390x))
+	cpuinfo, err := parseCPUInfoS390X(strings.NewReader(cpuinfoS390x))
 	if err != nil || cpuinfo == nil {
 		t.Fatalf("unable to parse s390x cpu info: %v", err)
 	}
@@ -242,7 +245,7 @@ func TestCPUInfoParseS390X(t *testing.T) {
 }
 
 func TestCPUInfoParsePPC(t *testing.T) {
-	cpuinfo, err := parseCPUInfoPPC([]byte(cpuinfoPpc64))
+	cpuinfo, err := parseCPUInfoPPC(strings.NewReader(cpuinfoPpc64))
 	if err != nil || cpuinfo == nil {
 		t.Fatalf("unable to parse ppc cpu info: %v", err)
 	}