Changeset 7113

Timestamp:

12/02/11 12:40:22 (12 years ago)

Author:

ascheibe

Message:

#1631 implemented review comments for ThreadSafeLog

File:

• trunk/sources/HeuristicLab.Core/3.3/ThreadSafeLog.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Core/3.3/ThreadSafeLog.cs

@@ -30 +30 @@
   [Item("ThreadSafeLog", "A thread-safe log for logging string messages.")]
   [StorableClass]
-  public class ThreadSafeLog : Log, IDeepCloneable {
-    protected ReaderWriterLockSlim locker = new ReaderWriterLockSlim();
+  public sealed class ThreadSafeLog : Log {
+    private ReaderWriterLockSlim locker = new ReaderWriterLockSlim();
 
     public override IEnumerable<string> Messages {
@@ -38 +38 @@
         try {
           return messages.ToArray(); // return copy of messages
-        }
-        finally { locker.ExitReadLock(); }
+        } finally { locker.ExitReadLock(); }
       }
     }
 
     [StorableConstructor]
-    protected ThreadSafeLog(bool deserializing) : base(deserializing) { }
+    private ThreadSafeLog(bool deserializing) : base(deserializing) { }
     public ThreadSafeLog(long maxMessageCount = -1)
       : base(maxMessageCount) {
     }
 
-    protected ThreadSafeLog(ThreadSafeLog original, Cloner cloner) {
-      original.locker.EnterReadLock();
-      try {
-        cloner.RegisterClonedObject(original, this);
-        this.messages = new List<string>(original.messages);
-        this.maxMessageCount = original.maxMessageCount;
-      }
-      finally { original.locker.ExitReadLock(); }
-    }
+    private ThreadSafeLog(ThreadSafeLog original, Cloner cloner)
+      : base(original, cloner) { }
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new ThreadSafeLog(this, cloner);
+      locker.EnterReadLock();
+      try {
+        return new ThreadSafeLog(this, cloner);
+      } finally { locker.ExitReadLock(); }
     }
 
@@ -67 +62 @@
       try {
         messages.Clear();
-      }
-      finally { locker.ExitWriteLock(); }
+      } finally { locker.ExitWriteLock(); }
       OnCleared();
     }
@@ -78 +72 @@
         messages.Add(s);
         CapMessages();
-      }
-      finally { locker.ExitWriteLock(); }
+      } finally { locker.ExitWriteLock(); }
       OnMessageAdded(s);
     }
@@ -89 +82 @@
         messages.Add(s);
         CapMessages();
-      }
-      finally { locker.ExitWriteLock(); }
+      } finally { locker.ExitWriteLock(); }
       OnMessageAdded(s);
     }