#include <lib/base/eerror.h>
#include <lib/base/elock.h>
+#include <lib/gdi/grc.h>
+
+DEFINE_REF(eSocketNotifier);
eSocketNotifier::eSocketNotifier(eMainloop *context, int fd, int requested, bool startnow): context(*context), fd(fd), state(0), requested(requested)
{
- if (startnow)
+ if (startnow)
start();
}
void eSocketNotifier::stop()
{
if (state)
+ {
+ state=0;
context.removeSocketNotifier(this);
-
- state=0;
+ }
}
- // timer
+DEFINE_REF(eTimer);
+
void eTimer::start(long msek, bool singleShot)
{
if (bActive)
bActive = true;
bSingleShot = singleShot;
interval = msek;
- gettimeofday(&nextActivation, 0);
- nextActivation.tv_sec -= context.getTimeOffset();
-// eDebug("this = %p\nnow sec = %d, usec = %d\nadd %d msec", this, nextActivation.tv_sec, nextActivation.tv_usec, msek);
+ clock_gettime(CLOCK_MONOTONIC, &nextActivation);
+// eDebug("this = %p\nnow sec = %d, nsec = %d\nadd %d msec", this, nextActivation.tv_sec, nextActivation.tv_nsec, msek);
nextActivation += (msek<0 ? 0 : msek);
-// eDebug("next Activation sec = %d, usec = %d", nextActivation.tv_sec, nextActivation.tv_usec );
+// eDebug("next Activation sec = %d, nsec = %d", nextActivation.tv_sec, nextActivation.tv_nsec );
context.addTimer(this);
}
bActive = bSingleShot = true;
interval = 0;
- gettimeofday(&nextActivation, 0);
- nextActivation.tv_sec -= context.getTimeOffset();
-// eDebug("this = %p\nnow sec = %d, usec = %d\nadd %d sec", this, nextActivation.tv_sec, nextActivation.tv_usec, seconds);
+ clock_gettime(CLOCK_MONOTONIC, &nextActivation);
+// eDebug("this = %p\nnow sec = %d, nsec = %d\nadd %d sec", this, nextActivation.tv_sec, nextActivation.tv_nsec, seconds);
if ( seconds > 0 )
nextActivation.tv_sec += seconds;
-// eDebug("next Activation sec = %d, usec = %d", nextActivation.tv_sec, nextActivation.tv_usec );
+// eDebug("next Activation sec = %d, nsec = %d", nextActivation.tv_sec, nextActivation.tv_nsec );
context.addTimer(this);
}
/*emit*/ timeout();
}
-void eTimer::addTimeOffset( int offset )
-{
- nextActivation.tv_sec += offset;
-}
-
// mainloop
ePtrList<eMainloop> eMainloop::existing_loops;
+eMainloop::~eMainloop()
+{
+ existing_loops.remove(this);
+ for (std::map<int, eSocketNotifier*>::iterator it(notifiers.begin());it != notifiers.end();++it)
+ it->second->stop();
+ while(m_timer_list.begin() != m_timer_list.end())
+ m_timer_list.begin()->stop();
+}
+
void eMainloop::addSocketNotifier(eSocketNotifier *sn)
{
int fd = sn->getFD();
+ if (m_inActivate && m_inActivate->ref.count == 1)
+ {
+ /* when the current active SocketNotifier's refcount is one,
+ then no more external references are existing.
+ So it gets destroyed when the activate callback is finished (->AddRef() / ->Release() calls in processOneEvent).
+ But then the sn->stop() is called to late for the next Asserion.
+ Thus we call sn->stop() here (this implicitly calls eMainloop::removeSocketNotifier) and we don't get trouble
+ with the next Assertion.
+ */
+ m_inActivate->stop();
+ }
ASSERT(notifiers.find(fd) == notifiers.end());
notifiers[fd]=sn;
}
int fd = sn->getFD();
std::map<int,eSocketNotifier*>::iterator i(notifiers.find(fd));
if (i != notifiers.end())
- return notifiers.erase(i);
- eFatal("removed socket notifier which is not present");
+ {
+ notifiers.erase(i);
+ return;
+ }
+ for (i = notifiers.begin(); i != notifiers.end(); ++i)
+ eDebug("fd=%d, sn=%d", i->second->getFD(), (void*)i->second);
+ eFatal("removed socket notifier which is not present, fd=%d", fd);
}
int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePyObject additional)
long poll_timeout = -1; /* infinite in case of empty timer list */
- if (!m_timer_list.empty() || twisted_timeout > 0)
+ if (!m_timer_list.empty())
{
- applyTimeOffset();
- if (!m_timer_list.empty())
+ /* process all timers which are ready. first remove them out of the list. */
+ while (!m_timer_list.empty() && (poll_timeout = timeout_usec( m_timer_list.begin()->getNextActivation() ) ) <= 0 )
{
- /* process all timers which are ready. first remove them out of the list. */
- while (!m_timer_list.empty() && (poll_timeout = timeout_usec( m_timer_list.begin()->getNextActivation() ) ) <= 0 )
- {
- m_timer_list.begin()->activate();
- applyTimeOffset();
- }
- if (poll_timeout < 0)
- poll_timeout = 0;
- else /* convert us to ms */
- poll_timeout /= 1000;
+ eTimer *tmr = m_timer_list.begin();
+ tmr->AddRef();
+ tmr->activate();
+ tmr->Release();
}
+ if (poll_timeout < 0)
+ poll_timeout = 0;
+ else /* convert us to ms */
+ poll_timeout /= 1000;
}
if ((twisted_timeout > 0) && (poll_timeout > 0) && ((unsigned int)poll_timeout > twisted_timeout))
// build the poll aray
pollfd pfd[fdcount]; // make new pollfd array
std::map<int,eSocketNotifier*>::iterator it = notifiers.begin();
+
int i=0;
for (; i < nativecount; ++i, ++it)
{
if (additional)
{
+#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
+ typedef int Py_ssize_t;
+# define PY_SSIZE_T_MAX INT_MAX
+# define PY_SSIZE_T_MIN INT_MIN
+#endif
PyObject *key, *val;
- int pos=0;
+ Py_ssize_t pos=0;
while (PyDict_Next(additional, &pos, &key, &val)) {
pfd[i].fd = PyObject_AsFileDescriptor(key);
pfd[i++].events = PyInt_AsLong(val);
}
}
+ m_is_idle = 1;
+
if (this == eApp)
+ {
+ gOpcode op;
+ op.dc = 0;
+ op.opcode = gOpcode::flush;
+ gRC::getInstance()->submit(op);
Py_BEGIN_ALLOW_THREADS
ret = ::poll(pfd, fdcount, poll_timeout);
Py_END_ALLOW_THREADS
- else
+
+ } else
ret = ::poll(pfd, fdcount, poll_timeout);
+ m_is_idle = 0;
+
/* ret > 0 means that there are some active poll entries. */
if (ret > 0)
{
if (it != notifiers.end()
&& it->second->state == 1) // added and in poll
{
- int req = it->second->getRequested();
- if (pfd[i].revents & req)
- it->second->activate(pfd[i].revents & req);
+ m_inActivate = it->second;
+ int req = m_inActivate->getRequested();
+ if (pfd[i].revents & req) {
+ m_inActivate->AddRef();
+ m_inActivate->activate(pfd[i].revents & req);
+ m_inActivate->Release();
+ }
pfd[i].revents &= ~req;
+ m_inActivate = 0;
}
if (pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL))
eDebug("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d)", pfd[i].fd, pfd[i].revents);
if (twisted_timeout)
{
- gettimeofday(&m_twisted_timer, 0);
+ clock_gettime(CLOCK_MONOTONIC, &m_twisted_timer);
m_twisted_timer += twisted_timeout;
}
int to = 0;
if (twisted_timeout)
{
- timeval now, timeout;
- gettimeofday(&now, 0);
- m_twisted_timer += time_offset; // apply pending offset
+ timespec now, timeout;
+ clock_gettime(CLOCK_MONOTONIC, &now);
if (m_twisted_timer<=now) // timeout
return 0;
timeout = m_twisted_timer - now;
- to = timeout.tv_sec * 1000 + timeout.tv_usec / 1000;
- // remove pending offset .. it is re-applied in next call of processOneEvent.. applyTimeOffset
- m_twisted_timer -= time_offset;
+ to = timeout.tv_sec * 1000 + timeout.tv_nsec / 1000000;
}
ret = processOneEvent(to, res, dict);
} while ( !ret && !(res && *res) );
app_quit_now = true;
}
-void eMainloop::addTimeOffset(int offset)
+eApplication* eApp = 0;
+
+#include "structmember.h"
+
+extern "C" {
+
+// eTimer replacement
+
+struct eTimerPy
{
- for (ePtrList<eMainloop>::iterator it(existing_loops.begin()); it != existing_loops.end(); ++it )
- it->addInstanceTimeOffset(offset);
+ PyObject_HEAD
+ eTimer *tm;
+ PyObject *in_weakreflist; /* List of weak references */
+};
+
+static int
+eTimerPy_traverse(eTimerPy *self, visitproc visit, void *arg)
+{
+ PyObject *obj = self->tm->timeout.getSteal();
+ if (obj) {
+ Py_VISIT(obj);
+ }
+ return 0;
}
-void eMainloop::addInstanceTimeOffset(int offset)
+static int
+eTimerPy_clear(eTimerPy *self)
{
- singleLock s(recalcLock);
- if (m_timer_list.empty())
- time_offset=0;
- else
+ PyObject *obj = self->tm->timeout.getSteal(true);
+ if (obj)
+ Py_CLEAR(obj);
+ return 0;
+}
+
+static void
+eTimerPy_dealloc(eTimerPy* self)
+{
+ if (self->in_weakreflist != NULL)
+ PyObject_ClearWeakRefs((PyObject *) self);
+ eTimerPy_clear(self);
+ self->tm->Release();
+ self->ob_type->tp_free((PyObject*)self);
+}
+
+static PyObject *
+eTimerPy_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+ eTimerPy *self = (eTimerPy *)type->tp_alloc(type, 0);
+ self->tm = eTimer::create(eApp);
+ self->tm->AddRef();
+ self->in_weakreflist = NULL;
+ return (PyObject *)self;
+}
+
+static PyObject *
+eTimerPy_is_active(eTimerPy* self)
+{
+ PyObject *ret = NULL;
+ ret = self->tm->isActive() ? Py_True : Py_False;
+ Org_Py_INCREF(ret);
+ return ret;
+}
+
+static PyObject *
+eTimerPy_start(eTimerPy* self, PyObject *args)
+{
+ long v=0;
+ long singleShot=0;
+ if (PyTuple_Size(args) > 1)
{
- if ( time_offset )
- eDebug("time_offset %d avail.. add new offset %d than new is %d",
- time_offset, offset, time_offset+offset);
- time_offset+=offset;
+ if (!PyArg_ParseTuple(args, "ll", &v, &singleShot)) // when 2nd arg is a value
+ {
+ PyObject *obj=0;
+ if (!PyArg_ParseTuple(args, "lO", &v, &obj)) // get 2nd arg as python object
+ return NULL;
+ else if (obj == Py_True)
+ singleShot=1;
+ else if (obj != Py_False)
+ return NULL;
+ }
}
+ else if (!PyArg_ParseTuple(args, "l", &v))
+ return NULL;
+ self->tm->start(v, singleShot);
+ Py_RETURN_NONE;
}
-void eMainloop::applyTimeOffset()
+static PyObject *
+eTimerPy_start_long(eTimerPy* self, PyObject *args)
{
- singleLock s(recalcLock);
- if ( time_offset )
+ int v=0;
+ if (!PyArg_ParseTuple(args, "i", &v)) {
+ return NULL;
+ }
+ self->tm->startLongTimer(v);
+ Py_RETURN_NONE;
+}
+
+static PyObject *
+eTimerPy_change_interval(eTimerPy* self, PyObject *args)
+{
+ long v=0;
+ if (!PyArg_ParseTuple(args, "l", &v)) {
+ return NULL;
+ }
+ self->tm->changeInterval(v);
+ Py_RETURN_NONE;
+}
+
+static PyObject *
+eTimerPy_stop(eTimerPy* self)
+{
+ self->tm->stop();
+ Py_RETURN_NONE;
+}
+
+static PyObject *
+eTimerPy_get_callback_list(eTimerPy *self)
+{ //used for compatibilty with the old eTimer
+ return self->tm->timeout.get();
+}
+
+static PyMethodDef eTimerPy_methods[] = {
+ {"isActive", (PyCFunction)eTimerPy_is_active, METH_NOARGS,
+ "returns the timer state"
+ },
+ {"start", (PyCFunction)eTimerPy_start, METH_VARARGS,
+ "start timer with interval in msecs"
+ },
+ {"startLongTimer", (PyCFunction)eTimerPy_start_long, METH_VARARGS,
+ "start timer with interval in secs"
+ },
+ {"changeInterval", (PyCFunction)eTimerPy_change_interval, METH_VARARGS,
+ "change interval of a timer (in msecs)"
+ },
+ {"stop", (PyCFunction)eTimerPy_stop, METH_NOARGS,
+ "stops the timer"
+ },
+ //used for compatibilty with the old eTimer
+ {"get", (PyCFunction)eTimerPy_get_callback_list, METH_NOARGS,
+ "get timeout callback list"
+ },
+ {NULL} /* Sentinel */
+};
+
+static PyObject *
+eTimerPy_get_cb_list(eTimerPy *self, void *closure)
+{
+ return self->tm->timeout.get();
+}
+
+static PyObject *
+eTimerPy_timeout(eTimerPy *self, void *closure)
+{ //used for compatibilty with the old eTimer
+ Org_Py_INCREF((PyObject*)self);
+ return (PyObject*)self;
+}
+
+static PyGetSetDef eTimerPy_getseters[] = {
+ {"callback",
+ (getter)eTimerPy_get_cb_list, (setter)0,
+ "returns the callback python list",
+ NULL},
+
+ {"timeout", //used for compatibilty with the old eTimer
+ (getter)eTimerPy_timeout, (setter)0,
+ "synonym for our self",
+ NULL},
+
+ {NULL} /* Sentinel */
+};
+
+static PyTypeObject eTimerPyType = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+ "eBaseImpl.eTimer", /*tp_name*/
+ sizeof(eTimerPy), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ (destructor)eTimerPy_dealloc, /*tp_dealloc*/
+ 0, /*tp_print*/
+ 0, /*tp_getattr*/
+ 0, /*tp_setattr*/
+ 0, /*tp_compare*/
+ 0, /*tp_repr*/
+ 0, /*tp_as_number*/
+ 0, /*tp_as_sequence*/
+ 0, /*tp_as_mapping*/
+ 0, /*tp_hash */
+ 0, /*tp_call*/
+ 0, /*tp_str*/
+ 0, /*tp_getattro*/
+ 0, /*tp_setattro*/
+ 0, /*tp_as_buffer*/
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+ "eTimer objects", /* tp_doc */
+ (traverseproc)eTimerPy_traverse, /* tp_traverse */
+ (inquiry)eTimerPy_clear, /* tp_clear */
+ 0, /* tp_richcompare */
+ offsetof(eTimerPy, in_weakreflist), /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ eTimerPy_methods, /* tp_methods */
+ 0, /* tp_members */
+ eTimerPy_getseters, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0, /* tp_init */
+ 0, /* tp_alloc */
+ eTimerPy_new, /* tp_new */
+};
+
+// eSocketNotifier replacement
+
+struct eSocketNotifierPy
+{
+ PyObject_HEAD
+ eSocketNotifier *sn;
+ PyObject *in_weakreflist; /* List of weak references */
+};
+
+static int
+eSocketNotifierPy_traverse(eSocketNotifierPy *self, visitproc visit, void *arg)
+{
+ PyObject *obj = self->sn->activated.getSteal();
+ if (obj)
+ Py_VISIT(obj);
+ return 0;
+}
+
+static int
+eSocketNotifierPy_clear(eSocketNotifierPy *self)
+{
+ PyObject *obj = self->sn->activated.getSteal(true);
+ if (obj)
+ Py_CLEAR(obj);
+ return 0;
+}
+
+static void
+eSocketNotifierPy_dealloc(eSocketNotifierPy* self)
+{
+ if (self->in_weakreflist != NULL)
+ PyObject_ClearWeakRefs((PyObject *) self);
+ eSocketNotifierPy_clear(self);
+ self->sn->Release();
+ self->ob_type->tp_free((PyObject*)self);
+}
+
+static PyObject *
+eSocketNotifierPy_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+ eSocketNotifierPy *self = (eSocketNotifierPy *)type->tp_alloc(type, 0);
+ int fd, req, immediate_start = 1, size = PyTuple_Size(args);
+ if (size > 2)
{
- for (ePtrList<eTimer>::iterator it(m_timer_list.begin()); it != m_timer_list.end(); ++it )
- it->addTimeOffset( time_offset );
- m_twisted_timer += time_offset;
- time_offset=0;
+ if (!PyArg_ParseTuple(args, "iii", &fd, &req, &immediate_start))
+ {
+ PyObject *obj = NULL;
+ if (!PyArg_ParseTuple(args, "iiO", &fd, &req, &immediate_start))
+ return NULL;
+ if (obj == Py_False)
+ immediate_start = 0;
+ else if (obj != Py_True)
+ return NULL;
+ }
}
+ else if (size < 2 || !PyArg_ParseTuple(args, "ii", &fd, &req))
+ return NULL;
+ self->sn = eSocketNotifier::create(eApp, fd, req, immediate_start);
+ self->sn->AddRef();
+ self->in_weakreflist = NULL;
+ return (PyObject *)self;
}
-eApplication* eApp = 0;
+static PyObject *
+eSocketNotifierPy_is_running(eSocketNotifierPy* self)
+{
+ PyObject *ret = self->sn->isRunning() ? Py_True : Py_False;
+ Org_Py_INCREF(ret);
+ return ret;
+}
+
+static PyObject *
+eSocketNotifierPy_start(eSocketNotifierPy* self)
+{
+ self->sn->start();
+ Py_RETURN_NONE;
+}
+
+static PyObject *
+eSocketNotifierPy_stop(eSocketNotifierPy* self)
+{
+ self->sn->stop();
+ Py_RETURN_NONE;
+}
+
+static PyObject *
+eSocketNotifierPy_get_fd(eSocketNotifierPy* self)
+{
+ return PyInt_FromLong(self->sn->getFD());
+}
+
+static PyObject *
+eSocketNotifierPy_get_requested(eSocketNotifierPy* self)
+{
+ return PyInt_FromLong(self->sn->getRequested());
+}
+
+static PyObject *
+eSocketNotifierPy_set_requested(eSocketNotifierPy* self, PyObject *args)
+{
+ int req;
+ if (PyTuple_Size(args) != 1 || !PyArg_ParseTuple(args, "i", &req))
+ return NULL;
+ self->sn->setRequested(req);
+ Py_RETURN_NONE;
+}
+
+static PyMethodDef eSocketNotifierPy_methods[] = {
+ {"isRunning", (PyCFunction)eSocketNotifierPy_is_running, METH_NOARGS,
+ "returns the running state"
+ },
+ {"start", (PyCFunction)eSocketNotifierPy_start, METH_NOARGS,
+ "start the sn"
+ },
+ {"stop", (PyCFunction)eSocketNotifierPy_stop, METH_NOARGS,
+ "stops the sn"
+ },
+ {"getFD", (PyCFunction)eSocketNotifierPy_get_fd, METH_NOARGS,
+ "get file descriptor"
+ },
+ {"getRequested", (PyCFunction)eSocketNotifierPy_get_requested, METH_NOARGS,
+ "get requested"
+ },
+ {"setRequested", (PyCFunction)eSocketNotifierPy_set_requested, METH_VARARGS,
+ "set requested"
+ },
+ {NULL} /* Sentinel */
+};
+
+static PyObject *
+eSocketNotifierPy_get_cb_list(eSocketNotifierPy *self, void *closure)
+{
+ return self->sn->activated.get();
+}
+
+static PyGetSetDef eSocketNotifierPy_getseters[] = {
+ {"callback",
+ (getter)eSocketNotifierPy_get_cb_list, (setter)0,
+ "returns the callback python list",
+ NULL},
+ {NULL} /* Sentinel */
+};
+
+static PyTypeObject eSocketNotifierPyType = {
+ PyObject_HEAD_INIT(NULL)
+ 0, /*ob_size*/
+ "eBaseImpl.eSocketNotifier", /*tp_name*/
+ sizeof(eSocketNotifierPy), /*tp_basicsize*/
+ 0, /*tp_itemsize*/
+ (destructor)eSocketNotifierPy_dealloc, /*tp_dealloc*/
+ 0, /*tp_print*/
+ 0, /*tp_getattr*/
+ 0, /*tp_setattr*/
+ 0, /*tp_compare*/
+ 0, /*tp_repr*/
+ 0, /*tp_as_number*/
+ 0, /*tp_as_sequence*/
+ 0, /*tp_as_mapping*/
+ 0, /*tp_hash */
+ 0, /*tp_call*/
+ 0, /*tp_str*/
+ 0, /*tp_getattro*/
+ 0, /*tp_setattro*/
+ 0, /*tp_as_buffer*/
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, /*tp_flags*/
+ "eTimer objects", /* tp_doc */
+ (traverseproc)eSocketNotifierPy_traverse, /* tp_traverse */
+ (inquiry)eSocketNotifierPy_clear, /* tp_clear */
+ 0, /* tp_richcompare */
+ offsetof(eSocketNotifierPy, in_weakreflist), /* tp_weaklistoffset */
+ 0, /* tp_iter */
+ 0, /* tp_iternext */
+ eSocketNotifierPy_methods, /* tp_methods */
+ 0, /* tp_members */
+ eSocketNotifierPy_getseters, /* tp_getset */
+ 0, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ 0, /* tp_init */
+ 0, /* tp_alloc */
+ eSocketNotifierPy_new, /* tp_new */
+};
+
+static PyMethodDef module_methods[] = {
+ {NULL} /* Sentinel */
+};
+
+void eBaseInit(void)
+{
+ PyObject* m = Py_InitModule3("eBaseImpl", module_methods,
+ "Module that implements some enigma classes with working cyclic garbage collection.");
+
+ if (m == NULL)
+ return;
+
+ if (!PyType_Ready(&eTimerPyType))
+ {
+ Org_Py_INCREF((PyObject*)&eTimerPyType);
+ PyModule_AddObject(m, "eTimer", (PyObject*)&eTimerPyType);
+ }
+ if (!PyType_Ready(&eSocketNotifierPyType))
+ {
+ Org_Py_INCREF((PyObject*)&eSocketNotifierPyType);
+ PyModule_AddObject(m, "eSocketNotifier", (PyObject*)&eSocketNotifierPyType);
+ }
+}
+}
git.cweiske.de / enigma2.git / blobdiff