Changeset 12521 for trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs

Timestamp:

06/26/15 11:16:48 (9 years ago)

Author:

dglaser

Message:

#2394:

HeuristicLab.Services.WebApp.Status-3.3:

• changed the DataController to return memory in kb instead of gb
• fixed the memory rounding error

File:

• trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataController.cs

@@ -73 +73 @@
         var activeSlaves = onlineSlaves.Where(s => s.IsAllowedToCalculate).ToList();
         var calculatingSlaves = activeSlaves.Where(s => s.SlaveState == SlaveState.Calculating).ToList();
-        int calculatingMemory = calculatingSlaves.Any() ? (int)calculatingSlaves.Sum(s => s.Memory) / 1024 : 0;
-        int freeCalculatingMemory = calculatingSlaves.Any() ? (int)calculatingSlaves.Sum(s => s.FreeMemory) / 1024 : 0;
+        int calculatingMemory = calculatingSlaves.Any() ? (int)calculatingSlaves.Sum(s => s.Memory) : 0;
+        int freeCalculatingMemory = calculatingSlaves.Any() ? (int)calculatingSlaves.Sum(s => s.FreeMemory) : 0;
 
         return new DTO.Status {
@@ -95 +95 @@
           },
           MemoryStatus = new DTO.MemoryStatus {
-            TotalMemory = onlineSlaves.Any() ? (int)onlineSlaves.Sum(s => s.Memory) / 1024 : 0,
-            FreeMemory = onlineSlaves.Any() ? (int)onlineSlaves.Sum(s => s.FreeMemory) / 1024 : 0,
-            ActiveMemory = activeSlaves.Any() ? (int)activeSlaves.Sum(s => s.Memory) / 1024 : 0,
+            TotalMemory = onlineSlaves.Any() ? (int)onlineSlaves.Sum(s => s.Memory) : 0,
+            FreeMemory = onlineSlaves.Any() ? (int)onlineSlaves.Sum(s => s.FreeMemory) : 0,
+            ActiveMemory = activeSlaves.Any() ? (int)activeSlaves.Sum(s => s.Memory) : 0,
             UsedMemory = calculatingMemory - freeCalculatingMemory
           },
@@ -109 +109 @@
             Cores = x.Cores ?? 0,
             FreeCores = x.FreeCores ?? 0,
-            Memory = (x.Memory ?? 0) / 1024,
-            FreeMemory = (x.FreeMemory ?? 0) / 1024,
+            Memory = x.Memory ?? 0,
+            FreeMemory = x.FreeMemory ?? 0,
             IsAllowedToCalculate = x.IsAllowedToCalculate,
             State = x.SlaveState.ToString()
@@ -149 +149 @@
                                                              ? statistic.SlaveStatistics.Average(x => x.CpuUtilization)
                                                              : 0.0;
-          status.MemoryStatus.TotalMemory += statistic.SlaveStatistics.Sum(x => x.Memory) / 1024;
-          freeMemory += statistic.SlaveStatistics.Sum(x => x.FreeMemory) / 1024;
+          status.MemoryStatus.TotalMemory += statistic.SlaveStatistics.Sum(x => x.Memory);
+          freeMemory += statistic.SlaveStatistics.Sum(x => x.FreeMemory);
           if (i >= increment) {
             status.Timestamp = JavascriptUtils.ToTimestamp(statistic.Timestamp);