85 lines
2.6 KiB
Diff
85 lines
2.6 KiB
Diff
diff --git a/vendor/github.com/prometheus/procfs/cpuinfo.go b/vendor/github.com/prometheus/procfs/cpuinfo.go
|
|
index 31d42f7..02693d1 100644
|
|
--- a/vendor/github.com/prometheus/procfs/cpuinfo.go
|
|
+++ b/vendor/github.com/prometheus/procfs/cpuinfo.go
|
|
@@ -19,6 +19,7 @@ import (
|
|
"bufio"
|
|
"bytes"
|
|
"errors"
|
|
+ "fmt"
|
|
"regexp"
|
|
"strconv"
|
|
"strings"
|
|
@@ -407,6 +408,46 @@ func parseCPUInfoPPC(info []byte) ([]CPUInfo, error) {
|
|
return cpuinfo, nil
|
|
}
|
|
|
|
+func parseCPUInfoRISCV(info []byte) ([]CPUInfo, error) {
|
|
+ scanner := bufio.NewScanner(bytes.NewReader(info))
|
|
+
|
|
+ firstLine := firstNonEmptyLine(scanner)
|
|
+ if !strings.HasPrefix(firstLine, "processor") || !strings.Contains(firstLine, ":") {
|
|
+ return nil, fmt.Errorf("invalid cpuinfo file: %q", firstLine)
|
|
+ }
|
|
+ field := strings.SplitN(firstLine, ": ", 2)
|
|
+ v, err := strconv.ParseUint(field[1], 0, 32)
|
|
+ if err != nil {
|
|
+ return nil, err
|
|
+ }
|
|
+ firstcpu := CPUInfo{Processor: uint(v)}
|
|
+ cpuinfo := []CPUInfo{firstcpu}
|
|
+ i := 0
|
|
+
|
|
+ for scanner.Scan() {
|
|
+ line := scanner.Text()
|
|
+ if !strings.Contains(line, ":") {
|
|
+ continue
|
|
+ }
|
|
+ field := strings.SplitN(line, ": ", 2)
|
|
+ switch strings.TrimSpace(field[0]) {
|
|
+ case "processor":
|
|
+ v, err := strconv.ParseUint(field[1], 0, 32)
|
|
+ if err != nil {
|
|
+ return nil, err
|
|
+ }
|
|
+ i = int(v)
|
|
+ cpuinfo = append(cpuinfo, CPUInfo{}) // start of the next processor
|
|
+ cpuinfo[i].Processor = uint(v)
|
|
+ case "hart":
|
|
+ cpuinfo[i].CoreID = field[1]
|
|
+ case "isa":
|
|
+ cpuinfo[i].ModelName = field[1]
|
|
+ }
|
|
+ }
|
|
+ return cpuinfo, nil
|
|
+}
|
|
+
|
|
// firstNonEmptyLine advances the scanner to the first non-empty line
|
|
// and returns the contents of that line
|
|
func firstNonEmptyLine(scanner *bufio.Scanner) string {
|
|
diff --git a/vendor/github.com/prometheus/procfs/cpuinfo_riscvx.go b/vendor/github.com/prometheus/procfs/cpuinfo_riscvx.go
|
|
new file mode 100644
|
|
index 0000000..e83c2e2
|
|
--- /dev/null
|
|
+++ b/vendor/github.com/prometheus/procfs/cpuinfo_riscvx.go
|
|
@@ -0,0 +1,19 @@
|
|
+// Copyright 2020 The Prometheus Authors
|
|
+// Licensed under the Apache License, Version 2.0 (the "License");
|
|
+// you may not use this file except in compliance with the License.
|
|
+// You may obtain a copy of the License at
|
|
+//
|
|
+// http://www.apache.org/licenses/LICENSE-2.0
|
|
+//
|
|
+// Unless required by applicable law or agreed to in writing, software
|
|
+// distributed under the License is distributed on an "AS IS" BASIS,
|
|
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
+// See the License for the specific language governing permissions and
|
|
+// limitations under the License.
|
|
+
|
|
+// +build linux
|
|
+// +build riscv riscv64
|
|
+
|
|
+package procfs
|
|
+
|
|
+var parseCPUInfo = parseCPUInfoRISCV
|