Changeset 1802


Ignore:
Timestamp:
Aug 11, 2010, 1:56:02 PM (11 years ago)
Author:
kopal
Message:

some fixes of ExecutionEngine and view

Location:
trunk/CrypPlugins/WorkspaceManager
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/CrypPlugins/WorkspaceManager/Execution/ExecutionEngine.cs

    r1794 r1802  
    327327            while (this.executionEngine.IsRunning)
    328328            {
    329                 yield return Receive<MessageExecution>();
    330                 this.HandleExecute((MessageExecution)stateMachine.CurrentMessage);
     329                yield return Receive<MessageExecution>(null,HandleExecute);
     330                //this.HandleExecute((MessageExecution)stateMachine.CurrentMessage);
    331331            }
    332332        }
     
    343343                return;
    344344            }
    345 
     345           
    346346            //Check if all necessary inputs are set
    347347            foreach (ConnectorModel connectorModel in msg.PluginModel.InputConnectors)
     
    428428                        MessageExecution message_exec = new MessageExecution();
    429429                        message_exec.PluginModel = connectionModel.From.PluginModel;
    430                         connectionModel.From.PluginModel.PluginProtocol.BroadcastMessage(message_exec);
    431                     }
    432                 }
    433             }           
     430                        connectionModel.From.PluginModel.PluginProtocol.BroadcastMessageReliably(message_exec);
     431                    }
     432                }
     433            }
    434434        }
    435435    }
    436436
    437437    /// <summary>
    438     /// Gears4Net Scheduler. The scheduler only runs protocols which do not have a waiting
    439     /// plugin on the protocol plugins outputs
     438    /// Gears4Net Scheduler
    440439    /// </summary>
    441440    public class WorkspaceManagerScheduler : Scheduler
  • trunk/CrypPlugins/WorkspaceManager/Model/ConnectorModel.cs

    r1780 r1802  
    221221               
    222222                foreach (ConnectionModel connectionModel in this.OutputConnections)
    223                 {
    224                     while ((connectionModel.To.HasData || connectionModel.To.Data != null)
    225                         && this.PluginModel.WorkspaceModel.WorkspaceManagerEditor.isExecuting())
    226                     {
    227                         Thread.Sleep(0);
    228                     }
    229 
     223                {                   
    230224                    Data Data = new Data();
    231225                    Data.value = data;
  • trunk/CrypPlugins/WorkspaceManager/Model/PluginModel.cs

    r1791 r1802  
    6161            get { return state; }
    6262            set { state = value; }
    63         }     
     63        }
    6464
    6565        /// <summary>
  • trunk/CrypPlugins/WorkspaceManager/View/VisualComponents/CryptoLineView/CryptoLineView.cs

    r1794 r1802  
    8282            if (args.RightButton == MouseButtonState.Pressed)
    8383            {
    84                 if (this.model != null)
     84                if (this.model != null && !this.model.WorkspaceModel.WorkspaceManagerEditor.isExecuting())
    8585                {
    8686                    this.model.WorkspaceModel.deleteConnectionModel(this.model);
Note: See TracChangeset for help on using the changeset viewer.