DCQ : Merge with Ecole_Ete_a6.

[modules/superv.git] / src / GraphExecutor / DataFlowExecutor_OutNode.hxx

diff --git a/src/GraphExecutor/DataFlowExecutor_OutNode.hxx b/src/GraphExecutor/DataFlowExecutor_OutNode.hxx
index 1f764f58b587185f74d7a35f95cbcb844ea5ea37..2676c74b978d6f50e2cd6174163c7bef85cec6a9 100644 (file)
--- a/src/GraphExecutor/DataFlowExecutor_OutNode.hxx
+++ b/src/GraphExecutor/DataFlowExecutor_OutNode.hxx
@@ -31,16 +31,22 @@
 
 #include "SALOME_Component_i.hxx"
 
-#include "DataFlowBase_Graph.hxx"
-
 #include "DataFlowExecutor_InNode.hxx"
 
+#include "DataFlowBase_StreamGraph.hxx"
+
 namespace GraphExecutor {
 
-  class OutNode : public GraphBase::Graph {
+//  class OutNode : public GraphBase::Graph {
+  class OutNode : public GraphBase::Base {
 
     private :
 
+      GraphBase::StreamGraph * _StreamGraph ;
+      GraphBase::Graph       * _Graph ;
+
+      int  _Graph_prof_debug ;
+
       bool                    _PyInitialized ;
       bool                    _Valid ;
       bool                    _Executable ;
@@ -74,7 +80,8 @@ namespace GraphExecutor {
       OutNode() ;
       OutNode( CORBA::ORB_ptr ORB, SALOME_NamingService* ptrNamingService ,
                const char *DataFlowName ,
-               const char * DebugFileName );
+               const char * DebugFileName ,
+               const SUPERV::KindOfNode aKindOfNode );
       OutNode( CORBA::ORB_ptr ORB, SALOME_NamingService* ptrNamingService ,
                const SALOME_ModuleCatalog::Service& DataFlowService ,
                const char *DataFlowComponentName ,
@@ -90,6 +97,16 @@ namespace GraphExecutor {
                const char * DebugFileName ) ;
       virtual ~OutNode() ;
 
+      void Set_prof_debug( CORBA::ORB_ptr ORB , const char * DebugFileName ) ;
+      GraphBase::StreamGraph * StreamGraph() {
+                               return _StreamGraph ; } ;
+      GraphBase::StreamGraph * StreamGraph() const {
+                               return _StreamGraph ; } ;
+      GraphBase::Graph * Graph() {
+                         return _Graph ; } ;
+      GraphBase::Graph * Graph() const {
+                         return _Graph ; } ;
+
       bool LoadDataFlow( const GraphBase::SGraph &aDataFlow ) ;
       bool LoadXml( const char* myFileName ) ;
       bool LoadInfo( const GraphBase::SNode &aDataFlowInfo ) ;
@@ -147,6 +164,8 @@ namespace GraphExecutor {
       long SuspendedThreads() { return _SuspendedThreads ; } ;
       void JoinedWait() ;
 
+      pthread_t ThreadNo() {
+                return _Graph->ThreadNo() ; } ;
       long Thread( const char * NodeName ) ;
 
       bool PushEvent( GraphExecutor::InNode * aNode ,