From 211400e716e443a3bdfe4f05a1ceb6bcdf68fdf9 Mon Sep 17 00:00:00 2001 From: rahuel Date: Tue, 13 Feb 2007 08:59:16 +0000 Subject: [PATCH] NPAL14110 : Traces --- src/GraphBase/DataFlowBase_OutPort.cxx | 5 +++-- src/GraphBase/DataFlowBase_PortsOfNode.cxx | 2 +- src/GraphExecutor/DataFlowExecutor_DataFlow.cxx | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/GraphBase/DataFlowBase_OutPort.cxx b/src/GraphBase/DataFlowBase_OutPort.cxx index 2f52c5a..776bc74 100644 --- a/src/GraphBase/DataFlowBase_OutPort.cxx +++ b/src/GraphBase/DataFlowBase_OutPort.cxx @@ -127,8 +127,9 @@ bool GraphBase::OutPort::RemoveInPort( GraphBase::InPort * toPort ) { int i ; int index = _MapOfInPorts[ toPort->NodePortName() ] ; if ( index <= 0 || index > _InPortsSize ) { - cdebug << "GraphBase::OutPort::RemoveInPort Error " << NodeName() << "( " << PortName()<< " ) --> " - << toPort->NodeName() << "( " << toPort->PortName() << " )" << endl ; +//JR NPAL14110 09.02.2007 : Not an error with MacroNodes ... + //JRcdebug << "GraphBase::OutPort::RemoveInPort Error " << NodeName() << "( " << PortName()<< " ) --> " + //JR << toPort->NodeName() << "( " << toPort->PortName() << " )" << endl ; return false ; } cdebug << "OutPort::RemoveInPort " << NodeName() << "(" << PortName() << ") --> " diff --git a/src/GraphBase/DataFlowBase_PortsOfNode.cxx b/src/GraphBase/DataFlowBase_PortsOfNode.cxx index 3fa9756..97a9b42 100644 --- a/src/GraphBase/DataFlowBase_PortsOfNode.cxx +++ b/src/GraphBase/DataFlowBase_PortsOfNode.cxx @@ -29,7 +29,7 @@ using namespace std; #include "DataFlowBase_PortsOfNode.hxx" -#define PortsOfNodeTrace 1 +#define PortsOfNodeTrace 0 GraphBase::PortsOfNode::PortsOfNode() : GraphBase::Service::Service( SALOME_ModuleCatalog::Service() ) { diff --git a/src/GraphExecutor/DataFlowExecutor_DataFlow.cxx b/src/GraphExecutor/DataFlowExecutor_DataFlow.cxx index 9e08779..4552e07 100644 --- a/src/GraphExecutor/DataFlowExecutor_DataFlow.cxx +++ b/src/GraphExecutor/DataFlowExecutor_DataFlow.cxx @@ -239,8 +239,8 @@ bool GraphExecutor::DataFlow::OutputOfAny( const char * aNodeName , for ( i = 0 ; i < anOutPort->InPortsSize() ; i++ ) { const char * ToNodeName = anOutPort->ChangeInPorts( i )->NodeName() ; const char * ToParameterName = anOutPort->ChangeInPorts( i )->PortName() ; - GraphBase::ComputingNode * aComputingNode = Graph()->GetChangeGraphNode( ToNodeName ) ; if ( strcmp( ToNodeName , Name() ) ) { + GraphBase::ComputingNode * aComputingNode = Graph()->GetChangeGraphNode( ToNodeName ) ; GraphExecutor::InNode * aLinkedNode = (GraphExecutor::InNode * ) aComputingNode->GetInNode() ; cdebug << pthread_self() << "/" << aLinkedNode->ThreadNo() << "GraphExecutor::DataFlow::OutputOfAny to Node " @@ -293,8 +293,9 @@ bool GraphExecutor::DataFlow::OutputOfAny( const char * aNodeName , anOutPort->Value() ) ; } else { - cdebug << "GraphExecutor::DataFlow::OutputOfAny to Graph " << ToNodeName - << "(" << ToParameterName << ") ignored" << endl ; + cdebug << pthread_self() << "GraphExecutor::DataFlow::OutputOfAny to Node " + << ToNodeName << "(" << ToParameterName << ") from MacroNode " << aNodeName + << ") ignored" << endl ; } } cdebug_out << pthread_self() << "/" << ThreadNo() << " GraphExecutor::DataFlow::OutputOfAny " << RetVal -- 2.39.2