+// Copyright (C) 2006-2021 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
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//#define REFCNT
+//
+#ifdef REFCNT
+#define private public
+#define protected public
+#include <omniORB4/CORBA.h>
+#include <omniORB4/internal/typecode.h>
+#endif
#include "PythonCORBAConv.hxx"
#include "TypeConversions.hxx"
#include "RuntimeSALOME.hxx"
+#include "PythonPorts.hxx"
#include <iostream>
+//#define _DEVDEBUG_
+#include "YacsTrace.hxx"
+
using namespace YACS::ENGINE;
using namespace std;
-
-void PyCorbaInt::put(const void *data) throw(ConversionException)
+/*!Convert a PyObject (integer) to CORBA::Any (integer)
+ * It's only a wrapper around put(PyObject *data)
+ */
+void PyCorbaInt::put(const void *data)
{
put((PyObject *)data);
}
-//!Convertit un PyObject de type entier en CORBA::Any entier
+//!Convert a PyObject (integer) to CORBA::Any (integer)
/*!
* \param data : python object
*/
+void PyCorbaInt::put(PyObject *data)
+{
+ CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data);
+ YACS::ENGINE::InterpreterSaveThread _loc;
+ _port->put(a);
+ delete a;
+}
-void PyCorbaInt::put(PyObject *data) throw(ConversionException)
+//!Convert a PyObject (boolean) to CORBA::Any (boolean)
+/*!
+ * It's only a wrapper around PyCorbaBool::put(PyObject *data)
+ *
+ * \param data : python object
+ */
+void PyCorbaBool::put(const void *data)
{
- CORBA::Long l= PyLong_AsLong(data);
- CORBA::Any a;
- a <<= l;
- _port->put(&a);
+ put((PyObject *)data);
}
+//!Convert a PyObject (boolean) to CORBA::Any (boolean)
+/*!
+ * Convert it and push it to proxy port
+ *
+ * \param data : python object
+ */
+void PyCorbaBool::put(PyObject *data)
+{
+ CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data);
+ YACS::ENGINE::InterpreterSaveThread _loc;
+ _port->put(a);
+ //delete Any that has been allocated by convertPyObjectCorba
+ delete a;
+}
-void PyCorbaString::put(const void *data) throw(ConversionException)
+void PyCorbaString::put(const void *data)
{
put((PyObject *)data);
}
-//!Convertit un PyObject de type string en CORBA::Any string
+//!Convert a PyObject (string) to CORBA::Any (string)
/*!
* \param data : python object
*/
-void PyCorbaString::put(PyObject *data) throw(ConversionException)
+void PyCorbaString::put(PyObject *data)
{
- char * s=PyString_AsString(data);
- CORBA::Any a;
- a <<= s;
- _port->put(&a);
+ CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data);
+ YACS::ENGINE::InterpreterSaveThread _loc;
+ _port->put(a);
+ delete a;
}
-void PyCorbaDouble::put(const void *data) throw(ConversionException)
+void PyCorbaDouble::put(const void *data)
{
put((PyObject *)data);
}
-//!Convertit un PyObject de type double en CORBA::Any Double
+//!Convert a PyObject (double) to CORBA::Any (double)
/*!
* \param data : python object
*/
-void PyCorbaDouble::put(PyObject *data) throw(ConversionException)
+void PyCorbaDouble::put(PyObject *data)
{
- CORBA::Double d = 0;
- if (PyFloat_Check(data))
- d = (CORBA::Double)PyFloat_AS_DOUBLE(data);
- else if (PyInt_Check(data))
- d = (CORBA::Double)PyInt_AS_LONG(data);
- else
- d = (CORBA::Double)PyLong_AsDouble(data);
- CORBA::Any a;
- a <<= d;
- _port->put(&a);
+ CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data);
+ YACS::ENGINE::InterpreterSaveThread _loc;
+ _port->put(a);
+ delete a;
}
+//!Class PyCorbaSequence is a proxy port that converts a PyObject object (of type sequence) to a CORBA::Any object (of type sequence)
+/*!
+ * \param p : the input CORBA port to adapt to Python output port
+ */
PyCorbaSequence::PyCorbaSequence(InputCorbaPort* p)
- : ProxyPort(p), Port(p->getNode())
+ : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode())
{
- cerr << "CorbaPySequence" << endl;
}
-//!Convertit un PyObject de type Sequence en CORBA::Any Sequence
+//!Convert a PyObject (sequence) to CORBA::Any (sequence)
/*!
* \param data : python object
*/
-void PyCorbaSequence::put(const void *data) throw(ConversionException)
+void PyCorbaSequence::put(const void *data)
{
put((PyObject *)data);
}
-void PyCorbaSequence::put(PyObject *data) throw(ConversionException)
+void PyCorbaSequence::put(PyObject *data)
{
- cerr << "PyCorbaSequence::put" << endl;
- cerr << "data refcnt: " << data->ob_refcnt << endl;
- PyObject_Print(data,stdout,Py_PRINT_RAW);
- cerr << endl;
- int length=PySequence_Size(data);
- cerr <<"length: " << length << endl;
- CORBA::Any *a= convertCorbaPyObject(_port->type(),data);
+ DEBTRACE("data refcnt: " << data->ob_refcnt);
+#ifdef _DEVDEBUG_
+ PyObject_Print(data,stderr,Py_PRINT_RAW);
+ std::cerr << std::endl;
+#endif
+ CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data);
+ YACS::ENGINE::InterpreterSaveThread _loc;
_port->put(a);
+#ifdef REFCNT
+ DEBTRACE("refcount CORBA seqTC: " << ((omni::TypeCode_base*)a->pd_tc.in())->pd_ref_count);
+#endif
+ //delete Any that has been allocated by convertPyObjectCorba
+ delete a;
+#ifdef REFCNT
+ DEBTRACE("refcount CORBA seqTC: " << ((omni::TypeCode_base*)((InputCorbaPort*)_port)->getAny()->pd_tc.in())->pd_ref_count);
+#endif
}
-
+//!Class PyCorbaObjref is a proxy port that converts a PyObject object (of type objref) to a CORBA::Any object (of type objref)
+/*!
+ * \param p : the input CORBA port to adapt to Python output port
+ */
PyCorbaObjref::PyCorbaObjref(InputCorbaPort* p)
- : ProxyPort(p), Port(p->getNode())
+ : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode())
{
_pyorb = getSALOMERuntime()->getPyOrb();
_orb = getSALOMERuntime()->getOrb();
// _dynFactory = getSALOMERuntime()->getDynFactory();
}
-//!Convertit un PyObject de type Objref en CORBA::Any Objref
+//!Convert a PyObject (Objref) to CORBA::Any (Objref)
/*!
* \param data : python object
*/
-void PyCorbaObjref::put(const void *data) throw(ConversionException)
+void PyCorbaObjref::put(const void *data)
+{
+ put((PyObject *)data);
+}
+
+void PyCorbaObjref::put(PyObject *data)
+{
+ DEBTRACE("data refcnt: " << data->ob_refcnt);
+#ifdef _DEVDEBUG_
+ PyObject_Print(data,stderr,Py_PRINT_RAW);
+ std::cerr << std::endl;
+#endif
+ CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data);
+ YACS::ENGINE::InterpreterSaveThread _loc;
+ _port->put(a);
+ delete a;
+}
+
+//!Class PyCorbaStruct is a proxy port that converts a PyObject object (of type struct) to a CORBA::Any object (of type struct)
+/*!
+ * \param p : the input CORBA port to adapt to Python output port
+ */
+PyCorbaStruct::PyCorbaStruct(InputCorbaPort* p)
+ : ProxyPort(p), DataPort(p->getName(), p->getNode(), p->edGetType()), Port(p->getNode())
+{
+}
+
+void PyCorbaStruct::put(const void *data)
{
put((PyObject *)data);
}
-void PyCorbaObjref::put(PyObject *data) throw(ConversionException)
-{
- cerr << "PyCorbaObjref::put" << endl;
- cerr << "data refcnt: " << data->ob_refcnt << endl;
- PyObject_Print(data,stdout,Py_PRINT_RAW);
- cerr << endl;
-
- //ne marche pas ???
- //hold_lock is true: caller is supposed to hold the GIL.
- //omniorb will not take the GIL
- //CORBA::Object_ptr ob=api->pyObjRefToCxxObjRef(data,(CORBA::Boolean)1);
-
- PyObject_Print(_pyorb,stdout,Py_PRINT_RAW);
- cerr << endl;
- PyObject *pystring = PyObject_CallMethod(_pyorb, "object_to_string", "O", data);
- if(pystring == NULL)
- {
- PyErr_Print();
- throw Exception("not possible to get objref");
- }
-
- PyObject_Print(pystring,stdout,Py_PRINT_RAW);
- cerr << endl;
- CORBA::Object_ptr ob= _orb->string_to_object(PyString_AsString(pystring));
- Py_DECREF(pystring);
- cerr << "data refcnt: " << data->ob_refcnt << endl;
-
- CORBA::Any a;
- a <<= ob;
- _port->put(&a);
+//!Convert a PyObject (struct) to CORBA::Any (struct)
+/*!
+ * \param data : python object
+ */
+void PyCorbaStruct::put(PyObject *data)
+{
+ DEBTRACE("data refcnt: " << data->ob_refcnt);
+#ifdef _DEVDEBUG_
+ PyObject_Print(data,stderr,Py_PRINT_RAW);
+ std::cerr << std::endl;
+#endif
+ CORBA::Any *a= convertPyObjectCorba(_port->edGetType(),data);
+ YACS::ENGINE::InterpreterSaveThread _loc;
+ _port->put(a);
+#ifdef REFCNT
+ DEBTRACE("refcount CORBA structTC: " << ((omni::TypeCode_base*)a->pd_tc.in())->pd_ref_count);
+#endif
+ //delete Any that has been allocated by convertPyObjectCorba
+ delete a;
+#ifdef REFCNT
+ DEBTRACE("refcount CORBA structTC: " << ((omni::TypeCode_base*)((InputCorbaPort*)_port)->getAny()->pd_tc.in())->pd_ref_count);
+#endif
}
