Salome HOME
projects
/
modules
/
yacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into V9_dev
[modules/yacs.git]
/
src
/
runtime
/
DistributedPythonNode.cxx
diff --git
a/src/runtime/DistributedPythonNode.cxx
b/src/runtime/DistributedPythonNode.cxx
index 7eab4dcac406922c71586b2468589554345c78a9..bf78b6d30d9f462f34ba995814133d778b86f76f 100644
(file)
--- a/
src/runtime/DistributedPythonNode.cxx
+++ b/
src/runtime/DistributedPythonNode.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2006-201
4
CEA/DEN, EDF R&D
+// Copyright (C) 2006-201
6
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-72,7
+72,7
@@
void DistributedPythonNode::load()
_errorDetails=msg.str();
throw Exception(msg.str());
}
_errorDetails=msg.str();
throw Exception(msg.str());
}
- const char picklizeScript[]="import
cPickle\ndef pickleForDistPyth2009(*args,**kws):\n return cPickle.dumps((args,kws),-1)\n\ndef unPickleForDistPyth2009(st):\n args=cP
ickle.loads(st)\n return args\n";
+ const char picklizeScript[]="import
pickle\ndef pickleForDistPyth2009(*args,**kws):\n return pickle.dumps((args,kws),-1)\n\ndef unPickleForDistPyth2009(st):\n args=p
ickle.loads(st)\n return args\n";
PyObject *res=PyRun_String(picklizeScript,Py_file_input,_context,_context);
if(res == NULL)
{
PyObject *res=PyRun_String(picklizeScript,Py_file_input,_context,_context);
if(res == NULL)
{
@@
-113,13
+113,12
@@
void DistributedPythonNode::load()
if(!_container)
throw Exception("No container specified !");
SalomeContainer *containerCast0(dynamic_cast<SalomeContainer *>(_container));
if(!_container)
throw Exception("No container specified !");
SalomeContainer *containerCast0(dynamic_cast<SalomeContainer *>(_container));
- SalomeHPContainer
*containerCast1(dynamic_cast<SalomeHPContainer
*>(_container));
+ SalomeHPContainer
Base *containerCast1(dynamic_cast<SalomeHPContainerBase
*>(_container));
if(containerCast0)
objContainer=containerCast0->getContainerPtr(this);
else if(containerCast1)
{
if(containerCast0)
objContainer=containerCast0->getContainerPtr(this);
else if(containerCast1)
{
- YACS::BASES::AutoCppPtr<SalomeContainerTmpForHP> tmpCont(SalomeContainerTmpForHP::BuildFrom(containerCast1,this));
- objContainer=tmpCont->getContainerPtr(this);
+ objContainer=containerCast1->getContainerPtr(this);
}
else
throw Exception("Unrecognized type of container ! Salome one is expected !");
}
else
throw Exception("Unrecognized type of container ! Salome one is expected !");
@@
-134,7
+133,7
@@
void DistributedPythonNode::load()
}
else
{
}
else
{
- Engines::PyNode_var dftPyScript(objContainer->getDefaultPyNode());
+ Engines::PyNode_var dftPyScript(objContainer->getDefaultPyNode(
getName().c_str()
));
if(CORBA::is_nil(dftPyScript))
_pynode = objContainer->createPyNode(getName().c_str(),getScript().c_str());
else
if(CORBA::is_nil(dftPyScript))
_pynode = objContainer->createPyNode(getName().c_str(),getScript().c_str());
else
@@
-181,7
+180,7
@@
void DistributedPythonNode::execute()
PyTuple_SetItem(args,pos,ob);
}
PyObject *serializationInput=PyObject_CallObject(_pyfuncSer,args);
PyTuple_SetItem(args,pos,ob);
}
PyObject *serializationInput=PyObject_CallObject(_pyfuncSer,args);
- std::string serializationInputC=Py
String
_AsString(serializationInput);
+ std::string serializationInputC=Py
Bytes
_AsString(serializationInput);
serializationInputCorba=new Engines::pickledArgs;
int len=serializationInputC.length();
serializationInputCorba->length(serializationInputC.length());
serializationInputCorba=new Engines::pickledArgs;
int len=serializationInputC.length();
serializationInputCorba->length(serializationInputC.length());
@@
-213,7
+212,7
@@
void DistributedPythonNode::execute()
{
AutoGIL agil;
args = PyTuple_New(1);
{
AutoGIL agil;
args = PyTuple_New(1);
- PyObject* resultPython=Py
String
_FromString(resultCorbaC);
+ PyObject* resultPython=Py
Bytes
_FromString(resultCorbaC);
delete [] resultCorbaC;
PyTuple_SetItem(args,0,resultPython);
PyObject *finalResult=PyObject_CallObject(_pyfuncUnser,args);
delete [] resultCorbaC;
PyTuple_SetItem(args,0,resultPython);
PyObject *finalResult=PyObject_CallObject(_pyfuncUnser,args);
@@
-238,7
+237,7
@@
void DistributedPythonNode::execute()
{
OutputPyPort *p=(OutputPyPort *)*iter;
DEBTRACE( "port name: " << p->getName() );
{
OutputPyPort *p=(OutputPyPort *)*iter;
DEBTRACE( "port name: " << p->getName() );
- DEBTRACE( "port kind: " << p->
edGetType()->kind
() );
+ DEBTRACE( "port kind: " << p->
typeName
() );
DEBTRACE( "port pos : " << pos );
if(PyTuple_Check(finalResult))ob=PyTuple_GetItem(finalResult,pos) ;
else ob=finalResult;
DEBTRACE( "port pos : " << pos );
if(PyTuple_Check(finalResult))ob=PyTuple_GetItem(finalResult,pos) ;
else ob=finalResult;