Attachment #114662 for bug #155974

View | Details | Raw Unified | Return to bug 155974 | Differences between

and this patch

Lines 281-285 Link Here

(-)SUPERV_SRC_3.2.2/adm_local/unix/make_commence.in (-2 / +2 lines)
281		281
282	$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC_3.2.2:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \	282	$(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC_3.2.2:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
283	$(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%)	283	$(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%)
284	cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \	284	cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
285	-I @GUI_ROOT_DIR@/adm_local/unix/config_files	285	-I @GUI_ROOT_DIR@/adm_local/unix/config_files

Lines 233-239 Link Here

(-)SUPERV_SRC_3.2.2/src/GraphEditor/DataFlowEditor_DataFlow.hxx (-1 / +1 lines)
233	long SubStreamGraphsNumber() ;	233	long SubStreamGraphsNumber() ;
234		234
235	void Executor(GraphExecutor::DataFlow * DataFlowExecutor ) ;	235	void Executor(GraphExecutor::DataFlow * DataFlowExecutor ) ;
236	GraphExecutor::DataFlow * GraphEditor::DataFlow::Executor() const ;	236	GraphExecutor::DataFlow * Executor() const ;
237		237
238	};	238	};
239		239




                      const GraphBase::ListOfSLinks &aDatas ) ;

//      bool GraphEditor::OutNode::LinkSaveXML( ostream &f , char *Tabs ,
      bool LinkSaveXML( QDomDocument & Graph , QDomElement & link ,
                                              GraphBase::SLink aLink ,
                                              bool wdata ) const ;
//      bool SaveXML(ostream &f ) ;QDomDocument & Graph 
      bool SaveXML( ostream & f , QDomDocument & Graph ,
                    bool aSuperGraph , QDomElement & supergraph ) ;

      bool LinkSavePY( ostream &f ,
                                             const char *aGraphName ,
                                             GraphBase::SLink aLink ,
                                             bool fromparam ,

Lines 620-627 Link Here

(-)SUPERV_SRC_3.2.2/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx (-2 / +2 lines)
620	char * msg = "Cannot pthread_create " ;	620	char * msg = "Cannot pthread_create " ;
621	perror( msg ) ;	621	perror( msg ) ;
622	cdebug << ThreadNo() << " " << msg << " --> sleep(5)" << endl ;	622	cdebug << ThreadNo() << " " << msg << " --> sleep(5)" << endl ;
623	cdebug << ThreadNo() << " PTHREAD_THREADS_MAX : "	623	// cdebug << ThreadNo() << " PTHREAD_THREADS_MAX : "
624	<< PTHREAD_THREADS_MAX << " pthread_create status : " ;	624	// << PTHREAD_THREADS_MAX << " pthread_create status : " ;
625	if ( pthread_sts == EAGAIN ) {	625	if ( pthread_sts == EAGAIN ) {
626	cdebug << "EAGAIN(" << pthread_sts << ")" << endl ;	626	cdebug << "EAGAIN(" << pthread_sts << ")" << endl ;
627	cdebug << _OutNode->CreatedThreads() << " was created (and exited)" << endl ;	627	cdebug << _OutNode->CreatedThreads() << " was created (and exited)" << endl ;

Lines 370-376 Link Here

(-)SUPERV_SRC_3.2.2/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx (-1 / +8 lines)
370	case CORBA::tk_long : {	370	case CORBA::tk_long : {
371	CORBA::Long l ;	371	CORBA::Long l ;
372	data >>= l ;	372	data >>= l ;
373	PyObject * ArgValue = Py_BuildValue( "l" , l ) ;	373	// epa - Porting to 64-bit Linux:CORBA::Long is incorrectly treated as unsigned
		374	// integer by Py_BuildValue("l", val) in Python 2.4.1. Using Py_BuildValue("i",val)
		375	// seemsto help
		376	PyObject * ArgValue = NULL;
		377	if ( SIZEOF_LONG == 4 )
		378	ArgValue = Py_BuildValue( "l" , l ) ;
		379	else
		380	ArgValue = Py_BuildValue( "i" , l ) ;
374	#if PyDynInvokeTrace	381	#if PyDynInvokeTrace
375	cdebug << "ArgIn" << i << " : " << sname << " " << method << " Value " << l	382	cdebug << "ArgIn" << i << " : " << sname << " " << method << " Value " << l
376	<< " ArgValue->ob_refcnt" << ArgValue->ob_refcnt << endl ;	383	<< " ArgValue->ob_refcnt" << ArgValue->ob_refcnt << endl ;

Lines 158-164 Link Here

(-)SUPERV_SRC_3.2.2/src/Supervision/Graph_Impl.hxx (-1 / +1 lines)
158	virtual SUPERV::Link_ptr Link( SUPERV::Port_ptr OutPort ,	158	virtual SUPERV::Link_ptr Link( SUPERV::Port_ptr OutPort ,
159	SUPERV::Port_ptr InPort ) ;	159	SUPERV::Port_ptr InPort ) ;
160		160
161	virtual SUPERV::ListOfNodes_var Graph_Impl::SetNode( SUPERV::ListOfNodes_var RetVal ,	161	virtual SUPERV::ListOfNodes_var SetNode( SUPERV::ListOfNodes_var RetVal ,
162	GraphBase::ComputingNode * aNode ) ;	162	GraphBase::ComputingNode * aNode ) ;
163	virtual SUPERV::ListOfNodes * Nodes() ;	163	virtual SUPERV::ListOfNodes * Nodes() ;
164	virtual void SetNodeObjRef( GraphEditor::InNode * anInNode ) ;	164	virtual void SetNodeObjRef( GraphEditor::InNode * anInNode ) ;

Return to bug 155974

Lines 62-75 Link Here

(-)SUPERV_SRC_3.2.2/src/GraphEditor/DataFlowEditor_OutNode.hxx (-2 / +2 lines)
62	const GraphBase::ListOfSLinks &aDatas ) ;	62	const GraphBase::ListOfSLinks &aDatas ) ;
63		63
64	// bool GraphEditor::OutNode::LinkSaveXML( ostream &f , char *Tabs ,	64	// bool GraphEditor::OutNode::LinkSaveXML( ostream &f , char *Tabs ,
65	bool GraphEditor::OutNode::LinkSaveXML( QDomDocument & Graph , QDomElement & link ,	65	bool LinkSaveXML( QDomDocument & Graph , QDomElement & link ,
66	GraphBase::SLink aLink ,	66	GraphBase::SLink aLink ,
67	bool wdata ) const ;	67	bool wdata ) const ;
68	// bool SaveXML(ostream &f ) ;QDomDocument & Graph	68	// bool SaveXML(ostream &f ) ;QDomDocument & Graph
69	bool SaveXML( ostream & f , QDomDocument & Graph ,	69	bool SaveXML( ostream & f , QDomDocument & Graph ,
70	bool aSuperGraph , QDomElement & supergraph ) ;	70	bool aSuperGraph , QDomElement & supergraph ) ;
71		71
72	bool GraphEditor::OutNode::LinkSavePY( ostream &f ,	72	bool LinkSavePY( ostream &f ,
73	const char *aGraphName ,	73	const char *aGraphName ,
74	GraphBase::SLink aLink ,	74	GraphBase::SLink aLink ,
75	bool fromparam ,	75	bool fromparam ,