Changeset 6546

Timestamp:

07/08/11 00:36:56 (13 years ago)

Author:

ascheibe

Message:

#1233
Don't call Clear() on ThreadSafeLog in log_MessageAdded.
This doesn't work with the changes made in r6536 (LockRecursionPolicy.SupportsRecursion).
Instead use maxLogCount of Core.Log to limit the number of log messages kept in memory.

Location:

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

Files:

• Core.cs (modified) (3 diffs)
• Properties/Settings.Designer.cs (modified) (2 diffs)
• Properties/Settings.settings (modified) (1 diff)
• app_ascheibe.config (modified) (1 diff)
• app_f005pc.config (modified) (1 diff)
• app_services.config (modified) (1 diff)

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

@@ -25 +25 @@
 using System.Threading;
 using System.Threading.Tasks;
+using HeuristicLab.Clients.Hive.SlaveCore.Properties;
 using HeuristicLab.Clients.Hive.SlaveCore.ServiceContracts;
 using HeuristicLab.Common;
@@ -53 +54 @@
 
     public Core() {
-      var log = new ThreadSafeLog(new Log());
+      var log = new ThreadSafeLog(new Log(Settings.Default.MaxLogCount));
       this.pluginManager = new PluginManager(WcfService.Instance, log);
       this.jobManager = new JobManager(pluginManager, log);
@@ -408 +409 @@
     private void log_MessageAdded(object sender, EventArgs<string> e) {
       clientCom.LogMessage(e.Value.Split('\t')[1]);
-      ((ILog)sender).Clear(); // don't let the log take up memory
     }
     #endregion

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Properties/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.225
+//     Runtime Version:4.0.30319.235
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -275 +275 @@
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("1")]
+        public int MaxLogCount {
+            get {
+                return ((int)(this["MaxLogCount"]));
+            }
+            set {
+                this["MaxLogCount"] = value;
+            }
+        }
     }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/Properties/Settings.settings

@@ -66 +66 @@
       <Value Profile="(Default)">hiveslave</Value>
     </Setting>
+    <Setting Name="MaxLogCount" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">1</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_ascheibe.config

@@ -75 +75 @@
         <value>hiveslave</value>
       </setting>
+      <setting name="MaxLogCount" serializeAs="String">
+        <value>1</value>
+      </setting>
     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_f005pc.config

@@ -75 +75 @@
         <value>hiveslave</value>
       </setting>
+      <setting name="MaxLogCount" serializeAs="String">
+        <value>1</value>
+      </setting>
     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave/3.4/app_services.config

@@ -75 +75 @@
         <value>hiveslave</value>
       </setting>
+      <setting name="MaxLogCount" serializeAs="String">
+        <value>1</value>
+      </setting>
     </HeuristicLab.Clients.Hive.SlaveCore.Properties.Settings>
   </userSettings>