Changeset 1340

Timestamp:

03/13/09 11:59:36 (16 years ago)

Author:

kgrading

Message:

Code Review changes (#522)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Communication/WcfService.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (7 diffs)
• HeuristicLab.Hive.Client.Core/Heartbeat.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/JobStorrage/JobStorrageManager.cs (modified) (4 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/dsHiveServer.cs (modified) (1 diff)
• HeuristicLab.Hive.Server.Core/ClientCommunicator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Hive.Client.Communication/WcfService.cs

@@ -89 +89 @@
         if (Connected != null)
           Connected(this, new EventArgs());                               
-        
+        //Todo: This won't be hit. EVER        
         if (ConnState == NetworkEnum.WcfConnState.Failed)
           ConnectionRestored(this, new EventArgs());        
       }
       catch (Exception ex) {
+        //Todo: Rename to HandleNetworkError
         NetworkErrorHandling(ex);
       }

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -52 +52 @@
   public class Core: MarshalByRefObject {
     public delegate string GetASnapshotDelegate();
-
+    //Todo: private + getter/setter removen.
     public static Object Locker { get; set; }
-
+    //Todo: ev. Rename to "abortRequested"
     public static bool ShutdownFlag { get; set; }
-
+    
+    //Todo: Access modifier
     Dictionary<long, Executor> engines = new Dictionary<long, Executor>();
     Dictionary<long, AppDomain> appDomains = new Dictionary<long, AppDomain>();
@@ -98 +99 @@
       MessageQueue queue = MessageQueue.GetInstance();
       
-      //Main processing loop
+      //Main processing loop     
+      //Todo: own thread for message handling
       while (!ShutdownFlag) {
         MessageContainer container = queue.GetMessage();
@@ -112 +114 @@
     /// <param name="container">The Container, containing the message</param>
     private void DetermineAction(MessageContainer container) {
+      //Todo: Threads aus Threadpool verwenden
+      
       switch (container.Message) {
         //Server requests to abort a job
@@ -152 +156 @@
     private void GetFinishedJob(object jobId) {
       long jId = (long)jobId;
+      //Todo: Don't return null, throw exception!
       byte[] sJob = engines[jId].GetFinishedJob();
 
@@ -162 +167 @@
           true);
       } else {
+        //Todo: locking
         JobStorrageManager.PersistObjectToDisc(wcfService.ServerIP, wcfService.ServerPort, jId, sJob);
         AppDomain.Unload(appDomains[jId]);
@@ -219 +225 @@
     }
 
+    //Todo: Remove intellgent stuff from the async event and move it to the main thread (message queue)
+    //Todo: Seperate this method into 2: Finished jobs and Snapshots
     void wcfService_SendJobResultCompleted(object sender, SendJobResultCompletedEventArgs e) {
       if (e.Result.Success) {        
@@ -237 +245 @@
         }        
       } else {
+        //Todo: don't Java Style! IT'S EVIL!
         Logging.GetInstance().Error(this.ToString(), "Sending of job " + e.Result.JobId + " failed");
       }
     }
 
+    //Todo: First stop all threads, then terminate
     void wcfService_ServerChanged(object sender, EventArgs e) {
       Logging.GetInstance().Info(this.ToString(), "ServerChanged has been called");

trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs

@@ -73 +73 @@
       Console.WriteLine("tick");  
       ClientInfo info = ConfigManager.Instance.GetClientInfo();
-      // Todo: remove tempfix for free cores.
+      // Todo: remove tempfix for free cores. Fix spelling of freeCores (uppercase)
 
       HeartBeatData heartBeatData = new HeartBeatData {

trunk/sources/HeuristicLab.Hive.Client.Core/JobStorrage/JobStorrageManager.cs

@@ -13 +13 @@
     
     private static List<JobStorrageInfo> storedJobsList = new List<JobStorrageInfo>();
+    //Todo: execution path
+    //Todo: Choose a better directory name 
     private static String path = "C:\\Program Files\\HeuristicLab 3.0\\plugins\\jobStorrage\\";
     
@@ -19 +21 @@
 
       JobStorrageInfo info = new JobStorrageInfo { JobID = jobId, ServerIP = serverIP, ServerPort = serverPort, TimeFinished = DateTime.Now };
+      
+      //Todo: Filestream won't be closed if exception occurs
       try {
         Stream jobstream = File.Create(path + filename + ".dat");
@@ -27 +31 @@
       }
       catch (Exception e) {
+        //Todo: Change to logging.exception!
         Console.WriteLine(e);
       }       
@@ -37 +42 @@
           Logging.GetInstance().Info("JobStorrageManager", "Sending stored job " + storedJobsList[index-1].JobID + " to the server");
           byte[] job = File.ReadAllBytes(path + filename + ".dat");
+          
+          //Todo: ask server first if he really wants the job...
           ResponseResultReceived res = WcfService.Instance.SendStoredJobResultsSync(ConfigManager.Instance.GetClientInfo().ClientId, storedJobsList[index-1].JobID, job, 1.00, null, true);
           //TODO: has to be fixed from server side

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/dsHiveServer.cs

@@ -14 +14 @@
     }
 }
+
+namespace dsHiveServerTableAdapters {
+    
+    
+    public partial class HiveUserTableAdapter {
+    }
+}

trunk/sources/HeuristicLab.Hive.Server.Core/ClientCommunicator.cs

@@ -46 +46 @@
       new ReaderWriterLockSlim(LockRecursionPolicy.SupportsRecursion);
 
+    // todo: access modifier!
     IClientAdapter clientAdapter;
     IJobAdapter jobAdapter;
@@ -143 +144 @@
       heartbeatLock.ExitWriteLock();
 
+      // todo: allClients legacy ?
       ICollection<ClientInfo> allClients = clientAdapter.GetAll();
       ClientInfo client = clientAdapter.GetById(clientInfo.ClientId);
@@ -165 +167 @@
     /// <param name="hbData"></param>
     /// <returns></returns>
+    // todo: new name for "SendHeartBeat" e.g. ProcessHeartBeat
     public ResponseHB SendHeartBeat(HeartBeatData hbData) {
       ResponseHB response = new ResponseHB();