#43 Removed unused memory status

open-simulation-platform · Dec 21, 2018 · 0f0230e · 0f0230e
1 parent 66d57e6
commit 0f0230e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/cse/cse.go b/cse/cse.go
@@ -8,7 +8,6 @@ import (
 	"cse-server-go/metadata"
 	"cse-server-go/structs"
 	"fmt"
-	"github.com/shirou/gopsutil/mem"
 	"io/ioutil"
 	"log"
 	"math"
@@ -424,7 +423,6 @@ func GetSignalValue(module string, cardinality string, signal string) int {
 func SimulationStatus(simulationStatus *structs.SimulationStatus, sim *Simulation) structs.JsonResponse {
 	simulationStatus.Mutex.Lock()
 	defer simulationStatus.Mutex.Unlock()
-	virtualMemoryStats, _ := mem.VirtualMemory()
 	if simulationStatus.Loaded {
 		execStatus := getExecutionStatus(sim.Execution)
 		return structs.JsonResponse{
@@ -437,7 +435,6 @@ func SimulationStatus(simulationStatus *structs.SimulationStatus, sim *Simulatio
 			Status:               simulationStatus.Status,
 			ConfigDir:            simulationStatus.ConfigDir,
 			TrendSignals:         simulationStatus.TrendSignals,
-			Memory:               virtualMemoryStats,
 		}
 	} else {
 		return structs.JsonResponse{

diff --git a/structs/structs.go b/structs/structs.go
@@ -1,7 +1,6 @@
 package structs
 
 import (
-	"github.com/shirou/gopsutil/mem"
 	"sync"
 )
 
@@ -18,15 +17,14 @@ type Module struct {
 }
 
 type JsonResponse struct {
-	Loaded               bool     `json:"loaded"`
-	SimulationTime       float64  `json:"time"`
-	RealTimeFactor       float64  `json:"realTimeFactor"`
-	IsRealTimeSimulation bool     `json:"isRealTime"`
-	ConfigDir            string   `json:"configDir,omitempty"`
-	Status               string   `json:"status,omitempty"`
-	Modules              []string `json:"modules"`
-	Module               Module   `json:"module,omitempty"`
-	Memory               *mem.VirtualMemoryStat
+	Loaded               bool          `json:"loaded"`
+	SimulationTime       float64       `json:"time"`
+	RealTimeFactor       float64       `json:"realTimeFactor"`
+	IsRealTimeSimulation bool          `json:"isRealTime"`
+	ConfigDir            string        `json:"configDir,omitempty"`
+	Status               string        `json:"status,omitempty"`
+	Modules              []string      `json:"modules"`
+	Module               Module        `json:"module,omitempty"`
 	TrendSignals         []TrendSignal `json:"trend-values"`
 }