From 5d299d6bbc3521e30a83c19aa559d1704e6564b8 Mon Sep 17 00:00:00 2001 From: rahuel Date: Thu, 14 Apr 2005 11:49:33 +0000 Subject: [PATCH] Memory Leaks + Traces + PALxxx(see coments) --- src/GraphExecutor/DataFlowExecutor_InNode.cxx | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/GraphExecutor/DataFlowExecutor_InNode.cxx b/src/GraphExecutor/DataFlowExecutor_InNode.cxx index be81277..c504a20 100644 --- a/src/GraphExecutor/DataFlowExecutor_InNode.cxx +++ b/src/GraphExecutor/DataFlowExecutor_InNode.cxx @@ -386,22 +386,22 @@ GraphExecutor::InNode::~InNode() { } void GraphExecutor::InNode::LockDataWait() { - cdebug_in << "GraphExecutor::InNode::LockDataWait " << endl ; +// cdebug_in << "GraphExecutor::InNode::LockDataWait " << endl ; if ( pthread_mutex_lock( &_MutexDataWait ) ) { perror("Ready pthread_mutex_lock ") ; exit( 0 ) ; } _DataWait = true ; - cdebug_out << "GraphExecutor::InNode::LockDataWait " << endl ; +// cdebug_out << "GraphExecutor::InNode::LockDataWait " << endl ; } void GraphExecutor::InNode::UnLockDataWait() { - cdebug_in << "GraphExecutor::InNode::UnLockDataWait " << endl ; +// cdebug_in << "GraphExecutor::InNode::UnLockDataWait " << endl ; _DataWait = false ; if ( pthread_mutex_unlock( &_MutexDataWait ) ) { perror("Ready pthread_mutex_unlock ") ; exit( 0 ) ; } - cdebug_out << "GraphExecutor::InNode::UnLockDataWait " << endl ; +// cdebug_out << "GraphExecutor::InNode::UnLockDataWait " << endl ; } Engines::Component_var GraphExecutor::InNode::Component() const { @@ -409,10 +409,12 @@ Engines::Component_var GraphExecutor::InNode::Component() const { return _FactoryNode->Component() ; } else { - CORBA::Any const * anAnyComponent = GetChangeNodeInPort( 0 )->GetOutPort()->Value() ; // this +//JR 30.03.2005 CORBA::Any const * anAnyComponent = GetChangeNodeInPort( 0 )->GetOutPort()->Value() ; // this + const CORBA::Any anAnyComponent = GetChangeNodeInPort( 0 )->GetOutPort()->Value() ; // this CORBA::Object_ptr obj ; try { - *anAnyComponent >>= obj ; +//JR 30.03.2005 *anAnyComponent >>= obj ; + anAnyComponent >>= obj ; return Engines::Component::_narrow( obj ) ; } catch( ... ) { @@ -786,10 +788,15 @@ bool GraphExecutor::InNode::Kill() { } } } +// PAL8003 +// JR 24.03.2005 Debug it may have be killed if we have Suspend-Resume-Kill + if ( !RetVal && IsKilled() ) { + RetVal = true ; + } cdebug_out << "GraphExecutor::InNode::Kill " << Name() << " " << ThreadNo() << " " << Automaton()->StateName( State() ) << " Threads " << _OutNode->Threads() << " SuspendedThreads " << _OutNode->SuspendedThreads() - << " EventQSize " << _OutNode->EventQSize() << endl ; + << " EventQSize " << _OutNode->EventQSize() << " returns " << RetVal << endl ; return RetVal ; } -- 2.30.2