Changeset 6431 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

Timestamp:

06/16/11 14:20:48 (13 years ago)

Author:

cneumuel

Message:

#1233

• changed Log to ThreadSafeLog
• added license information to all files
• added assembly descriptions
• using blocks before namespace
• made TransactionManager static
• removed DaoException
• removed TimeSpanExtensions
• renamed prepareHiveDatabase.sql should be renamed to Prepare Hive Database.sql
• created Initialize Hive Database.sql

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4

Files:

• HeuristicLab.Clients.Hive-3.4.csproj (modified) (1 diff)
• RefreshableHiveExperiment.cs (modified) (8 diffs)
• ThreadSafeLog.cs (deleted)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/HeuristicLab.Clients.Hive-3.4.csproj

@@ -117 +117 @@
     <Compile Include="StateLogList.cs" />
     <Compile Include="StateLogListList.cs" />
-    <Compile Include="ThreadSafeLog.cs" />
     <None Include="app_f005pc.config" />
     <None Include="app_services.config" />
     <None Include="app.config" />
+    <None Include="ClassDiagram2.cd" />
     <None Include="HeuristicLabClientsHivePlugin.cs.frame" />
     <Compile Include="Exceptions\AddJobToHiveException.cs" />

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/RefreshableHiveExperiment.cs

@@ -82 +82 @@
     }
 
-    private ILog log;
+    private ThreadSafeLog log;
     public ILog Log {
       get { return log; }
-      set { log = value; }
-    }
-    private static object logLocker = new object();
+    }
 
     #region Constructors and Cloning
@@ -93 +91 @@
       this.refreshAutomatically = true;
       this.HiveExperiment = new HiveExperiment();
-      this.log = new Log();
+      this.log = new ThreadSafeLog(new Log());
       this.jobDownloader = new ConcurrentJobDownloader<ItemJob>(2, 2);
       this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
@@ -100 +98 @@
       this.refreshAutomatically = true;
       this.HiveExperiment = hiveExperiment;
-      this.log = new Log();
+      this.log = new ThreadSafeLog(new Log());
       this.jobDownloader = new ConcurrentJobDownloader<ItemJob>(2, 2);
       this.jobDownloader.ExceptionOccured += new EventHandler<EventArgs<Exception>>(jobDownloader_ExceptionOccured);
@@ -108 +106 @@
       this.HiveExperiment = original.HiveExperiment;
       this.IsControllable = original.IsControllable;
-      this.Log = cloner.Clone(original.Log);
+      this.log = cloner.Clone(original.log);
       this.RefreshAutomatically = false; // do not start results polling automatically
       this.jobDownloader = new ConcurrentJobDownloader<ItemJob>(2, 2);
@@ -180 +178 @@
 
           if (!hiveJob.IsFinishedJobDownloaded && !hiveJob.IsDownloading && hiveJob.Job.LastJobDataUpdate < lightweightJob.LastJobDataUpdate) {
-            LogMessage(string.Format("Downloading job {0}", lightweightJob.Id));
+            log.LogMessage(string.Format("Downloading job {0}", lightweightJob.Id));
             hiveJob.IsDownloading = true;
             jobDownloader.DownloadJob(hiveJob.Job, (localJob, itemJob) => {
-              LogMessage(string.Format("Finished downloading job {0}", localJob.Id));
+              log.LogMessage(string.Format("Finished downloading job {0}", localJob.Id));
               HiveJob localHiveJob = GetHiveJobById(localJob.Id);
 
@@ -222 +220 @@
     }
 
-    // synchronized logging
-    private void LogException(Exception exception) {
-      lock (logLocker) {
-        this.log.LogException(exception);
-      }
-    }
-    // synchronized logging
-    private void LogMessage(string message) {
-      lock (logLocker) {
-        this.log.LogMessage(message);
-      }
-    }
-
     public HiveJob GetHiveJobById(Guid jobId) {
       foreach (HiveJob job in hiveExperiment.HiveJobs) {
@@ -356 +341 @@
     public event EventHandler<EventArgs<Exception>> ExceptionOccured;
     private void OnExceptionOccured(Exception exception) {
-      LogException(exception);
+      log.LogException(exception);
       var handler = ExceptionOccured;
       if (handler != null) handler(this, new EventArgs<Exception>(exception));
@@ -390 +375 @@
       get { return hiveExperiment.ItemVersion; }
     }
-
-
+    
     #region IProgressReporter Members
     public IProgress Progress {