X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/108a8e97174ca4142c6e96d21320086c50eee4e6..dbe120313d2b4589e3c7ebe49ee98586a2b04e16:/lib/base/ebase.cpp diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp index 1b92995b..f990f6b8 100644 --- a/lib/base/ebase.cpp +++ b/lib/base/ebase.cpp @@ -136,15 +136,15 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, PyObje 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); @@ -157,137 +157,132 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, PyObje poll_timeout /= 1000; } - if ((user_timeout > 0) && (poll_timeout > user_timeout)) + if ((user_timeout > 0) && (poll_timeout > 0) && ((unsigned int)poll_timeout > user_timeout)) { poll_timeout = user_timeout; return_reason = 1; } - + int ret = 0; - - - if (poll_timeout) - { - std::multimap::iterator it; - std::map fd_merged; - std::map::const_iterator fd_merged_it; - for (it = notifiers.begin(); it != notifiers.end(); ++it) - fd_merged[it->first] |= it->second->getRequested(); + std::multimap::iterator it; + std::map fd_merged; + std::map::const_iterator fd_merged_it; - fd_merged_it = fd_merged.begin(); + for (it = notifiers.begin(); it != notifiers.end(); ++it) + fd_merged[it->first] |= it->second->getRequested(); - int nativecount, fdcount; + fd_merged_it = fd_merged.begin(); - nativecount = fdcount = fd_merged.size(); + int nativecount, fdcount; - if (additional) - { - additional = PyDict_Items(additional); - fdcount += PyList_Size(additional); - } - - // build the poll aray - pollfd* pfd = new pollfd[fdcount]; // make new pollfd array + nativecount = fdcount = fd_merged.size(); - for (int i=0; i < nativecount; i++, fd_merged_it++) - { - pfd[i].fd = fd_merged_it->first; - pfd[i].events = fd_merged_it->second; - } + if (additional) + { + additional = PyDict_Items(additional); + fdcount += PyList_Size(additional); + } + + // build the poll aray + pollfd* pfd = new pollfd[fdcount]; // make new pollfd array + + for (int i=0; i < nativecount; i++, fd_merged_it++) + { + pfd[i].fd = fd_merged_it->first; + pfd[i].events = fd_merged_it->second; + } - if (additional) + if (additional) + { + for (int i=0; i < PyList_Size(additional); ++i) { - for (int i=0; i < PyList_Size(additional); ++i) - { - PyObject *it = PyList_GetItem(additional, i); - if (!PyTuple_Check(it)) - eFatal("poll item is not a tuple"); - if (PyTuple_Size(it) != 2) - eFatal("poll tuple size is not 2"); - int fd = PyObject_AsFileDescriptor(PyTuple_GetItem(it, 0)); - if (fd == -1) - eFatal("poll tuple not a filedescriptor"); - pfd[nativecount + i].fd = fd; - pfd[nativecount + i].events = PyInt_AsLong(PyTuple_GetItem(it, 1)); - } + PyObject *it = PyList_GET_ITEM(additional, i); + if (!PyTuple_Check(it)) + eFatal("poll item is not a tuple"); + if (PyTuple_Size(it) != 2) + eFatal("poll tuple size is not 2"); + int fd = PyObject_AsFileDescriptor(PyTuple_GET_ITEM(it, 0)); + if (fd == -1) + eFatal("poll tuple not a filedescriptor"); + pfd[nativecount + i].fd = fd; + pfd[nativecount + i].events = PyInt_AsLong(PyTuple_GET_ITEM(it, 1)); } - - ret = ::poll(pfd, fdcount, poll_timeout); + Py_DECREF(additional); + } + + ret = ::poll(pfd, fdcount, poll_timeout); /* ret > 0 means that there are some active poll entries. */ - if (ret > 0) + if (ret > 0) + { + return_reason = 0; + for (int i=0; i < nativecount ; i++) { - return_reason = 0; - for (int i=0; i < nativecount ; i++) - { - it = notifiers.begin(); + it = notifiers.begin(); - int handled = 0; + int handled = 0; - std::multimap::iterator - l = notifiers.lower_bound(pfd[i].fd), - u = notifiers.upper_bound(pfd[i].fd); + std::multimap::iterator + l = notifiers.lower_bound(pfd[i].fd), + u = notifiers.upper_bound(pfd[i].fd); - ePtrList n; + ePtrList n; - for (; l != u; ++l) - n.push_back(l->second); + for (; l != u; ++l) + n.push_back(l->second); - for (ePtrList::iterator li(n.begin()); li != n.end(); ++li) - { - int req = li->getRequested(); + for (ePtrList::iterator li(n.begin()); li != n.end(); ++li) + { + int req = li->getRequested(); - handled |= req; + handled |= req; - if (pfd[i].revents & req) - (*li)->activate(pfd[i].revents); - } - if ((pfd[i].revents&~handled) & (POLLERR|POLLHUP|POLLNVAL)) - eDebug("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d)", pfd[i].fd, pfd[i].revents); + if (pfd[i].revents & req) + (*li)->activate(pfd[i].revents); } + if ((pfd[i].revents&~handled) & (POLLERR|POLLHUP|POLLNVAL)) + eDebug("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d)", pfd[i].fd, pfd[i].revents); + } - for (int i = nativecount; i < fdcount; ++i) + for (int i = nativecount; i < fdcount; ++i) + { + if (pfd[i].revents) { - if (pfd[i].revents) - { - if (!*res) - *res = PyList_New(0); - PyObject *it = PyTuple_New(2); - PyTuple_SetItem(it, 0, PyInt_FromLong(pfd[i].fd)); - PyTuple_SetItem(it, 1, PyInt_FromLong(pfd[i].revents)); - PyList_Append(*res, it); - } + if (!*res) + *res = PyList_New(0); + PyObject *it = PyTuple_New(2); + PyTuple_SET_ITEM(it, 0, PyInt_FromLong(pfd[i].fd)); + PyTuple_SET_ITEM(it, 1, PyInt_FromLong(pfd[i].revents)); + PyList_Append(*res, it); + Py_DECREF(it); } + } - ret = 1; /* poll did not timeout. */ - } else if (ret < 0) + ret = 1; /* poll did not timeout. */ + } else if (ret < 0) + { + /* when we got a signal, we get EINTR. */ + if (errno != EINTR) + eDebug("poll made error (%m)"); + else { - /* 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; + ret = -1; /* don't assume the timeout has passed when we got a signal */ } - delete [] pfd; - Py_XDECREF(additional); } + delete [] pfd; /* when we not processed anything, check timers. */ - if (!ret) + if (!m_timer_list.empty()) { /* we know that this time has passed. */ - now += poll_timeout; - singleLock s(recalcLock); - /* this will never change while we have the recalcLock */ - /* we can savely return here, the timer will be re-checked soon. */ - if (m_now_is_invalid) - return 0; + 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)) @@ -311,10 +306,31 @@ int eMainloop::iterate(unsigned int user_timeout, PyObject **res, PyObject *dict { int ret = 0; + timeval user_timer; + gettimeofday(&user_timer, 0); + user_timer += user_timeout; + + /* TODO: this code just became ugly. fix that. */ do - { + { + if (m_interrupt_requested) + { + m_interrupt_requested = 0; + return 0; + } if (app_quit_now) return -1; - ret = processOneEvent(user_timeout, res, dict); + timeval now, timeout; + gettimeofday(&now, 0); + timeout = user_timer - now; + + if (user_timeout && (user_timer <= now)) + return 0; + + int to = 0; + if (user_timeout) + to = timeout.tv_sec * 1000 + timeout.tv_usec / 1000; + + ret = processOneEvent(to, res, dict); if (res && *res) return ret; } while (ret == 0); @@ -329,11 +345,23 @@ int eMainloop::runLoop() return retval; } +void eMainloop::reset() +{ + app_quit_now=false; +} + PyObject *eMainloop::poll(PyObject *timeout, PyObject *dict) { PyObject *res = 0; - int user_timeout = (timeout == Py_None) ? 0 : PyInt_AsLong(timeout); + if (app_quit_now) + { + Py_INCREF(Py_None); + return Py_None; + } + + int user_timeout = (timeout == Py_None) ? 0 : PyInt_AsLong(timeout); + iterate(user_timeout, &res, dict); if (!res) /* return empty list on timeout */ @@ -342,6 +370,11 @@ PyObject *eMainloop::poll(PyObject *timeout, PyObject *dict) return res; } +void eMainloop::interruptPoll() +{ + m_interrupt_requested = 1; +} + void eMainloop::quit(int ret) { retval = ret;