-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023 CEA, EDF, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// 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.
+// 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
#define PY_SSIZE_T_MIN INT_MIN
#endif
-//--- from omniORBpy.h (not present on Debian Sarge packages)
-
-struct omniORBpyAPI {
-
- PyObject* (*cxxObjRefToPyObjRef)(const CORBA::Object_ptr cxx_obj,
- CORBA::Boolean hold_lock);
- // Convert a C++ object reference to a Python object reference.
- // If <hold_lock> is true, caller holds the Python interpreter lock.
-
- CORBA::Object_ptr (*pyObjRefToCxxObjRef)(PyObject* py_obj,
- CORBA::Boolean hold_lock);
- // Convert a Python object reference to a C++ object reference.
- // Raises BAD_PARAM if the Python object is not an object reference.
- // If <hold_lock> is true, caller holds the Python interpreter lock.
-
-
- omniORBpyAPI();
- // Constructor for the singleton. Sets up the function pointers.
-};
-
-omniORBpyAPI* api;
+#include <Python.h>
+#include <omniORBpy.h>
+omniORBpyAPI* api=0;
%}
if (!omnipy)
{
PyErr_SetString(PyExc_ImportError, (char*)"Cannot import _omnipy");
- return;
+ return NULL;
}
PyObject* pyapi = PyObject_GetAttrString(omnipy, (char*)"API");
- api = (omniORBpyAPI*)PyCObject_AsVoidPtr(pyapi);
+ api = (omniORBpyAPI*)PyCapsule_GetPointer(pyapi,"_omnipy.API");
Py_DECREF(pyapi);
%}
}
}
-%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) const Engines::MachineParameters &
+// We use a dictionary to represent ContainerParameters structure instead of the CORBA
+// structure itself because it would require a transformation from the Python
+// ContainerParameters structure, generated by omniOrbPy, to a C++ ContainerParameters
+// structure, generated by omniOrb, and this would be quite complex.
+%typemap(typecheck,precedence=SWIG_TYPECHECK_POINTER) const Engines::ContainerParameters &
{
$1 = PyDict_Check($input)? 1 : 0;
}
-%typemap(in) const Engines::MachineParameters &
+%typemap(in) const Engines::ContainerParameters &
{
- //printf("typemap in on Engines::MachineParameters\n");
- MESSAGE("typemap in on Engines::MachineParameters");
+ MESSAGE("typemap in on Engines::ContainerParameters");
if (PyDict_Check($input) == 1)
{
- Engines::MachineParameters *param = new Engines::MachineParameters ;
+ Engines::ContainerParameters *param = new Engines::ContainerParameters ;
SALOME_LifeCycleCORBA::preSet(*param);
PyObject *key, *value;
{
param->container_name = CORBA::string_dup(PyString_AsString(value));
}
+ else if (strcmp(keystr,"resource_name")==0)
+ {
+ param->resource_params.name = CORBA::string_dup(PyString_AsString(value));
+ }
else if (strcmp(keystr,"hostname")==0)
{
- param->hostname = CORBA::string_dup(PyString_AsString(value));
+ param->resource_params.hostname = CORBA::string_dup(PyString_AsString(value));
}
else if (strcmp(keystr,"OS")==0)
{
- param->OS = CORBA::string_dup(PyString_AsString(value));
+ param->resource_params.OS = CORBA::string_dup(PyString_AsString(value));
}
else if (strcmp(keystr,"mem_mb")==0)
{
- param->mem_mb = PyLong_AsLong(value);
+ param->resource_params.mem_mb = PyLong_AsLong(value);
}
else if (strcmp(keystr,"cpu_clock")==0)
{
- param->cpu_clock = PyLong_AsLong(value);
+ param->resource_params.cpu_clock = PyLong_AsLong(value);
}
else if (strcmp(keystr,"nb_proc_per_node")==0)
{
- param->nb_proc_per_node = PyLong_AsLong(value);
+ param->resource_params.nb_proc_per_node = PyLong_AsLong(value);
}
else if (strcmp(keystr,"nb_node")==0)
{
- param->nb_node = PyLong_AsLong(value);
+ param->resource_params.nb_node = PyLong_AsLong(value);
}
else if (strcmp(keystr,"isMPI")==0)
{
else if (strcmp(keystr,"mode")==0)
param->mode = CORBA::string_dup(PyString_AsString(value));
else if (strcmp(keystr,"policy")==0)
- param->policy = CORBA::string_dup(PyString_AsString(value));
+ param->resource_params.policy = CORBA::string_dup(PyString_AsString(value));
else if (strcmp(keystr,"parallelLib")==0)
{
param->parallelLib = CORBA::string_dup(PyString_AsString(value));
}
- else if (strcmp(keystr,"nb_component_nodes")==0)
- {
- param->nb_component_nodes = PyLong_AsLong(value);
- }
}
$1 = param;
}
else
{
- MESSAGE("Not a dictionnary");
- PyErr_SetString(PyExc_TypeError,"Must Be a Python Dictionnary");
+ MESSAGE("Not a ContainerParameters struct");
+ PyErr_SetString(PyExc_TypeError,"Must Be a Python ContainerParameters object");
return NULL;
}
}
-%typemap(freearg) const Engines::MachineParameters &
+%typemap(freearg) const Engines::ContainerParameters &
{
MESSAGE("delete $1");
delete $1;
try {
$action
}
- catch (ServiceUnreachable) {
+ catch (ServiceUnreachable&) {
Py_BLOCK_THREADS
PyErr_SetString(PyExc_RuntimeError,"Naming Service Unreacheable");
return NULL;
