update

Author: root

go.mod

@@ -5,5 +5,6 @@ go 1.15
 require (
 	github.com/gin-gonic/gin v1.6.3
 	github.com/shirou/gopsutil/v3 v3.20.10
+	github.com/tidwall/gjson v1.6.3 // indirect
 	github.com/wonderivan/logger v1.0.0
 )

go.sum

@@ -36,6 +36,12 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/tidwall/gjson v1.6.3 h1:aHoiiem0dr7GHkW001T1SMTJ7X5PvyekH5WX0whWGnI=
+github.com/tidwall/gjson v1.6.3/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
+github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
+github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
+github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
+github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=

main.go

@@ -1,7 +1,10 @@
 package main
 
-import "pi-monitor/route"
+import (
+	"pi-monitor/service"
+)
 
 func main() {
-	route.Run()
+	service.GetCPU()
+	//route.Run()
 }

route/gin.go

@@ -2,6 +2,7 @@ package route
 
 import "github.com/gin-gonic/gin"
 
+//Server Server
 type Server struct {
 	Gin  *gin.Engine
 	Port string
@@ -12,11 +13,12 @@ var server *Server
 func init() {
 	server = &Server{
 		Gin:  gin.Default(),
-		Port: ":3000",
+		Port: ":4000",
 	}
 	route()
 }
 
+//Run Run
 func Run() {
 	server.Gin.Run(server.Port)
 }

route/route.go

@@ -1,9 +1,5 @@
 package route
 
-import (
-	"pi-monitor/service"
-)
-
 func route() {
-	server.Gin.GET("/", service.GetCPU)
+	//server.Gin.GET("/", service.GetCPU)
 }

service/cpu.go

@@ -1,17 +1,140 @@
 package service
 
 import (
-	"net/http"
+	"strconv"
+	"time"
 
-	"github.com/gin-gonic/gin"
 	"github.com/shirou/gopsutil/v3/cpu"
+	"github.com/shirou/gopsutil/v3/host"
 	"github.com/wonderivan/logger"
 )
 
-func GetCPU(c *gin.Context) {
-	info, err := cpu.Info()
+type CPU struct {
+	Cores   int
+	Threads int
+	Freq    *Freq
+	Load    *CPULoad
+	Temp    string
+}
+
+type Freq struct {
+	Maxfreq float64
+	Minfreq float64
+	Curfreq float64
+}
+
+type CPULoad struct {
+	Percent string
+	Idle    string
+	User    string
+	Sys     string
+	Nice    string
+	Iowait  string
+	Irq     string
+	Softirq string
+}
+
+var (
+	lastTimesStat cpu.TimesStat
+)
+
+//loadTimes 获取运行时间
+func loadTimes() cpu.TimesStat {
+	t, err := cpu.Times(false)
 	if err != nil {
 		logger.Error(err)
 	}
-	c.String(http.StatusOK, "%s", info)
+	return t[0]
+}
+
+//initLastTimes 初始化运行时间，以便第一次做比较时使用
+func initLastTimes() {
+	lastTimesStat = loadTimes()
+}
+
+//cpuload 获取占用率
+func cpuLoad() *CPULoad {
+	t := loadTimes()
+	last_total := lastTimesStat.User + lastTimesStat.System + lastTimesStat.Idle + lastTimesStat.Nice + lastTimesStat.Iowait + lastTimesStat.Irq + lastTimesStat.Softirq + lastTimesStat.Steal
+	cur_total := t.User + t.System + t.Idle + t.Nice + t.Iowait + t.Irq + t.Softirq + t.Steal
+	used_total := cur_total - last_total
+
+	cpuload := &CPULoad{
+		Percent: floatToString((1 - ((t.Idle - lastTimesStat.Idle) / used_total)) * 100),
+		Idle:    floatToString((t.Idle - lastTimesStat.Idle) / used_total * 100),
+		User:    floatToString((t.User - lastTimesStat.User) / used_total * 100),
+		Sys:     floatToString((t.System - lastTimesStat.System) / used_total * 100),
+		Nice:    floatToString((t.Nice - lastTimesStat.Nice) / used_total * 100),
+		Iowait:  floatToString((t.Iowait - lastTimesStat.Iowait) / used_total * 100),
+		Irq:     floatToString((t.Irq - lastTimesStat.Irq) / used_total * 100),
+		Softirq: floatToString((t.Softirq - lastTimesStat.Softirq) / used_total * 100),
+	}
+	lastTimesStat = t
+	return cpuload
+}
+
+func cpuTemperature() string {
+	temperatures, err := host.SensorsTemperatures()
+	if err != nil {
+		logger.Error(err)
+	}
+	return floatToString(temperatures[0].Temperature)
+}
+
+func cpuCount(logical bool) int {
+	c, err := cpu.Counts(logical)
+	if err != nil {
+		logger.Error(err)
+	}
+	return c
+}
+
+func getFreq(name string) float64 {
+	var lines []string
+	var err error
+	var freq float64
+	var value float64
+
+	lines, err = ReadLines("/sys/devices/system/cpu/cpu0/cpufreq/" + name)
+	if err != nil {
+		logger.Error(err)
+	}
+	value, err = strconv.ParseFloat(lines[0], 64)
+	if err != nil {
+		logger.Error(err)
+	}
+	freq = value / 1000.0
+	if freq > 9999 {
+		freq = freq / 1000.0 // value in Hz
+	}
+	return freq
+}
+
+func freq() *Freq {
+	f := &Freq{
+		Maxfreq: getFreq("cpuinfo_max_freq"),
+		Minfreq: getFreq("cpuinfo_min_freq"),
+		Curfreq: getFreq("cpuinfo_cur_freq"),
+	}
+	return f
+}
+
+func GetCPU() {
+	time.Sleep(time.Second)
+	for {
+		logger.Info(cpuLoad())
+		time.Sleep(time.Second)
+	}
+	cpu := &CPU{
+		Cores:   cpuCount(false),
+		Threads: cpuCount(false),
+		Freq:    freq(),
+		Load:    cpuLoad(),
+		Temp:    cpuTemperature(),
+	}
+	logger.Info(cpu.Cores)
+	logger.Info(cpu.Threads)
+	logger.Info(cpu.Freq)
+	logger.Info(cpu.Load)
+	logger.Info(cpu.Temp)
 }

service/host.go

@@ -0,0 +1,10 @@
+package service
+
+type Host struct {
+	Hostname string
+	IP       string
+	Uptime   string
+	OS       string
+	Kernal   string
+	Version  string
+}

service/init.go

@@ -0,0 +1,5 @@
+package service
+
+func init() {
+	initLastTimes()
+}

service/utils.go

@@ -0,0 +1,40 @@
+package service
+
+import (
+	"bufio"
+	"os"
+	"strconv"
+	"strings"
+)
+
+func floatToString(num float64) string {
+	return strconv.FormatFloat(num, 'f', 2, 64)
+}
+
+func ReadLines(filename string) ([]string, error) {
+	return ReadLinesOffsetN(filename, 0, -1)
+}
+
+func ReadLinesOffsetN(filename string, offset uint, n int) ([]string, error) {
+	f, err := os.Open(filename)
+	if err != nil {
+		return []string{""}, err
+	}
+	defer f.Close()
+
+	var ret []string
+
+	r := bufio.NewReader(f)
+	for i := 0; i < n+int(offset) || n < 0; i++ {
+		line, err := r.ReadString('\n')
+		if err != nil {
+			break
+		}
+		if i < int(offset) {
+			continue
+		}
+		ret = append(ret, strings.Trim(line, "\n"))
+	}
+
+	return ret, nil
+}