Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/20/11 13:54:57 (12 years ago)
Author:
spimming
Message:

#1680:

  • merged changes from trunk into branch

' removed pre-build event for multiple app.configs

Location:
branches/HeuristicLab.Hive.Azure
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/HeuristicLab.Hive.Azure

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3

    • Property svn:ignore

      •  

        old new  
        11obj
        22Plugin.cs
         3bin

  • branches/HeuristicLab.Hive.Azure/HeuristicLab.Clients.Hive/3.3/HiveJobs/HiveTask.cs

    r6976 r7215  
    7171          OnItemImageChanged();
    7272        }
    73 
    7473      }
    7574    }
    … …  
    121120              hiveJob.IsControllable = value;
    122121            }
    123           }
    124           finally {
     122          } finally {
    125123            childHiveTasksLock.ExitReadLock();
    126124          }
    … …  
    136134        try {
    137135          return childHiveTasks.AsReadOnly();
    138         }
    139         finally { childHiveTasksLock.ExitReadLock(); }
     136        } finally { childHiveTasksLock.ExitReadLock(); }
    140137      }
    141138    }
    … …  
    145142
    146143    public StateLogList StateLog {
    147       get { return new StateLogList(this.task.StateLog); }
     144      get {
     145        var list = new StateLogList(this.task.StateLog);
     146        list.ForEach(s => { s.TaskName = itemTask.Name; });
     147        return list;
     148      }
    148149    }
    149150
    … …  
    153154
    154155    #region Constructors and Cloning
     156    [StorableConstructor]
     157    protected HiveTask(bool deserializing) { }
     158
    155159    public HiveTask() {
    156       this.Task = new Task() { CoresNeeded = 1, MemoryNeeded = 0 };
     160      this.Task = new Task() { CoresNeeded = 1, MemoryNeeded = 128 };
    157161      task.State = TaskState.Offline;
    158162      this.childHiveTasks = new ItemList<HiveTask>();
    … …  
    189193      try {
    190194        this.childHiveTasks = cloner.Clone(original.childHiveTasks);
    191       }
    192       finally { original.childHiveTasksLock.ExitReadLock(); }
     195      } finally { original.childHiveTasksLock.ExitReadLock(); }
    193196      this.syncTasksWithOptimizers = original.syncTasksWithOptimizers;
    194197      this.isFinishedTaskDownloaded = original.isFinishedTaskDownloaded;
    … …  
    235238    }
    236239
    237     public virtual void AddChildHiveJob(HiveTask hiveJob) {
     240    public virtual void AddChildHiveTask(HiveTask hiveTask) {
    238241      childHiveTasksLock.EnterWriteLock();
    239242      try {
    240         this.childHiveTasks.Add(hiveJob);
    241       }
    242       finally { childHiveTasksLock.ExitWriteLock(); }
     243        this.childHiveTasks.Add(hiveTask);
     244      } finally { childHiveTasksLock.ExitWriteLock(); }
    243245    }
    244246
    … …  
    337339        IsFinishedTaskDownloaded = false;
    338340      }
     341      if (e.PropertyName == "Priority" && Task != null) {
     342        foreach (var task in childHiveTasks) {
     343          task.Task.Priority = Task.Priority;
     344        }
     345      }
    339346    }
    340347    #endregion
    … …  
    352359        }
    353360        return jobs;
    354       }
    355       finally { childHiveTasksLock.ExitReadLock(); }
     361      } finally { childHiveTasksLock.ExitReadLock(); }
    356362    }
    357363
    … …  
    367373        }
    368374        return null;
    369       }
    370       finally { childHiveTasksLock.ExitWriteLock(); }
     375      } finally { childHiveTasksLock.ExitWriteLock(); }
    371376    }
    372377
    … …  
    385390              return result;
    386391          }
    387         }
    388         finally { childHiveTasksLock.ExitReadLock(); }
     392        } finally { childHiveTasksLock.ExitReadLock(); }
    389393      }
    390394      return null;
    … …  
    401405          child.RemoveByTaskId(jobId);
    402406        }
    403       }
    404       finally { childHiveTasksLock.ExitWriteLock(); }
     407      } finally { childHiveTasksLock.ExitWriteLock(); }
    405408    }
    406409
    … …  
    453456        try {
    454457          foreach (var child in childHiveTasks) {
    455             ServiceLocator.Instance.CallHiveService(s => s.PauseTask(child.task.Id));
     458            HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(child.task.Id));
    456459          }
    457         }
    458         finally { childHiveTasksLock.ExitReadLock(); }
     460        } finally { childHiveTasksLock.ExitReadLock(); }
    459461      } else {
    460         ServiceLocator.Instance.CallHiveService(s => s.PauseTask(this.task.Id));
     462        HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(this.task.Id));
    461463      }
    462464    }
    … …  
    467469        try {
    468470          foreach (var child in childHiveTasks) {
    469             ServiceLocator.Instance.CallHiveService(s => s.StopTask(child.task.Id));
     471            HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(child.task.Id));
    470472          }
    471         }
    472         finally { childHiveTasksLock.ExitReadLock(); }
     473        } finally { childHiveTasksLock.ExitReadLock(); }
    473474      } else {
    474         ServiceLocator.Instance.CallHiveService(s => s.StopTask(this.task.Id));
     475        HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(this.task.Id));
    475476      }
    476477    }
    477478
    478479    public void Restart() {
    479       ServiceLocator.Instance.CallHiveService(service => {
     480      HiveServiceLocator.Instance.CallHiveService(service => {
    480481        TaskData taskData = new TaskData();
    481482        taskData.TaskId = this.task.Id;
    … …  
    515516    #region Constructors and Cloning
    516517    public HiveTask() : base() { }
     518    [StorableConstructor]
     519    protected HiveTask(bool deserializing) { }
    517520    public HiveTask(T itemJob) : base(itemJob, true) { }
    518     protected HiveTask(HiveTask original, Cloner cloner)
     521    protected HiveTask(HiveTask<T> original, Cloner cloner)
    519522      : base(original, cloner) {
    520523    }
Note: See TracChangeset for help on using the changeset viewer.