add stop service

[enigma2.git] / lib / base / ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index 3bdd705c4289b57bc53dd931175f944ce6084a2c..7fd5af02599bf62589f7e916d42bfd64f08fb29b 100644 (file)
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -16,6 +16,7 @@ class eApplication;
 
 extern eApplication* eApp;
 
+       /* TODO: remove these inlines. */
 static inline bool operator<( const timeval &t1, const timeval &t2 )
 {
        return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_usec < t2.tv_usec);
@@ -113,20 +114,9 @@ static inline timeval operator-=( timeval &t1, const long msek )
        return t1;
 }
 
-static inline timeval timeout_timeval ( const timeval & orig )
+static inline int timeval_to_usec(const timeval &t1)
 {
-       timeval now;
-  gettimeofday(&now,0);
-
-       return orig-now;
-}
-
-static inline long timeout_usec ( const timeval & orig )
-{
-       timeval now;
-  gettimeofday(&now,0);
-
-       return (orig-now).tv_sec*1000000 + (orig-now).tv_usec;
+       return t1.tv_sec*1000000 + t1.tv_usec;
 }
 
 class eMainloop;
@@ -176,29 +166,45 @@ class eTimer;
                        // werden in einer mainloop verarbeitet
 class eMainloop
 {
+       friend class eTimer;
+       friend class eSocketNotifier;
        std::map<int, eSocketNotifier*> notifiers;
-       ePtrList<eTimer> TimerList;
+       ePtrList<eTimer> m_timer_list;
        bool app_exit_loop;
        bool app_quit_now;
        int loop_level;
        void processOneEvent();
        int retval;
+       int timer_offset;
+       pthread_mutex_t recalcLock;
 public:
-       eMainloop():app_quit_now(0),loop_level(0),retval(0){    }
+       void addTimeOffset(int offset);
        void addSocketNotifier(eSocketNotifier *sn);
        void removeSocketNotifier(eSocketNotifier *sn);
-       void addTimer(eTimer* e)        {               TimerList.insert_in_order(e);   }
-       void removeTimer(eTimer* e)     {               TimerList.remove(e);    }
+       void addTimer(eTimer* e);
+       void removeTimer(eTimer* e);
 
+       static ePtrList<eMainloop> existing_loops;
+       eMainloop()
+               :app_quit_now(0),loop_level(0),retval(0),timer_offset(0)
+       {
+               existing_loops.push_back(this);
+               pthread_mutex_init(&recalcLock, 0);
+       }
+       ~eMainloop()
+       {
+               existing_loops.remove(this);
+               pthread_mutex_destroy(&recalcLock);
+       }
        int looplevel() { return loop_level; }
-       
+
+               /* OBSOLETE. DONT USE. */
        int exec();  // recursive enter the loop
        void quit(int ret=0); // leave all pending loops (recursive leave())
        void enter_loop();
        void exit_loop();
 };
 
-
 /**
  * \brief The application class.
  *
@@ -227,6 +233,7 @@ public:
  */
 class eTimer
 {
+       friend class eMainloop;
        eMainloop &context;
        timeval nextActivation;
        long interval;
@@ -239,19 +246,20 @@ public:
         * The timer is not yet active, it has to be started with \c start.
         * \param context The thread from which the signal should be emitted.
         */
-       eTimer(eMainloop *context = eApp): context(*context), bActive(false) { }
-       ~eTimer()       { if (bActive) stop(); }
+       eTimer(eMainloop *context=eApp): context(*context), bActive(false) { }
+       ~eTimer() { if (bActive) stop(); }
 
        PSignal0<void> timeout;
        void activate();
 
-       bool isActive() { return bActive; }
+       bool isActive() { return bActive; }
        timeval &getNextActivation() { return nextActivation; }
 
-       void start(long msec, bool singleShot=false);
+       void start(long msec, bool b=false);
        void stop();
        void changeInterval(long msek);
-       bool operator<(const eTimer& t) const   {               return nextActivation < t.nextActivation;               }
+       bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
+       void startLongTimer( int seconds );
+       void addTimeOffset(int);
 };
-
 #endif