Changeset 12563 for stable/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataTransfer

Timestamp:

07/01/15 14:59:47 (9 years ago)

Author:

ascheibe

Message:

#2394 merged r12428, r12429, r12430, r12435, r12442, r12443, r12445, r12514, r12517, r12519, r12520, r12521, r12523, r12532, r12542, r12546, r12552, r12553, r12556, r12557, r12559, r12561, r12146, r12457 into stable

Location:

stable

Files:

• . (modified) (2 props)
• HeuristicLab.Services.WebApp.Status (copied) (copied from trunk/sources/HeuristicLab.Services.WebApp.Status)
• HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataTransfer/Slave.cs (modified) (1 diff)
• HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataTransfer/Status.cs (modified) (4 diffs)
• HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataTransfer/User.cs (modified) (1 diff)

stable/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataTransfer/Slave.cs

@@ -1 @@
-namespace HeuristicLab.Services.WebApp.Status.WebApi.DataTransfer {
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+namespace HeuristicLab.Services.WebApp.Status.WebApi.DataTransfer {
   public class Slave {
     public string Id { get; set; } // currently unused

stable/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataTransfer/Status.cs

@@ -1 @@
-using System.Collections.Generic;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
+using System.Collections.Generic;
 
 namespace HeuristicLab.Services.WebApp.Status.WebApi.DataTransfer {
@@ -5 +26 @@
   public class CoreStatus {
     public int TotalCores { get; set; }
-    public int AvailableCores { get; set; }
-    public int FreeCores { get; set; }
+    public int FreeCores { get; set; } // temporary quickfix for old chart data
+    public int ActiveCores { get; set; }
+    public int CalculatingCores { get; set; }
   }
 
   public class CpuUtilizationStatus {
     public double TotalCpuUtilization { get; set; }
-    public double UsedCpuUtilization { get; set; }
+    public double ActiveCpuUtilization { get; set; }
+    public double CalculatingCpuUtilization { get; set; }
   }
 
   public class MemoryStatus {
     public int TotalMemory { get; set; }
-    public int FreeMemory { get; set; }
+    public int FreeMemory { get; set; } // temporary quickfix for old chart data
+    public int ActiveMemory { get; set; }
+    public int UsedMemory { get; set; }
   }
 
@@ -25 +50 @@
   }
 
-  public class SlaveCpuStatus {
+  public class SlaveStatus {
     public Slave Slave { get; set; }
     public double CpuUtilization { get; set; }
+    public int Cores { get; set; }
+    public int FreeCores { get; set; }
+    public int Memory { get; set; }
+    public int FreeMemory { get; set; }
+    public bool IsAllowedToCalculate { get; set; }
+    public string State { get; set; }
   }
 
@@ -35 +66 @@
     public MemoryStatus MemoryStatus { get; set; }
     public IEnumerable<TaskStatus> TasksStatus { get; set; }
-    public IEnumerable<SlaveCpuStatus> SlavesCpuStatus { get; set; }
+    public IEnumerable<SlaveStatus> SlavesStatus { get; set; }
     public long Timestamp { get; set; }
   }

stable/HeuristicLab.Services.WebApp.Status/3.3/WebApi/DataTransfer/User.cs

@@ -1 @@
-
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 namespace HeuristicLab.Services.WebApp.Status.WebApi.DataTransfer {
   public class User {