X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGraphExecutor%2FDataFlowExecutor_OutNode.hxx;h=4746eaf08c196e28efbb33d3b863ed390ee5288b;hb=dad24b20fb0b0c18474caa7cb5b94652408b6743;hp=277d93f027d727c155c8372c5a053d9a900fa9c9;hpb=7d3931c54614b3d73351551e662ccbd3be07a0d8;p=modules%2Fsuperv.git

diff --git a/src/GraphExecutor/DataFlowExecutor_OutNode.hxx b/src/GraphExecutor/DataFlowExecutor_OutNode.hxx
index 277d93f..4746eaf 100644
--- a/src/GraphExecutor/DataFlowExecutor_OutNode.hxx
+++ b/src/GraphExecutor/DataFlowExecutor_OutNode.hxx
@@ -53,6 +53,7 @@ namespace GraphExecutor {
       GraphExecutor::AutomatonState  _State ;
       SUPERV::ControlState    _ControlState ;
       bool                    _Done ;
+      bool                    _NodeAborted ;
 
       // asv : 20.01.05 : changes involved with switching to old (HEAD) KERNEL    
       //Engines_Container_i            * _SuperVisionContainer ;
@@ -63,6 +64,7 @@ namespace GraphExecutor {
       pthread_cond_t                   _JoinWait ;
       bool                             _JustStarted ;
       int                              _Threads ; // Number of threads
+      long                             _CreatedThreads ; 
       int                              _SuspendedThreads ;
       list< char * >                   _EventNodes ;
       list< GraphExecutor::NodeEvent > _Events ;
@@ -114,6 +116,8 @@ namespace GraphExecutor {
       GraphBase::Graph * Graph() const {
                          return _Graph ; } ;
 
+      char * Name() { return Graph()->Name() ; } ;
+
       bool LoadDataFlow( const GraphBase::SGraph * aDataFlow ) ;
 //      bool LoadXml( const char* myFileName ) ;
       bool LoadInfo( const GraphBase::SNode &aDataFlowInfo ) ;
@@ -171,6 +175,11 @@ namespace GraphExecutor {
                 return _Graph->ThreadNo() ; } ;
       long Thread( const char * NodeName ) ;
 
+      void IncrCreatedThreads() {
+           _CreatedThreads += 1 ; } ;
+      long CreatedThreads() {
+           return _CreatedThreads ; } ;
+
       bool PushEvent( GraphExecutor::InNode * aNode ,
                       GraphExecutor::NodeEvent anEvent ,
                       GraphExecutor::AutomatonState aState ) ;
@@ -218,6 +227,13 @@ namespace GraphExecutor {
       bool Kill() ;
       bool Stop() ;
 
+      void NodeAborted( const char * aNodeName ) {
+           string aMsg = string( "The node " ) + string( aNodeName ) + " was aborted." ;
+           Graph()->SetMessages( aMsg.c_str() ) ;
+           _NodeAborted = true ; } ;
+      bool IsNodeAborted() {
+           return _NodeAborted ; } ;
+
       bool IsWaiting() ;
       bool IsReady() ;
       bool IsRunning() ;
@@ -232,8 +248,8 @@ namespace GraphExecutor {
       bool IsRunning( const char * NodeName ) ;
       bool IsDone( const char * NodeName ) ;
       bool IsSuspended( const char * NodeName ) ;
-      bool IsDone( const char * NodeName ,
-                   const char * ServiceParameterName ) ;
+      bool PortDone( const char * NodeName ,
+                     const char * ServiceParameterName ) ;
       long LastLevelDone() ;
 
       bool ReadyWait() ;
@@ -245,10 +261,12 @@ namespace GraphExecutor {
       bool DoneWait( const char * NodeName ) ;
       bool SuspendedWait( const char * NodeName ) ;
 
-      const CORBA::Any *GetInData( const char *ToNodeName ,
-                                   const char *ToParameterName ) ;
-      const CORBA::Any *GetOutData( const char *FromNodeName ,
-                                    const char *FromParameterName ) ;
+//JR 30.03.2005      const CORBA::Any *GetInData( const char *ToNodeName ,
+      const CORBA::Any GetInData( const char *ToNodeName ,
+                                  const char *ToParameterName ) ;
+//JR 30.03.2005      const CORBA::Any *GetOutData( const char *FromNodeName ,
+      const CORBA::Any GetOutData( const char *FromNodeName ,
+                                   const char *FromParameterName ) ;
       const long CpuUsed() ;
       const long CpuUsed( const char *aNodeName ) ;
   };