fix: change interval to ms and fix cpu out print

SonicCloudOrg · Jan 8, 2023 · 2ac49bf · 2ac49bf
1 parent 5de785e
commit 2ac49bf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/cmd/perfmon/process.go b/cmd/perfmon/process.go
@@ -43,7 +43,7 @@ var processPerfmonCmd = &cobra.Command{
 		}
 		sig := make(chan os.Signal, 1)
 		signal.Notify(sig, os.Interrupt, os.Kill)
-		timer := time.Tick(time.Duration(interval * int(time.Second)))
+		timer := time.Tick(time.Duration(interval * int(time.Millisecond)))
 		done := false
 		for !done {
 			select {
@@ -71,7 +71,7 @@ func initProcessPerfmon() {
 	processPerfmonCmd.Flags().StringVarP(&appName, "name", "n", "", "application name")
 	processPerfmonCmd.MarkFlagRequired("name")
 	processPerfmonCmd.Flags().StringVarP(&serial, "serial", "s", "", "device serial")
-	processPerfmonCmd.Flags().IntVarP(&interval, "interval", "i", 1, "data refresh time")
+	processPerfmonCmd.Flags().IntVarP(&interval, "interval", "i", 1000, "data refresh time")
 	processPerfmonCmd.Flags().BoolVarP(&isJson, "json", "j", false, "convert to JSON string")
 	processPerfmonCmd.Flags().BoolVarP(&isFormat, "format", "f", false, "convert to JSON string and format")
 }
diff --git a/cmd/perfmon/system.go b/cmd/perfmon/system.go
@@ -37,7 +37,7 @@ var systemPerfmonCmd = &cobra.Command{
 		sig := make(chan os.Signal, 1)
 		signal.Notify(sig, os.Interrupt, os.Kill)
 
-		timer := time.Tick(time.Duration(interval * int(time.Second)))
+		timer := time.Tick(time.Duration(interval * int(time.Millisecond)))
 		done := false
 		for !done {
 			select {
@@ -56,7 +56,7 @@ var systemPerfmonCmd = &cobra.Command{
 func initSystemPerfmon() {
 	perfmonRootCMD.AddCommand(systemPerfmonCmd)
 	systemPerfmonCmd.Flags().StringVarP(&serial, "serial", "s", "", "device serial")
-	systemPerfmonCmd.Flags().IntVarP(&interval, "interval", "i", 1, "data refresh time")
+	systemPerfmonCmd.Flags().IntVarP(&interval, "interval", "i", 1000, "data refresh time")
 	systemPerfmonCmd.Flags().BoolVarP(&isJson, "json", "j", false, "convert to JSON string")
 	systemPerfmonCmd.Flags().BoolVarP(&isFormat, "format", "f", false, "convert to JSON string and format")
 }
diff --git a/src/entity/system.go b/src/entity/system.go
@@ -112,6 +112,7 @@ Memory:
 				escBrightWhite, v.Guest, escReset,
 			)
 		}
+		result += "\n"
 	}
 
 	if len(stats.NetworkInfo) > 0 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,6 +112,7 @@ Memory: @@
     				escBrightWhite, v.Guest, escReset,
     			)
     		}
+    		result += "\n"
     	}
     	if len(stats.NetworkInfo) > 0 {
@@ Expand Down @@