summaryrefslogtreecommitdiff
path: root/src/python/swig/pyevent.cc
diff options
context:
space:
mode:
authorAndreas Sandberg <andreas.sandberg@arm.com>2017-02-27 13:17:51 +0000
committerAndreas Sandberg <andreas.sandberg@arm.com>2017-05-02 12:37:32 +0000
commit60e6e785f970578eba6dbee9330eaecf514b23c8 (patch)
tree9c47c06d22a39b9467d3d4e35c11849a17df7815 /src/python/swig/pyevent.cc
parentba42457254cc362eddc099f22b60d469cc6369e0 (diff)
downloadgem5-60e6e785f970578eba6dbee9330eaecf514b23c8.tar.xz
python: Use PyBind11 instead of SWIG for Python wrappers
Use the PyBind11 wrapping infrastructure instead of SWIG to generate wrappers for functionality that needs to be exported to Python. This has several benefits: * PyBind11 can be redistributed with gem5, which means that we have full control of the version used. This avoid a large number of hard-to-debug SWIG issues we have seen in the past. * PyBind11 doesn't rely on a custom C++ parser, instead it relies on wrappers being explicitly declared in C++. The leads to slightly more boiler-plate code in manually created wrappers, but doesn't doesn't increase the overall code size. A big benefit is that this avoids strange compilation errors when SWIG doesn't understand modern language features. * Unlike SWIG, there is no risk that the wrapper code incorporates incorrect type casts (this has happened on numerous occasions in the past) since these will result in compile-time errors. As a part of this change, the mechanism to define exported methods has been redesigned slightly. New methods can be exported either by declaring them in the SimObject declaration and decorating them with the cxxMethod decorator or by adding an instance of PyBindMethod/PyBindProperty to the cxx_exports class variable. The decorator has the added benefit of making it possible to add a docstring and naming the method's parameters. The new wrappers have the following known issues: * Global events can't be memory managed correctly. This was the case in SWIG as well. Change-Id: I88c5a95b6cf6c32fa9e1ad31dfc08b2e8199a763 Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Andreas Hansson <andreas.hansson@arm.com> Reviewed-by: Andrew Bardsley <andrew.bardsley@arm.com> Reviewed-on: https://gem5-review.googlesource.com/2231 Reviewed-by: Tony Gutierrez <anthony.gutierrez@amd.com> Reviewed-by: Pierre-Yves PĂ©neau <pierre-yves.peneau@lirmm.fr> Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'src/python/swig/pyevent.cc')
-rw-r--r--src/python/swig/pyevent.cc72
1 files changed, 0 insertions, 72 deletions
diff --git a/src/python/swig/pyevent.cc b/src/python/swig/pyevent.cc
deleted file mode 100644
index 39c57d116..000000000
--- a/src/python/swig/pyevent.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2006 The Regents of The University of Michigan
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met: redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer;
- * redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution;
- * neither the name of the copyright holders nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * Authors: Nathan Binkert
- */
-
-#include <Python.h>
-
-#include "python/swig/pyevent.hh"
-
-#include "base/misc.hh"
-#include "sim/async.hh"
-#include "sim/eventq.hh"
-
-PythonEvent::PythonEvent(PyObject *code, Priority priority)
- : Event(priority), eventCode(code)
-{
- if (code == NULL)
- panic("Passed in invalid object");
-}
-
-PythonEvent::~PythonEvent()
-{
-}
-
-void
-PythonEvent::process()
-{
- PyObject *args = PyTuple_New(0);
- PyObject *result = PyObject_Call(eventCode, args, NULL);
- Py_DECREF(args);
-
- if (result) {
- // Nothing to do just decrement the reference count
- Py_DECREF(result);
- } else {
- // Somethign should be done to signal back to the main interpreter
- // that there's been an exception.
- async_event = true;
- async_exception = true;
- /* Wake up some event queue to handle event */
- getEventQueue(0)->wakeup();
- }
-
- // Since the object has been removed from the event queue, its
- // reference count must be decremented.
- Py_DECREF(object);
-}