sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Serialization: Fix unserialization of object pointers

Browse source 
--HG--
extra : convert_revision : a5aed880b2fc05841067e8597a58a9484e30b84a
This commit is contained in:
Ali Saidi 2007-09-04 13:12:58 -04:00
parent 021421d663
commit 276a382557
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/python/swig/pyobject.cc
View file

@ -141,11 +141,6 @@ inifile()
return inifile;
}
/**
* Pointer to the Python function that maps names to SimObjects.
*/
PyObject *resolveFunc = NULL;
/**
* Convert a pointer to the Python object that SWIG wraps around a C++
* SimObject pointer back to the actual C++ pointer. See main.i.
@ -155,16 +150,29 @@ extern "C" SimObject *convertSwigSimObjectPtr(PyObject *);
SimObject *
resolveSimObject(const string &name)
{
PyObject *pyPtr = PyEval_CallFunction(resolveFunc, "(s)", name.c_str());
if (pyPtr == NULL) {
PyObject *module = PyImport_ImportModule("m5.SimObject");
if (module == NULL)
panic("Could not import m5.SimObject");
PyObject *resolver = PyObject_GetAttrString(module, "resolveSimObject");
if (resolver == NULL) {
PyErr_Print();
panic("resolveSimObject: failed to find resolveSimObject");
}
PyObject *ptr = PyObject_CallFunction(resolver, "(s)", name.c_str());
if (ptr == NULL) {
PyErr_Print();
panic("resolveSimObject: failure on call to Python for %s", name);
}
SimObject *simObj = convertSwigSimObjectPtr(pyPtr);
if (simObj == NULL)
SimObject *obj = convertSwigSimObjectPtr(ptr);
if (obj == NULL)
panic("resolveSimObject: failure on pointer conversion for %s", name);
return simObj;
}
Py_DECREF(module);
Py_DECREF(resolver);
Py_DECREF(ptr);
return obj;
}