From: rahuel <rahuel@opencascade.com>
Date: Tue, 11 May 2004 13:00:40 +0000 (+0000)
Subject: Cyclic dependency
X-Git-Tag: Ecole_Ete_a5~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f09a889e69cf5536f955b726942ed000225d843c;p=modules%2Fsuperv.git

Cyclic dependency
---

diff --git a/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx b/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx
index 0b02ac8..bb0e6b7 100644
--- a/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx
+++ b/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx
@@ -39,17 +39,12 @@ using namespace std;
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOME_Component)
-//#include "SALOME_NamingService.hxx"
 #include "SALOME_LifeCycleCORBA.hxx"
 
-//#include "DataFlowExecutor_InNode.hxx"
+//#include "StreamGraph_Impl.hxx"
 
 #include "DataFlowExecutor_OutNode.hxx"
 
-#include "Graph_Impl.hxx"
-
-//static char *containerName = "FactoryServer" ;
-
 int GraphExecutor::InNode::SendEvent( const GraphExecutor::NodeEvent anEvent ) {  
 
   _CurrentEvent = (GraphExecutor::NodeEvent ) anEvent ;
@@ -1078,7 +1073,7 @@ int GraphExecutor::InNode::DataReady_ExecuteAction() {
     astr << "Graph " << _OutNode->Graph()->Name() << " Node " << Name()
          << " : load of component " << ComponentName() << " in container "
          << Computer() ;
-    _OutNode->Graph()->ObjImpl()->sendMessage( NOTIF_STEP, astr.str().c_str() ) ;
+//    _OutNode->Graph()->ObjImpl()->sendMessage( NOTIF_STEP, astr.str().c_str() ) ;
     Err = !_OutNode->Graph()->StartComponent( ThreadNo() , Computer() ,
                                               my_strdup( ComponentName() ) ,
                                               myContainer , myObjComponent ) ;
@@ -1108,7 +1103,7 @@ int GraphExecutor::InNode::DataReady_ExecuteAction() {
       if ( !Err ) {
         ostringstream astr ;
         astr << "Graph " << _OutNode->Graph()->Name() << " Run of Node " << Name() ;
-        _OutNode->Graph()->ObjImpl()->sendMessage( NOTIF_STEP, astr.str().c_str() ) ;
+//        _OutNode->Graph()->ObjImpl()->sendMessage( NOTIF_STEP, astr.str().c_str() ) ;
         cdebug << ThreadNo() << " Run( '" << ServiceName() << "'" ;
         for ( i = 0 ; i < (int ) ServiceInParameter().length() ; i++ ) {
           cdebug << " , " << InParametersList[ i ].Name << "[kind"
@@ -1399,7 +1394,7 @@ int GraphExecutor::InNode::DataReady_ExecuteAction() {
   ostringstream astr ;
   astr << "Graph " << _OutNode->Graph()->Name() << " Node " << Name() << " is done : "
        << Automaton()->StateName( State() ) ;
-  _OutNode->Graph()->ObjImpl()->sendMessage( NOTIF_STEP, astr.str().c_str() ) ;
+//  _OutNode->Graph()->ObjImpl()->sendMessage( NOTIF_STEP, astr.str().c_str() ) ;
   if ( Err ) {
     if ( ControlState() == SUPERV::ToKillState ||
          ControlState() == SUPERV::ToKillDoneState ||
diff --git a/src/GraphExecutor/DataFlowExecutor_OutNode.cxx b/src/GraphExecutor/DataFlowExecutor_OutNode.cxx
index 8f0ddef..ea2b3f0 100644
--- a/src/GraphExecutor/DataFlowExecutor_OutNode.cxx
+++ b/src/GraphExecutor/DataFlowExecutor_OutNode.cxx
@@ -30,8 +30,6 @@ using namespace std;
 
 #include "DataFlowExecutor_OutNode.hxx"
 
-#include "Graph_Impl.hxx"
-
 // Implementation de la classe GraphEditor::GraphControl
 
 extern GraphExecutor::FiniteStateMachine * theAutomaton ;
@@ -582,9 +580,9 @@ bool GraphExecutor::OutNode::Run( const bool AndSuspend ) {
           State( SUPERV::ExecutingState ) ;
       };
     }
-    ostringstream astr ;
-    astr << "Graph " << Graph()->Name() << " is running" ;
-    Graph()->ObjImpl()->sendMessage( NOTIF_STEP, astr.str().c_str() ) ;
+//    ostringstream astr ;
+//    astr << "Graph " << Graph()->Name() << " is running" ;
+//    Graph()->ObjImpl()->sendMessage( NOTIF_STEP, astr.str().c_str() ) ;
     RetVal = true ;
   }
   else {
@@ -693,10 +691,10 @@ void GraphExecutor::OutNode::CheckAllDone() {
     cdebug << Graph()->Name() << " IS DONE : " <<  theAutomaton->StateName( AutomatonState() ) << " EventQSize "
              << EventQSize() << endl  ;
     cdebug << "================================================================================" << endl ;
-    ostringstream astr ;
-    astr << "Graph " << Graph()->Name() << " is done : "
-         << theAutomaton->StateName( AutomatonState() ) ;
-    Graph()->ObjImpl()->sendMessage( NOTIF_STEP, astr.str().c_str() ) ;
+//    ostringstream astr ;
+//    astr << "Graph " << Graph()->Name() << " is done : "
+//         << theAutomaton->StateName( AutomatonState() ) ;
+//    Graph()->ObjImpl()->sendMessage( NOTIF_STEP, astr.str().c_str() ) ;
     //cout << Graph()->Name() << " IS DONE : " <<  theAutomaton->StateName( AutomatonState() ) << " EventQSize "
     //     << EventQSize() << endl  ;
   }
diff --git a/src/GraphExecutor/DataFlowExecutor_OutNode.hxx b/src/GraphExecutor/DataFlowExecutor_OutNode.hxx
index 16fd6f0..2676c74 100644
--- a/src/GraphExecutor/DataFlowExecutor_OutNode.hxx
+++ b/src/GraphExecutor/DataFlowExecutor_OutNode.hxx
@@ -31,10 +31,10 @@
 
 #include "SALOME_Component_i.hxx"
 
-#include "DataFlowBase_StreamGraph.hxx"
-
 #include "DataFlowExecutor_InNode.hxx"
 
+#include "DataFlowBase_StreamGraph.hxx"
+
 namespace GraphExecutor {
 
 //  class OutNode : public GraphBase::Graph {