summaryrefslogtreecommitdiff
path: root/src/sim
diff options
context:
space:
mode:
authorAndreas Hansson <andreas.hansson@arm.com>2016-06-28 03:50:00 -0400
committerAndreas Hansson <andreas.hansson@arm.com>2016-06-28 03:50:00 -0400
commit50e9d0df51247f4aeafe63cdab2a0f53a09cc8e4 (patch)
treea18ea042820119cfcf1d97f7070ed782816c39d9 /src/sim
parent9c8710430eb671b5e89f291b9f0a10b6156ac633 (diff)
downloadgem5-50e9d0df51247f4aeafe63cdab2a0f53a09cc8e4.tar.xz
scons: Track swig packages when loading embedded swig code
This patch changes how the embedded swig code is loaded to ensure that gem5 works with swig 3.0.9. For Python 2.7 and above, swig 3.0.9 now relies on importlib, and actually looks in the appropriate packages, even for the wrapped C code. However, the swig wrapper does not explicitly place the module in the right package (it just calls Py_InitModule), and we have to take explicit action to ensure that the swig code can be loaded. This patch adds the information to the generated wrappers and the appropriate calls to set the context as part of the swig initialisation. Previous versions of swig used to fall back on looking in the global namespace for the wrappers (and still do for Python 2.6), but technically things should not work without the functionality in this patch.
Diffstat (limited to 'src/sim')
-rw-r--r--src/sim/init.cc24
-rw-r--r--src/sim/init.hh11
2 files changed, 24 insertions, 11 deletions
diff --git a/src/sim/init.cc b/src/sim/init.cc
index 0a15c384d..2e1dd629c 100644
--- a/src/sim/init.cc
+++ b/src/sim/init.cc
@@ -148,8 +148,8 @@ EmbeddedPython::initAll()
return 0;
}
-EmbeddedSwig::EmbeddedSwig(void (*init_func)())
- : initFunc(init_func)
+EmbeddedSwig::EmbeddedSwig(void (*init_func)(), const string& _context)
+ : initFunc(init_func), context(_context)
{
getList().push_back(this);
}
@@ -164,12 +164,22 @@ EmbeddedSwig::getList()
void
EmbeddedSwig::initAll()
{
- // initialize SWIG modules. initSwig() is autogenerated and calls
+ char* old_context = _Py_PackageContext;
+ // initialize SWIG modules. initFunc() is autogenerated and calls
// all of the individual swig initialization functions.
- list<EmbeddedSwig *>::iterator i = getList().begin();
- list<EmbeddedSwig *>::iterator end = getList().end();
- for (; i != end; ++i)
- (*i)->initFunc();
+ for (auto i : getList()) {
+ // to ensure that the loaded modules are placed in the right
+ // package we have to be a bit unorthodox and directly
+ // manipulate the package context since swig simply calls
+ // Py_InitModule with nothing but the module name of the
+ // wrapper
+ char* cstr = new char[i->context.size() + 1];
+ strcpy(cstr, i->context.c_str());
+ _Py_PackageContext = cstr;
+ i->initFunc();
+ delete[] cstr;
+ }
+ _Py_PackageContext = old_context;
}
int
diff --git a/src/sim/init.hh b/src/sim/init.hh
index 766cb4365..2bbcd23da 100644
--- a/src/sim/init.hh
+++ b/src/sim/init.hh
@@ -33,10 +33,8 @@
#include <Python.h>
-/*
- * Data structure describing an embedded python file.
- */
#include <list>
+#include <string>
#include <inttypes.h>
@@ -45,6 +43,9 @@ struct _object;
typedef _object PyObject;
#endif
+/*
+ * Data structure describing an embedded python file.
+ */
struct EmbeddedPython
{
const char *filename;
@@ -70,7 +71,9 @@ struct EmbeddedSwig
{
void (*initFunc)();
- EmbeddedSwig(void (*init_func)());
+ std::string context;
+
+ EmbeddedSwig(void (*init_func)(), const std::string& _context);
static std::list<EmbeddedSwig *> &getList();
static void initAll();