Changeset 6743 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

Timestamp:

09/12/11 18:04:25 (13 years ago)

Author:

ascheibe

Message:

#1233

• fixed a bug in the Slave UI
• finished renaming Webservice and Dao methods to be consistent with Job/Task naming
• some cosmetic changes and project dependencies cleanups

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs (modified) (6 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.3/Core.cs

@@ -232 +232 @@
       int usedCores = 0;
       try {
-        task = wcfService.GetJob(taskId);
+        task = wcfService.GetTask(taskId);
         if (task == null) throw new TaskNotFoundException(taskId);
         if (ConfigManager.Instance.GetFreeCores() < task.CoresNeeded) throw new OutOfCoresException();
         if (ConfigManager.GetFreeMemory() < task.MemoryNeeded) throw new OutOfMemoryException();
         SlaveStatusInfo.IncrementUsedCores(task.CoresNeeded); usedCores = task.CoresNeeded;
-        TaskData taskData = wcfService.GetJobData(taskId);
+        TaskData taskData = wcfService.GetTaskData(taskId);
         if (taskData == null) throw new TaskDataNotFoundException(taskId);
         task = wcfService.UpdateJobState(taskId, TaskState.Calculating, null);
@@ -273 +273 @@
       Guid taskId = (Guid)taskIdObj;
       try {
-        Task task = wcfService.GetJob(taskId);
+        Task task = wcfService.GetTask(taskId);
         if (task == null) throw new TaskNotFoundException(taskId);
         taskManager.StopTaskAsync(taskId);
@@ -291 +291 @@
       Guid taskId = (Guid)taskIdObj;
       try {
-        Task task = wcfService.GetJob(taskId);
+        Task task = wcfService.GetTask(taskId);
         if (task == null) throw new TaskNotFoundException(taskId);
         taskManager.PauseTaskAsync(taskId);
@@ -334 +334 @@
         SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded);
         heartbeatManager.AwakeHeartBeatThread();
-        Task task = wcfService.GetJob(e.Value.TaskId);
+        Task task = wcfService.GetTask(e.Value.TaskId);
         if (task == null) throw new TaskNotFoundException(e.Value.TaskId);
         task.ExecutionTime = e.Value.ExecutionTime;
         TaskData taskData = e.Value.GetTaskData();
-        wcfService.UpdateJobData(task, taskData, configManager.GetClientInfo().Id, TaskState.Paused);
+        wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Paused);
       }
       catch (TaskNotFoundException ex) {
@@ -352 +352 @@
         SlaveStatusInfo.DecrementUsedCores(e.Value.CoresNeeded);
         heartbeatManager.AwakeHeartBeatThread();
-        Task task = wcfService.GetJob(e.Value.TaskId);
+        Task task = wcfService.GetTask(e.Value.TaskId);
         if (task == null) throw new TaskNotFoundException(e.Value.TaskId);
         task.ExecutionTime = e.Value.ExecutionTime;
         TaskData taskData = e.Value.GetTaskData();
-        wcfService.UpdateJobData(task, taskData, configManager.GetClientInfo().Id, TaskState.Finished);
+        wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Finished);
       }
       catch (TaskNotFoundException ex) {
@@ -374 +374 @@
         Exception exception = e.Value.Item3;
 
-        Task task = wcfService.GetJob(slaveTask.TaskId);
+        Task task = wcfService.GetTask(slaveTask.TaskId);
         if (task == null) throw new TaskNotFoundException(slaveTask.TaskId);
         task.ExecutionTime = slaveTask.ExecutionTime;
         if (taskData != null) {
-          wcfService.UpdateJobData(task, taskData, configManager.GetClientInfo().Id, TaskState.Failed, exception.ToString());
+          wcfService.UpdateTaskData(task, taskData, configManager.GetClientInfo().Id, TaskState.Failed, exception.ToString());
         } else {
           wcfService.UpdateJobState(task.Id, TaskState.Failed, exception.ToString());