base: fix a very theoretical performance problem
[vuplus_dvbapp] / lib / base / ebase.cpp
index 3babc2e..a3ecbc7 100644 (file)
@@ -2,8 +2,10 @@
 
 #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)
 {
@@ -42,9 +44,24 @@ void eTimer::start(long msek, bool singleShot)
        bActive = true;
        bSingleShot = singleShot;
        interval = msek;
-       gettimeofday(&nextActivation, 0);               
-//     eDebug("this = %p\nnow sec = %d, usec = %d\nadd %d msec", this, nextActivation.tv_sec, nextActivation.tv_usec, 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);
+//     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);
+//     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);
 }
@@ -66,7 +83,7 @@ void eTimer::changeInterval(long msek)
                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
@@ -76,10 +93,6 @@ void eTimer::changeInterval(long msek)
 
 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)
@@ -93,7 +106,13 @@ void eTimer::activate()   // Internal Funktion... called from eApplication
        /*emit*/ timeout();
 }
 
+void eTimer::addTimeOffset( int offset )
+{
+       nextActivation.tv_sec += offset;
+}
+
 // mainloop
+ePtrList<eMainloop> eMainloop::existing_loops;
 
 void eMainloop::addSocketNotifier(eSocketNotifier *sn)
 {
@@ -107,61 +126,139 @@ void eMainloop::removeSocketNotifier(eSocketNotifier *sn)
 
 void eMainloop::processOneEvent()
 {
-// process pending timers...
-       long usec=0;
-
-       while (TimerList && (usec = timeout_usec( TimerList.begin()->getNextActivation() ) ) <= 0 )
-               TimerList.begin()->activate();
-
-       int fdAnz = notifiers.size();
-       pollfd* pfd = new pollfd[fdAnz];  // make new pollfd array
-
-// fill pfd array
-       std::map<int,eSocketNotifier*>::iterator it(notifiers.begin());
-       for (int i=0; i < fdAnz; i++, it++)
+               /* 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
+               */
+
+               /* get current time */
+       timeval now;
+       gettimeofday(&now, 0);
+       m_now_is_invalid = 0;
+       
+       int poll_timeout = -1; /* infinite in case of empty timer list */
+       
+       if (m_timer_list)
        {
-               pfd[i].fd = it->first;
-               pfd[i].events = it->second->getRequested();
+               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;
        }
+       
+       int ret = 0;
 
-       int ret=poll(pfd, fdAnz, TimerList ? usec / 1000 : -1);  // milli .. not micro seks
-
-       if (ret>0)
+       if (poll_timeout)
        {
-//             eDebug("bin aussem poll raus und da war was");
-               for (int i=0; i < fdAnz ; i++)
+                       // 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++)
                {
-                       if( notifiers.find(pfd[i].fd) == notifiers.end())
-                               continue;
+                       pfd[i].fd = it->first;
+                       pfd[i].events = it->second->getRequested();
+               }
 
-                       int req = notifiers[pfd[i].fd]->getRequested();
+               ret = poll(pfd, fdcount, poll_timeout);
 
-                       if ( pfd[i].revents & req )
+                       /* ret > 0 means that there are some active poll entries. */
+               if (ret > 0)
+               {
+                       for (int i=0; i < fdcount ; i++)
                        {
-                               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);
+                               if (notifiers.find(pfd[i].fd) == notifiers.end())
+                                       continue;
+                               
+                               int req = notifiers[pfd[i].fd]->getRequested();
+                               
+                               if (pfd[i].revents & req)
+                               {
+                                       notifiers[pfd[i].fd]->activate(pfd[i].revents);
+                               
+                                       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);
+                       }
+               } else if (ret < 0)
+               {
+                               /* when we got a signal, we get EINTR. we do not care, 
+                                  because we check current time in timers anyway. */
+                       if (errno != EINTR)
+                               eDebug("poll made error (%m)");
+                       else
+                               ret = 0;
                }
+               delete [] pfd;
        }
-       else if (ret<0)
-               eDebug("poll made error");
-
-               // check Timers...
-       while ( TimerList && timeout_usec( TimerList.begin()->getNextActivation() ) <= 0 )
-               TimerList.begin()->activate();
+       
+               /* 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;
+
+                       /* 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();
+       }
+}
 
-       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()
 {
        if (!loop_level)
        {
                app_quit_now = false;
+               app_exit_loop = false;
                enter_loop();
        }
        return retval;
@@ -170,31 +267,28 @@ int eMainloop::exec()
 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--;
+       --loop_level;
 
        if (!loop_level)
        {
-                       // do something here on exit the last loop
+               // do something here on exit the last loop
        }
 }
 
 void eMainloop::exit_loop()  // call this to leave the current loop
 {
-       app_exit_loop = true;   
+       app_exit_loop = true;
 }
 
 void eMainloop::quit( int ret )   // call this to leave all loops
@@ -203,4 +297,16 @@ void eMainloop::quit( int ret )   // call this to leave all loops
        app_quit_now = true;
 }
 
+void eMainloop::addTimeOffset(int offset)
+{
+       for (ePtrList<eMainloop>::iterator it(eMainloop::existing_loops)
+               ;it != eMainloop::existing_loops.end(); ++it)
+       {
+               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);
+       }
+}
+
 eApplication* eApp = 0;