X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fbase%2Febase.cpp;h=bf41dc0bf2c582a125e4df003bae82a579c62002;hp=491ca093693dbb125e4ca824d9867660af3e7939;hb=6f73e6abddf4170357c490966d0e1c622eb376f5;hpb=4ca6dd275393344b9a27cfb2e5a755a4d74a414f diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp index 491ca09..bf41dc0 100644 --- a/lib/base/ebase.cpp +++ b/lib/base/ebase.cpp @@ -24,7 +24,7 @@ void eSocketNotifier::start() stop(); context.addSocketNotifier(this); - state=1; + state=2; // running but not in poll yet } void eSocketNotifier::stop() @@ -45,6 +45,7 @@ void eTimer::start(long msek, bool singleShot) 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 ); @@ -59,6 +60,7 @@ void eTimer::startLongTimer( int seconds ) 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; @@ -114,12 +116,21 @@ void eTimer::addTimeOffset( int offset ) // mainloop ePtrList eMainloop::existing_loops; +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()) + m_timer_list.begin()->stop(); +} + void eMainloop::addSocketNotifier(eSocketNotifier *sn) { int fd = sn->getFD(); ASSERT(notifiers.find(fd) == notifiers.end()); - ASSERT(new_notifiers.find(fd) == new_notifiers.end()); - new_notifiers[fd]=sn; + notifiers[fd]=sn; } void eMainloop::removeSocketNotifier(eSocketNotifier *sn) @@ -128,50 +139,44 @@ void eMainloop::removeSocketNotifier(eSocketNotifier *sn) std::map::iterator i(notifiers.find(fd)); if (i != notifiers.end()) return notifiers.erase(i); - i = new_notifiers.find(fd); - if (i != new_notifiers.end()) - return new_notifiers.erase(i); eFatal("removed socket notifier which is not present"); } -int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObject additional) +int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePyObject additional) { int return_reason = 0; /* get current time */ - timeval now; - gettimeofday(&now, 0); - m_now_is_invalid = 0; - + if (additional && !PyDict_Check(additional)) eFatal("additional, but it's not dict"); - + if (additional && !res) eFatal("additional, but no res"); - - int poll_timeout = -1; /* infinite in case of empty timer list */ - - if (m_timer_list) - { - singleLock s(recalcLock); - poll_timeout = timeval_to_usec(m_timer_list.begin()->getNextActivation() - now); - /* if current timer already passed, don't delay infinite. */ - if (poll_timeout < 0) - poll_timeout = 0; - - /* convert us to ms */ - poll_timeout /= 1000; - } - - if ((user_timeout > 0) && (poll_timeout > 0) && ((unsigned int)poll_timeout > user_timeout)) + + long poll_timeout = -1; /* infinite in case of empty timer list */ + + if (!m_timer_list.empty() || twisted_timeout > 0) { - poll_timeout = user_timeout; - return_reason = 1; + 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 ) + { + m_timer_list.begin()->activate(); + applyTimeOffset(); + } + if (poll_timeout < 0) + poll_timeout = 0; + else /* convert us to ms */ + poll_timeout /= 1000; + } } - for (std::map::iterator it(new_notifiers.begin()); it != new_notifiers.end();) + if ((twisted_timeout > 0) && (poll_timeout > 0) && ((unsigned int)poll_timeout > twisted_timeout)) { - notifiers[it->first]=it->second; - new_notifiers.erase(it++); + poll_timeout = twisted_timeout; + return_reason = 1; } int nativecount=notifiers.size(), @@ -180,17 +185,18 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObj if (additional) fdcount += PyDict_Size(additional); - + // 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) { + it->second->state = 1; // running and in poll pfd[i].fd = it->first; pfd[i].events = it->second->getRequested(); } - + if (additional) { PyObject *key, *val; @@ -201,34 +207,36 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObj } } + m_is_idle = 1; + if (this == eApp) { 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) { int i=0; return_reason = 0; - for (; i < nativecount ; ++i) + for (; i < nativecount; ++i) { if (pfd[i].revents) { - int handled = 0; it = notifiers.find(pfd[i].fd); - if (it != notifiers.end()) + if (it != notifiers.end() + && it->second->state == 1) // added and in poll { int req = it->second->getRequested(); - handled |= req; if (pfd[i].revents & req) - it->second->activate(pfd[i].revents); + it->second->activate(pfd[i].revents & req); + pfd[i].revents &= ~req; } - pfd[i].revents &= ~handled; if (pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL)) eDebug("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d)", pfd[i].fd, pfd[i].revents); } @@ -246,36 +254,16 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObj Py_DECREF(it); } } - - ret = 1; /* poll did not timeout. */ - } else if (ret < 0) + } + else if (ret < 0) { /* when we got a signal, we get EINTR. */ if (errno != EINTR) eDebug("poll made error (%m)"); else - { - return_reason = 2; - ret = -1; /* don't assume the timeout has passed when we got a signal */ - } + return_reason = 2; /* don't assume the timeout has passed when we got a signal */ } - - /* when we not processed anything, check timers. */ - if (!m_timer_list.empty()) - { - /* we know that this time has passed. */ - singleLock s(recalcLock); - - if (ret || m_now_is_invalid) - gettimeofday(&now, 0); - else - now += poll_timeout; - /* process all timers which are ready. first remove them out of the list. */ - while ((!m_timer_list.empty()) && (m_timer_list.begin()->getNextActivation() <= now)) - m_timer_list.begin()->activate(); - } - return return_reason; } @@ -289,13 +277,15 @@ void eMainloop::removeTimer(eTimer* e) m_timer_list.remove(e); } -int eMainloop::iterate(unsigned int user_timeout, PyObject **res, ePyObject dict) +int eMainloop::iterate(unsigned int twisted_timeout, PyObject **res, ePyObject dict) { int ret = 0; - - timeval user_timer; - gettimeofday(&user_timer, 0); - user_timer += user_timeout; + + if (twisted_timeout) + { + gettimeofday(&m_twisted_timer, 0); + m_twisted_timer += twisted_timeout; + } /* TODO: this code just became ugly. fix that. */ do @@ -305,23 +295,26 @@ int eMainloop::iterate(unsigned int user_timeout, PyObject **res, ePyObject dict m_interrupt_requested = 0; return 0; } - if (app_quit_now) return -1; - timeval now, timeout; - gettimeofday(&now, 0); - timeout = user_timer - now; - - if (user_timeout && (user_timer <= now)) - return 0; - + + if (app_quit_now) + return -1; + int to = 0; - if (user_timeout) + if (twisted_timeout) + { + timeval now, timeout; + gettimeofday(&now, 0); + m_twisted_timer += time_offset; // apply pending offset + 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; + } ret = processOneEvent(to, res, dict); - if (res && *res) - return ret; - } while (ret == 0); - + } while ( !ret && !(res && *res) ); + return ret; } @@ -340,19 +333,17 @@ void eMainloop::reset() PyObject *eMainloop::poll(ePyObject timeout, ePyObject dict) { PyObject *res=0; - + if (app_quit_now) Py_RETURN_NONE; - - int user_timeout = (timeout == Py_None) ? 0 : PyInt_AsLong(timeout); - iterate(user_timeout, &res, dict); - ePyObject ret(res); - - if (!ret) /* return empty list on timeout */ - return PyList_New(0); - - return ret; + int twisted_timeout = (timeout == Py_None) ? 0 : PyInt_AsLong(timeout); + + iterate(twisted_timeout, &res, dict); + if (res) + return res; + + return PyList_New(0); /* return empty list on timeout */ } void eMainloop::interruptPoll() @@ -368,14 +359,451 @@ void eMainloop::quit(int ret) void eMainloop::addTimeOffset(int offset) { - for (ePtrList::iterator it(eMainloop::existing_loops) - ;it != eMainloop::existing_loops.end(); ++it) + 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 ) { - singleLock s(it->recalcLock); - it->m_now_is_invalid = 1; - for (ePtrList::iterator tit = it->m_timer_list.begin(); tit != it->m_timer_list.end(); ++tit ) - tit->addTimeOffset(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" + +extern "C" { + +// eTimer replacement + +struct eTimerPy +{ + 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.get(); + Py_VISIT(obj); + return 0; +} + +static int +eTimerPy_clear(eTimerPy *self) +{ + PyObject *obj = self->tm->timeout.get(); + Py_CLEAR(obj); + return 0; +} + +static void +eTimerPy_dealloc(eTimerPy* self) +{ + if (self->in_weakreflist != NULL) + PyObject_ClearWeakRefs((PyObject *) self); + eTimerPy_clear(self); + delete self->tm; + 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 = new eTimer(eApp); + 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 (!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; +} + +static PyObject * +eTimerPy_start_long(eTimerPy* self, PyObject *args) +{ + long v=0; + if (!PyArg_ParseTuple(args, "l", &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.get(); + Py_VISIT(obj); + return 0; +} + +static int +eSocketNotifierPy_clear(eSocketNotifierPy *self) +{ + PyObject *obj = self->sn->activated.get(); + Py_CLEAR(obj); + return 0; +} + +static void +eSocketNotifierPy_dealloc(eSocketNotifierPy* self) +{ + if (self->in_weakreflist != NULL) + PyObject_ClearWeakRefs((PyObject *) self); + eSocketNotifierPy_clear(self); + delete self->sn; + 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) + { + 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 = new eSocketNotifier(eApp, fd, req, immediate_start); + self->in_weakreflist = NULL; + return (PyObject *)self; +} + +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; + + 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); + } +} +}