bSingleShot = singleShot;
interval = msek;
gettimeofday(&nextActivation, 0);
- nextActivation += (msek<0 ? 0 : msek);
// 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 eMainloop::removeSocketNotifier(eSocketNotifier *sn)
{
- notifiers.erase(sn->getFD());
+ for (std::multimap<int,eSocketNotifier*>::iterator i = notifiers.find(sn->getFD());
+ i != notifiers.end();
+ ++i)
+ if (i->second == sn)
+ return notifiers.erase(i);
+ eFatal("removed socket notifier which is not present");
}
-void eMainloop::processOneEvent()
+int eMainloop::processOneEvent(unsigned int user_timeout)
{
- /* notes:
- - we should use epoll(4)
- - timer are checked twice. there was a strong reason for it, but i can't remember. (FIXME)
- - for each time, we gettimeofday() and check wether the timer should fire.
- we should do this all better - we know how long the poll last, so we know which
- timers should fire. Problem is that a timer handler could have required so
- much time that another timer fired.
-
- A probably structure could look
-
- while (1)
- {
- time = gettimeofday()
- timeout = calculate_pending_timers(time);
-
- doPoll(timeout or infinite);
-
- if (poll_had_results)
- handle_poll_handler();
- else
- fire_timers(time + timeout)
- }
-
- the gettimeofday() call is required because fire_timers could last more
- than nothing.
-
- when poll did no timeout, we don't handle timers, as this will be done
- in the next iteration (without adding overhead - we had to get the new
- time anyway
- */
-
+ int return_reason = 0;
/* get current time */
timeval now;
gettimeofday(&now, 0);
poll_timeout /= 1000;
}
+ if ((user_timeout > 0) && (poll_timeout > user_timeout))
+ {
+ poll_timeout = user_timeout;
+ return_reason = 1;
+ }
+
int ret = 0;
-
+
if (poll_timeout)
{
+
+ std::multimap<int,eSocketNotifier*>::iterator it;
+ std::map<int,int> fd_merged;
+ std::map<int,int>::const_iterator fd_merged_it;
+
+ for (it = notifiers.begin(); it != notifiers.end(); ++it)
+ fd_merged[it->first] |= it->second->getRequested();
+
+ fd_merged_it = fd_merged.begin();
+
+ int fdcount = fd_merged.size();
+
// build the poll aray
- int fdcount = notifiers.size();
pollfd* pfd = new pollfd[fdcount]; // make new pollfd array
-
- std::map<int,eSocketNotifier*>::iterator it(notifiers.begin());
- for (int i=0; i < fdcount; i++, it++)
+
+ for (int i=0; i < fdcount; i++, fd_merged_it++)
{
- pfd[i].fd = it->first;
- pfd[i].events = it->second->getRequested();
+ pfd[i].fd = fd_merged_it->first;
+ pfd[i].events = fd_merged_it->second;
}
ret = poll(pfd, fdcount, poll_timeout);
-
+
/* ret > 0 means that there are some active poll entries. */
if (ret > 0)
{
+ return_reason = 0;
for (int i=0; i < fdcount ; i++)
{
- if (notifiers.find(pfd[i].fd) == notifiers.end())
- continue;
+ it = notifiers.begin();
+
+ int handled = 0;
+
+ std::multimap<int,eSocketNotifier*>::iterator
+ l = notifiers.lower_bound(pfd[i].fd),
+ u = notifiers.upper_bound(pfd[i].fd);
+
+ ePtrList<eSocketNotifier> n;
- int req = notifiers[pfd[i].fd]->getRequested();
+ for (; l != u; ++l)
+ n.push_back(l->second);
- if (pfd[i].revents & req)
+ for (ePtrList<eSocketNotifier>::iterator li(n.begin()); li != n.end(); ++li)
{
- notifiers[pfd[i].fd]->activate(pfd[i].revents);
+ int req = li->getRequested();
+
+ handled |= req;
- if (!--ret)
- break;
- } else if (pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL))
- eFatal("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d) -> FIX YOUR CODE", 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);
}
+
+ ret = 1; /* poll did not timeout. */
} else if (ret < 0)
{
- /* when we got a signal, we get EINTR. we do not care,
- because we check current time in timers anyway. */
+ /* when we got a signal, we get EINTR. */
if (errno != EINTR)
eDebug("poll made error (%m)");
else
- ret = 0;
+ {
+ return_reason = 2;
+ ret = -1; /* don't assume the timeout has passed when we got a signal */
+ }
}
delete [] pfd;
}
/* when we not processed anything, check timers. */
if (!ret)
{
+ /* 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;
+ return 0;
/* process all timers which are ready. first remove them out of the list. */
- while ((!m_timer_list.empty()) && (m_timer_list.begin()->getNextActivation() < now))
+ while ((!m_timer_list.empty()) && (m_timer_list.begin()->getNextActivation() <= now))
m_timer_list.begin()->activate();
}
+
+ return return_reason;
}
void eMainloop::addTimer(eTimer* e)
m_timer_list.remove(e);
}
-int eMainloop::exec()
+int eMainloop::iterate(unsigned int user_timeout)
{
- if (!loop_level)
- {
- app_quit_now = false;
- app_exit_loop = false;
- enter_loop();
- }
- return retval;
-}
-
-void eMainloop::enter_loop()
-{
- loop_level++;
- // Status der vorhandenen Loop merken
- bool old_exit_loop = app_exit_loop;
-
- app_exit_loop = false;
-
- while (!app_exit_loop && !app_quit_now)
- processOneEvent();
-
- // wiederherstellen der vorherigen app_exit_loop
- app_exit_loop = old_exit_loop;
-
- --loop_level;
-
- if (!loop_level)
- {
- // do something here on exit the last loop
- }
+ int ret = 0;
+
+ do
+ {
+ if (app_quit_now) break;
+ ret = processOneEvent(user_timeout);
+ } while (ret == 0);
+
+ return ret;
}
-void eMainloop::exit_loop() // call this to leave the current loop
+int eMainloop::runLoop()
{
- app_exit_loop = true;
+ while (!app_quit_now)
+ iterate();
+ return retval;
}
-void eMainloop::quit( int ret ) // call this to leave all loops
+void eMainloop::quit(int ret)
{
- retval=ret;
+ retval = ret;
app_quit_now = true;
}
git.cweiske.de / enigma2.git / blobdiff