Changeset 9526 for branches/HiveStatistics/sources

Timestamp:

05/24/13 14:45:51 (12 years ago)

Author:

pfleck

Message:

#2063
Added StatisticsGenerator for generating statistic data for Hive.
ServiceLocator returns the StatisticsGenerator.
Integrated StatisticsGenerator in Janitor service for periodic calls.

Location:

branches/HiveStatistics/sources

Files:

• HeuristicLab.Services.Hive.JanitorService/3.3/JanitorService.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/HiveJanitor.cs (modified) (4 diffs)
• HeuristicLab.Services.Hive/3.3/HiveStatisticsGenerator.cs (added)
• HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/Interfaces/IStatisticsGenerator.cs (added)
• HeuristicLab.Services.Hive/3.3/Properties/Settings.Designer.cs (modified) (2 diffs)
• HeuristicLab.Services.Hive/3.3/Properties/Settings.settings (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (1 diff)
• HeuristicLab.Services.Hive/3.3/app.config (modified) (1 diff)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive.JanitorService/3.3/JanitorService.cs

@@ -26 +26 @@
   public partial class JanitorService : ServiceBase {
     private HiveJanitor janitor;
-    private Thread janitorThread;
+    private Thread janitorCleanupThread;
+    private Thread janitorGenerateStatisticsThread;
 
     public JanitorService() {
@@ -35 +36 @@
       janitor = new HiveJanitor();
 
-      janitorThread = new Thread(janitor.Run);
-      janitorThread.IsBackground = true; //dont keep app alive
-      janitorThread.Start();
+      janitorCleanupThread = new Thread(janitor.RunCleanup) {
+        IsBackground = true
+      };
+      janitorGenerateStatisticsThread = new Thread(janitor.RunGenerateStatistics) {
+        IsBackground = true
+      };
+
+      janitorCleanupThread.Start();
+      janitorGenerateStatisticsThread.Start();
     }
 
     protected override void OnStop() {
       janitor.StopJanitor();
-      janitorThread.Join();
+      janitorCleanupThread.Join();
+      janitorGenerateStatisticsThread.Join();
     }
   }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HeuristicLab.Services.Hive-3.3.csproj

@@ -137 +137 @@
     <Compile Include="DataTransfer\Statistics.cs" />
     <Compile Include="DataTransfer\UserStatistics.cs" />
+    <Compile Include="HiveStatisticsGenerator.cs" />
+    <Compile Include="Interfaces\IStatisticsGenerator.cs" />
     <Compile Include="OptimizedHiveDao.cs" />
     <Compile Include="HiveDao.cs" />

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/HiveJanitor.cs

@@ -27 +27 @@
   public class HiveJanitor {
     private bool stop;
-    private AutoResetEvent waitHandle;
+    private AutoResetEvent cleanupWaitHandle;
+    private AutoResetEvent generateStatisticsWaitHandle;
 
     private DataAccess.ITransactionManager trans {
@@ -37 +38 @@
     }
 
+    private IStatisticsGenerator statisticsGenerator {
+      get { return ServiceLocator.Instance.StatisticsGenerator; }
+    }
+
     private IHiveDao dao {
       get { return ServiceLocator.Instance.HiveDao; }
@@ -43 +48 @@
     public HiveJanitor() {
       stop = false;
-      waitHandle = new AutoResetEvent(true);
+      cleanupWaitHandle = new AutoResetEvent(true);
+      generateStatisticsWaitHandle = new AutoResetEvent(true);
     }
 
     public void StopJanitor() {
       stop = true;
-      waitHandle.Set();
+      cleanupWaitHandle.Set();
     }
 
-    public void Run() {
+    public void RunCleanup() {
       while (!stop) {
         try {
@@ -72 +78 @@
           LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log(string.Format("HiveJanitor: The following exception occured: {0}", e.ToString()));
         }
-        waitHandle.WaitOne(HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval);
+        cleanupWaitHandle.WaitOne(HeuristicLab.Services.Hive.Properties.Settings.Default.CleanupInterval);
       }
-      waitHandle.Close();
+      cleanupWaitHandle.Close();
+    }
+
+    public void RunGenerateStatistics() {
+      while (!stop) {
+        try {
+          LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: starting generate statistics");
+          statisticsGenerator.GenerateStatistics();
+          LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log("HiveJanitor: generate statistics finished");
+        }
+        catch (Exception e) {
+          LogFactory.GetLogger(typeof(HiveJanitor).Namespace).Log(string.Format("HiveJanitor: The following exception occured: {0}", e));
+        }
+
+        generateStatisticsWaitHandle.WaitOne(Properties.Settings.Default.GenerateStatisticsInterval);
+      }
+
+      generateStatisticsWaitHandle.Close();
     }
   }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Interfaces/IServiceLocator.cs

@@ -29 +29 @@
     IOptimizedHiveDao OptimizedHiveDao { get; }
     IEventManager EventManager { get; }
+    IStatisticsGenerator StatisticsGenerator { get; }
     ITransactionManager TransactionManager { get; }
     Access.IUserManager UserManager { get; }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Properties/Settings.Designer.cs

@@ -2 +2 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.17929
+//     Runtime Version:4.0.30319.18034
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -86 +86 @@
             }
         }
+        
+        [global::System.Configuration.ApplicationScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("00:05:00")]
+        public global::System.TimeSpan GenerateStatisticsInterval {
+            get {
+                return ((global::System.TimeSpan)(this["GenerateStatisticsInterval"]));
+            }
+        }
     }
 }

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/Properties/Settings.settings

@@ -24 +24 @@
       <Value Profile="(Default)">00:00:20</Value>
     </Setting>
+    <Setting Name="GenerateStatisticsInterval" Type="System.TimeSpan" Scope="Application">
+      <Value Profile="(Default)">00:05:00</Value>
+    </Setting>
   </Settings>
 </SettingsFile>

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

@@ -74 +74 @@
     }
 
+    private IStatisticsGenerator statisticsGenerator;
+    public IStatisticsGenerator StatisticsGenerator {
+      get { return statisticsGenerator ?? (statisticsGenerator = new HiveStatisticsGenerator()); }
+    }
+
     private ITransactionManager transactionManager;
     public ITransactionManager TransactionManager {

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/app.config

@@ -29 +29 @@
                 <value>00:00:20</value>
             </setting>
+            <setting name="GenerateStatisticsInterval" serializeAs="String">
+                <value>00:05:00</value>
+            </setting>
         </HeuristicLab.Services.Hive.Properties.Settings>
     </applicationSettings>