X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/31091aed60d76a8f44eaf82feed8c63c73f76d12..HEAD:/lib/base/ebase.cpp diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp index 03f50ccc..700cce36 100644 --- a/lib/base/ebase.cpp +++ b/lib/base/ebase.cpp @@ -6,10 +6,13 @@ #include #include +#include + +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(); } @@ -23,49 +26,58 @@ void eSocketNotifier::start() if (state) stop(); - context.addSocketNotifier(this); - state=2; // running but not in poll yet + if (eMainloop::isValid(&context)) + { + context.addSocketNotifier(this); + state=2; // running but not in poll yet + } } 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) stop(); - 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); - nextActivation += (msek<0 ? 0 : msek); -// eDebug("next Activation sec = %d, usec = %d", nextActivation.tv_sec, nextActivation.tv_usec ); - context.addTimer(this); + if (eMainloop::isValid(&context)) + { + bActive = true; + bSingleShot = singleShot; + interval = 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, nsec = %d", nextActivation.tv_sec, nextActivation.tv_nsec ); + context.addTimer(this); + } } -void eTimer::startLongTimer( int seconds ) +void eTimer::startLongTimer(int seconds) { if (bActive) stop(); - 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); - if ( seconds > 0 ) - nextActivation.tv_sec += seconds; -// eDebug("next Activation sec = %d, usec = %d", nextActivation.tv_sec, nextActivation.tv_usec ); - context.addTimer(this); + if (eMainloop::isValid(&context)) + { + bActive = bSingleShot = true; + interval = 0; + 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, nsec = %d", nextActivation.tv_sec, nextActivation.tv_nsec ); + context.addTimer(this); + } } void eTimer::stop() @@ -108,18 +120,17 @@ void eTimer::activate() // Internal Funktion... called from eApplication /*emit*/ timeout(); } -void eTimer::addTimeOffset( int offset ) -{ - nextActivation.tv_sec += offset; -} - // mainloop ePtrList eMainloop::existing_loops; +bool eMainloop::isValid(eMainloop *ml) +{ + return std::find(existing_loops.begin(), existing_loops.end(), ml) != existing_loops.end(); +} + eMainloop::~eMainloop() { existing_loops.remove(this); - pthread_mutex_destroy(&recalcLock); for (std::map::iterator it(notifiers.begin());it != notifiers.end();++it) it->second->stop(); while(m_timer_list.begin() != m_timer_list.end()) @@ -129,6 +140,17 @@ eMainloop::~eMainloop() 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; } @@ -138,8 +160,13 @@ void eMainloop::removeSocketNotifier(eSocketNotifier *sn) int fd = sn->getFD(); std::map::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=%p", 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) @@ -155,22 +182,20 @@ int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy 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)) @@ -189,6 +214,7 @@ int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy // build the poll aray pollfd pfd[fdcount]; // make new pollfd array std::map::iterator it = notifiers.begin(); + int i=0; for (; i < nativecount; ++i, ++it) { @@ -199,6 +225,11 @@ int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy 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; Py_ssize_t pos=0; while (PyDict_Next(additional, &pos, &key, &val)) { @@ -208,6 +239,7 @@ int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy } m_is_idle = 1; + ++m_idle_count; if (this == eApp) { @@ -216,7 +248,7 @@ int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy Py_END_ALLOW_THREADS } else ret = ::poll(pfd, fdcount, poll_timeout); - + m_is_idle = 0; /* ret > 0 means that there are some active poll entries. */ @@ -232,10 +264,15 @@ int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy 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); @@ -283,7 +320,7 @@ int eMainloop::iterate(unsigned int twisted_timeout, PyObject **res, ePyObject d if (twisted_timeout) { - gettimeofday(&m_twisted_timer, 0); + clock_gettime(CLOCK_MONOTONIC, &m_twisted_timer); m_twisted_timer += twisted_timeout; } @@ -302,15 +339,12 @@ int eMainloop::iterate(unsigned int twisted_timeout, PyObject **res, ePyObject d 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) ); @@ -357,38 +391,6 @@ void eMainloop::quit(int ret) app_quit_now = true; } -void eMainloop::addTimeOffset(int offset) -{ - for (ePtrList::iterator it(existing_loops.begin()); it != existing_loops.end(); ++it ) - it->addInstanceTimeOffset(offset); -} - -void eMainloop::addInstanceTimeOffset(int offset) -{ - singleLock s(recalcLock); - if (m_timer_list.empty()) - time_offset=0; - else - { - 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; - } -} - -void eMainloop::applyTimeOffset() -{ - singleLock s(recalcLock); - if ( time_offset ) - { - for (ePtrList::iterator it(m_timer_list.begin()); it != m_timer_list.end(); ++it ) - it->addTimeOffset( time_offset ); - m_twisted_timer += time_offset; - time_offset=0; - } -} - eApplication* eApp = 0; #include "structmember.h" @@ -407,16 +409,19 @@ struct eTimerPy static int eTimerPy_traverse(eTimerPy *self, visitproc visit, void *arg) { - PyObject *obj = self->tm->timeout.get(); - Py_VISIT(obj); + PyObject *obj = self->tm->timeout.getSteal(); + if (obj) { + Py_VISIT(obj); + } return 0; } static int eTimerPy_clear(eTimerPy *self) { - PyObject *obj = self->tm->timeout.get(); - Py_CLEAR(obj); + PyObject *obj = self->tm->timeout.getSteal(true); + if (obj) + Py_CLEAR(obj); return 0; } @@ -426,7 +431,7 @@ eTimerPy_dealloc(eTimerPy* self) if (self->in_weakreflist != NULL) PyObject_ClearWeakRefs((PyObject *) self); eTimerPy_clear(self); - delete self->tm; + self->tm->Release(); self->ob_type->tp_free((PyObject*)self); } @@ -434,7 +439,8 @@ static PyObject * eTimerPy_new(PyTypeObject *type, PyObject *args, PyObject *kwds) { eTimerPy *self = (eTimerPy *)type->tp_alloc(type, 0); - self->tm = new eTimer(eApp); + self->tm = eTimer::create(eApp); + self->tm->AddRef(); self->in_weakreflist = NULL; return (PyObject *)self; } @@ -443,7 +449,7 @@ static PyObject * eTimerPy_is_active(eTimerPy* self) { PyObject *ret = NULL; - ret = !!self->tm->isActive() ? Py_True : Py_False; + ret = self->tm->isActive() ? Py_True : Py_False; Org_Py_INCREF(ret); return ret; } @@ -475,8 +481,8 @@ eTimerPy_start(eTimerPy* self, PyObject *args) static PyObject * eTimerPy_start_long(eTimerPy* self, PyObject *args) { - long v=0; - if (!PyArg_ParseTuple(args, "l", &v)) { + int v=0; + if (!PyArg_ParseTuple(args, "i", &v)) { return NULL; } self->tm->startLongTimer(v); @@ -611,16 +617,18 @@ struct eSocketNotifierPy static int eSocketNotifierPy_traverse(eSocketNotifierPy *self, visitproc visit, void *arg) { - PyObject *obj = self->sn->activated.get(); - Py_VISIT(obj); + PyObject *obj = self->sn->activated.getSteal(); + if (obj) + Py_VISIT(obj); return 0; } static int eSocketNotifierPy_clear(eSocketNotifierPy *self) { - PyObject *obj = self->sn->activated.get(); - Py_CLEAR(obj); + PyObject *obj = self->sn->activated.getSteal(true); + if (obj) + Py_CLEAR(obj); return 0; } @@ -630,7 +638,7 @@ eSocketNotifierPy_dealloc(eSocketNotifierPy* self) if (self->in_weakreflist != NULL) PyObject_ClearWeakRefs((PyObject *) self); eSocketNotifierPy_clear(self); - delete self->sn; + self->sn->Release(); self->ob_type->tp_free((PyObject*)self); } @@ -654,7 +662,8 @@ eSocketNotifierPy_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } else if (size < 2 || !PyArg_ParseTuple(args, "ii", &fd, &req)) return NULL; - self->sn = new eSocketNotifier(eApp, fd, req, immediate_start); + self->sn = eSocketNotifier::create(eApp, fd, req, immediate_start); + self->sn->AddRef(); self->in_weakreflist = NULL; return (PyObject *)self; } @@ -787,9 +796,7 @@ static PyMethodDef module_methods[] = { void eBaseInit(void) { - PyObject* m; - - m = Py_InitModule3("eBaseImpl", module_methods, + PyObject* m = Py_InitModule3("eBaseImpl", module_methods, "Module that implements some enigma classes with working cyclic garbage collection."); if (m == NULL)