stop();
context.addSocketNotifier(this);
- state=1;
+ state=2; // running but not in poll yet
}
void eSocketNotifier::stop()
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 );
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;
{
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)
std::map<int,eSocketNotifier*>::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<int, eSocketNotifier*>::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(),
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();
}
-
+
if (additional)
{
PyObject *key, *val;
}
if (this == eApp)
- {
Py_BEGIN_ALLOW_THREADS
ret = ::poll(pfd, fdcount, poll_timeout);
Py_END_ALLOW_THREADS
- }
else
ret = ::poll(pfd, fdcount, poll_timeout);
{
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);
}
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;
}
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
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;
}
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()
void eMainloop::addTimeOffset(int offset)
{
- for (ePtrList<eMainloop>::iterator it(eMainloop::existing_loops)
- ;it != eMainloop::existing_loops.end(); ++it)
+ 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 )
{
- singleLock s(it->recalcLock);
- it->m_now_is_invalid = 1;
- for (ePtrList<eTimer>::iterator tit = it->m_timer_list.begin(); tit != it->m_timer_list.end(); ++tit )
- tit->addTimeOffset(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;
}
}
git.cweiske.de / enigma2.git / blobdiff