Expose the C++ event queue to python via the python function
m5.internal.event.create(). It takes a python object and a Tick and calls process() when the Tick occurs. --HG-- extra : convert_revision : 5e4c9728982b206163ff51e6850a1497d85ad7a3
This commit is contained in:
parent
ba191d85c2
commit
ecd1420341
5 changed files with 171 additions and 0 deletions
|
@ -131,6 +131,8 @@ base_sources = Split('''
|
||||||
python/swig/init.cc
|
python/swig/init.cc
|
||||||
python/swig/debug_wrap.cc
|
python/swig/debug_wrap.cc
|
||||||
python/swig/main_wrap.cc
|
python/swig/main_wrap.cc
|
||||||
|
python/swig/event_wrap.cc
|
||||||
|
python/swig/pyevent.cc
|
||||||
|
|
||||||
sim/builder.cc
|
sim/builder.cc
|
||||||
sim/debug.cc
|
sim/debug.cc
|
||||||
|
|
|
@ -107,6 +107,7 @@ def swig_it(basename):
|
||||||
|
|
||||||
swig_it('main')
|
swig_it('main')
|
||||||
swig_it('debug')
|
swig_it('debug')
|
||||||
|
swig_it('event')
|
||||||
|
|
||||||
# Action function to build the zip archive. Uses the PyZipFile module
|
# Action function to build the zip archive. Uses the PyZipFile module
|
||||||
# included in the standard Python library.
|
# included in the standard Python library.
|
||||||
|
|
54
src/python/swig/event.i
Normal file
54
src/python/swig/event.i
Normal file
|
@ -0,0 +1,54 @@
|
||||||
|
/*
|
||||||
|
* 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
|
||||||
|
*/
|
||||||
|
|
||||||
|
%module event
|
||||||
|
|
||||||
|
%{
|
||||||
|
#include "python/swig/pyevent.hh"
|
||||||
|
|
||||||
|
inline void
|
||||||
|
create(PyObject *object, Tick when)
|
||||||
|
{
|
||||||
|
new PythonEvent(object, when);
|
||||||
|
}
|
||||||
|
%}
|
||||||
|
|
||||||
|
%include "stdint.i"
|
||||||
|
%include "sim/host.hh"
|
||||||
|
|
||||||
|
%inline %{
|
||||||
|
extern void create(PyObject *object, Tick when);
|
||||||
|
%}
|
||||||
|
|
||||||
|
%wrapper %{
|
||||||
|
// fix up module name to reflect the fact that it's inside the m5 package
|
||||||
|
#undef SWIG_name
|
||||||
|
#define SWIG_name "m5.internal._event"
|
||||||
|
%}
|
66
src/python/swig/pyevent.cc
Normal file
66
src/python/swig/pyevent.cc
Normal file
|
@ -0,0 +1,66 @@
|
||||||
|
/*
|
||||||
|
* 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"
|
||||||
|
|
||||||
|
PythonEvent::PythonEvent(PyObject *obj, Tick when, Priority priority)
|
||||||
|
: Event(&mainEventQueue, priority), object(obj)
|
||||||
|
{
|
||||||
|
if (object == NULL)
|
||||||
|
panic("Passed in invalid object");
|
||||||
|
|
||||||
|
Py_INCREF(object);
|
||||||
|
|
||||||
|
setFlags(AutoDelete);
|
||||||
|
schedule(when);
|
||||||
|
}
|
||||||
|
|
||||||
|
PythonEvent::~PythonEvent()
|
||||||
|
{
|
||||||
|
Py_DECREF(object);
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
PythonEvent::process()
|
||||||
|
{
|
||||||
|
PyObject *result;
|
||||||
|
|
||||||
|
result = PyObject_CallMethod(object, "process", "");
|
||||||
|
|
||||||
|
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.
|
||||||
|
}
|
||||||
|
}
|
48
src/python/swig/pyevent.hh
Normal file
48
src/python/swig/pyevent.hh
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
/*
|
||||||
|
* 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
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __PYTHON_SWIG_PYEVENT_HH__
|
||||||
|
#define __PYTHON_SWIG_PYEVENT_HH__
|
||||||
|
|
||||||
|
#include "sim/eventq.hh"
|
||||||
|
|
||||||
|
class PythonEvent : public Event
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
PyObject *object;
|
||||||
|
|
||||||
|
public:
|
||||||
|
PythonEvent(PyObject *obj, Tick when, Priority priority = Default_Pri);
|
||||||
|
~PythonEvent();
|
||||||
|
|
||||||
|
virtual void process();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // __PYTHON_SWIG_PYEVENT_HH__
|
Loading…
Reference in a new issue