Changeset 11259 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers

Timestamp:

08/04/14 13:01:40 (10 years ago)

Author:

mroscoe

Message:

 

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs (modified) (6 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.Statistics/3.3/Controllers/ChartDataController.cs

@@ -92 +92 @@
     }
 
-    public JsonResult CurrentCpuUtilization()
+    public JsonResult CurrentCpuUtilization(string state)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
@@ -102 +102 @@
                                on clients.ResourceId equals resource.ResourceId
                              where clients.ExpirationTime == null &&
-                             (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle)
+                             (state == "All") ||
+                             (state == "Online") &&
+                             (client.SlaveState == SlaveState.Idle || client.SlaveState == SlaveState.Calculating ) ||
+                             (state == "Available") &&
+                             (client.SlaveState == SlaveState.Idle)
                              select new { client.ClientId, client.CpuUtilization, client.Time })
                              .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList();
@@ -113 +117 @@
     }
 
-    public JsonResult CurrentCores()
+    public JsonResult CurrentCores(string state)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
@@ -123 +127 @@
                              on clients.ResourceId equals resource.ResourceId
                             where clients.ExpirationTime == null &&
-                            (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle)
+                            (state == "All") ||
+                            (state == "Online") &&
+                            (client.SlaveState == SlaveState.Idle || client.SlaveState == SlaveState.Calculating) ||
+                            (state == "Available") &&
+                            (client.SlaveState == SlaveState.Idle)
                             select new { client.ClientId, client.NumTotalCores, client.NumUsedCores, client.Time })
                             .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList();
@@ -135 +143 @@
     }
 
-    public JsonResult CurrentMemory()
+    public JsonResult CurrentMemory(string state)
     {
       using (var db = new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString))
@@ -145 +153 @@
                               on clients.ResourceId equals resource.ResourceId
                             where clients.ExpirationTime == null &&
-                            (resource.SlaveState == SlaveState.Calculating || resource.SlaveState == SlaveState.Idle)
+                            (state == "All") ||
+                            (state == "Online") &&
+                            (client.SlaveState == SlaveState.Idle || client.SlaveState == SlaveState.Calculating) ||
+                            (state == "Available") &&
+                            (client.SlaveState == SlaveState.Idle)
                             select new { client.ClientId, client.TotalMemory, client.UsedMemory, client.Time })
                             .OrderBy(c => c.Time).GroupBy(c => c.ClientId).ToList();