#include <fcntl.h>
#include <unistd.h>
+#include <errno.h>
#include <lib/base/eerror.h>
+#include <lib/base/elock.h>
eSocketNotifier::eSocketNotifier(eMainloop *context, int fd, int requested, bool startnow): context(*context), fd(fd), state(0), requested(requested)
{
stop();
context.addSocketNotifier(this);
- state=1;
+ state=2; // running but not in poll yet
}
void eSocketNotifier::stop()
bActive = true;
bSingleShot = singleShot;
interval = msek;
- gettimeofday(&nextActivation, 0);
+ 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);
}
+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);
+}
+
void eTimer::stop()
{
if (bActive)
nextActivation -= interval; // sub old interval
}
else
- bActive=true; // then activate Timer
+ bActive=true; // then activate Timer
interval = msek; // set new Interval
nextActivation += interval; // calc nextActivation
void eTimer::activate() // Internal Funktion... called from eApplication
{
- timeval now;
- gettimeofday(&now, 0);
-// eDebug("this = %p\nnow sec = %d, usec = %d\nnextActivation sec = %d, usec = %d", this, now.tv_sec, now.tv_usec, nextActivation.tv_sec, nextActivation.tv_usec );
-// eDebug("Timer emitted");
context.removeTimer(this);
if (!bSingleShot)
/*emit*/ timeout();
}
+void eTimer::addTimeOffset( int offset )
+{
+ nextActivation.tv_sec += offset;
+}
+
// mainloop
+ePtrList<eMainloop> eMainloop::existing_loops;
void eMainloop::addSocketNotifier(eSocketNotifier *sn)
{
- notifiers.insert(std::pair<int,eSocketNotifier*> (sn->getFD(), sn));
+ int fd = sn->getFD();
+ ASSERT(notifiers.find(fd) == notifiers.end());
+ notifiers[fd]=sn;
}
void eMainloop::removeSocketNotifier(eSocketNotifier *sn)
{
- notifiers.erase(sn->getFD());
+ 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");
}
-void eMainloop::processOneEvent()
+int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePyObject additional)
{
-// process pending timers...
- long usec=0;
+ int return_reason = 0;
+ /* get current time */
+
+ if (additional && !PyDict_Check(additional))
+ eFatal("additional, but it's not dict");
- while (TimerList && (usec = timeout_usec( TimerList.begin()->getNextActivation() ) ) <= 0 )
- TimerList.begin()->activate();
+ if (additional && !res)
+ eFatal("additional, but no res");
- int fdAnz = notifiers.size();
- pollfd* pfd = new pollfd[fdAnz]; // make new pollfd array
+ long poll_timeout = -1; /* infinite in case of empty timer list */
-// fill pfd array
- std::map<int,eSocketNotifier*>::iterator it(notifiers.begin());
- for (int i=0; i < fdAnz; i++, it++)
+ if (!m_timer_list.empty() || twisted_timeout > 0)
{
+ 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;
+ }
+ }
+
+ if ((twisted_timeout > 0) && (poll_timeout > 0) && ((unsigned int)poll_timeout > twisted_timeout))
+ {
+ poll_timeout = twisted_timeout;
+ return_reason = 1;
+ }
+
+ int nativecount=notifiers.size(),
+ fdcount=nativecount,
+ ret=0;
+
+ if (additional)
+ fdcount += PyDict_Size(additional);
+
+ // 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)
+ {
+ it->second->state = 1; // running and in poll
pfd[i].fd = it->first;
pfd[i].events = it->second->getRequested();
}
- int ret=poll(pfd, fdAnz, TimerList ? usec / 1000 : -1); // milli .. not micro seks
-
- if (ret>0)
+ if (additional)
{
-// eDebug("bin aussem poll raus und da war was");
- for (int i=0; i < fdAnz ; i++)
- {
- if( notifiers.find(pfd[i].fd) == notifiers.end())
- continue;
+ PyObject *key, *val;
+ int pos=0;
+ while (PyDict_Next(additional, &pos, &key, &val)) {
+ pfd[i].fd = PyObject_AsFileDescriptor(key);
+ pfd[i++].events = PyInt_AsLong(val);
+ }
+ }
- int req = notifiers[pfd[i].fd]->getRequested();
+ if (this == eApp)
+ Py_BEGIN_ALLOW_THREADS
+ ret = ::poll(pfd, fdcount, poll_timeout);
+ Py_END_ALLOW_THREADS
+ else
+ ret = ::poll(pfd, fdcount, poll_timeout);
- if ( pfd[i].revents & req )
+ /* ret > 0 means that there are some active poll entries. */
+ if (ret > 0)
+ {
+ int i=0;
+ return_reason = 0;
+ for (; i < nativecount; ++i)
+ {
+ if (pfd[i].revents)
{
- notifiers[pfd[i].fd]->activate(pfd[i].revents);
-
- if (!--ret)
- break;
- } else if (pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL))
- eDebug("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d)", pfd[i].fd,pfd[i].revents);
+ it = notifiers.find(pfd[i].fd);
+ 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);
+ pfd[i].revents &= ~req;
+ }
+ if (pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL))
+ eDebug("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d)", pfd[i].fd, pfd[i].revents);
+ }
}
+ for (; i < fdcount; ++i)
+ {
+ if (pfd[i].revents)
+ {
+ if (!*res)
+ *res = PyList_New(0);
+ ePyObject 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);
+ }
+ }
+ }
+ else if (ret < 0)
+ {
+ /* when we got a signal, we get EINTR. */
+ if (errno != EINTR)
+ eDebug("poll made error (%m)");
+ else
+ return_reason = 2; /* don't assume the timeout has passed when we got a signal */
}
- else if (ret<0)
- eDebug("poll made error");
- // check Timers...
- while ( TimerList && timeout_usec( TimerList.begin()->getNextActivation() ) <= 0 )
- TimerList.begin()->activate();
+ return return_reason;
+}
- delete [] pfd;
+void eMainloop::addTimer(eTimer* e)
+{
+ m_timer_list.insert_in_order(e);
}
+void eMainloop::removeTimer(eTimer* e)
+{
+ m_timer_list.remove(e);
+}
-int eMainloop::exec()
+int eMainloop::iterate(unsigned int twisted_timeout, PyObject **res, ePyObject dict)
{
- if (!loop_level)
+ int ret = 0;
+
+ if (twisted_timeout)
{
- app_quit_now = false;
- enter_loop();
+ gettimeofday(&m_twisted_timer, 0);
+ m_twisted_timer += twisted_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;
+
+ int to = 0;
+ 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);
+ } while ( !ret && !(res && *res) );
+
+ return ret;
+}
+
+int eMainloop::runLoop()
+{
+ while (!app_quit_now)
+ iterate();
return retval;
}
-void eMainloop::enter_loop()
+void eMainloop::reset()
{
- loop_level++;
+ app_quit_now=false;
+}
- // Status der vorhandenen Loop merken
- bool old_exit_loop = app_exit_loop;
-
- app_exit_loop = false;
+PyObject *eMainloop::poll(ePyObject timeout, ePyObject dict)
+{
+ PyObject *res=0;
- while (!app_exit_loop && !app_quit_now)
- {
- processOneEvent();
- }
+ if (app_quit_now)
+ Py_RETURN_NONE;
- // wiederherstellen der vorherigen app_exit_loop
- app_exit_loop = old_exit_loop;
+ int twisted_timeout = (timeout == Py_None) ? 0 : PyInt_AsLong(timeout);
- loop_level--;
+ iterate(twisted_timeout, &res, dict);
+ if (res)
+ return res;
- if (!loop_level)
- {
- // do something here on exit the last loop
- }
+ return PyList_New(0); /* return empty list on timeout */
}
-void eMainloop::exit_loop() // call this to leave the current loop
+void eMainloop::interruptPoll()
{
- app_exit_loop = true;
+ m_interrupt_requested = 1;
}
-void eMainloop::quit( int ret ) // call this to leave all loops
+void eMainloop::quit(int ret)
{
- retval=ret;
+ retval = ret;
app_quit_now = true;
}
+void eMainloop::addTimeOffset(int offset)
+{
+ for (ePtrList<eMainloop>::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<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;
+ }
+}
+
eApplication* eApp = 0;
git.cweiske.de / enigma2.git / blobdiff