send answerEnq

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

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index b929cb6d8516a7418e2f7f842010b2debd229dd9..2a1fe6288033a4054f99922d2ab9974528499183 100644 (file)
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -9,12 +9,14 @@
 #include <time.h>
 
 #include <lib/base/eptrlist.h>
+#include <lib/python/connections.h>
 #include <libsig_comp.h>
 
 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);
@@ -112,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;
@@ -158,7 +149,7 @@ public:
        eSocketNotifier(eMainloop *context, int fd, int req, bool startnow=true);
        ~eSocketNotifier();
 
-       Signal1<void, int> activated;
+       PSignal1<void, int> activated;
        void activate(int what) { /*emit*/ activated(what); }
 
        void start();
@@ -170,60 +161,46 @@ public:
        void setRequested(int req) { requested=req; }
 };
 
-                               // ... und Timer
-/**
- * \brief Gives a callback after a specified timeout.
- *
- * This class emits the signal \c eTimer::timeout after the specified timeout.
- */
-class eTimer
-{
-       eMainloop &context;
-       timeval nextActivation;
-       long interval;
-       bool bSingleShot;
-       bool bActive;
-public:
-       /**
-        * \brief Constructs a timer.
-        *
-        * 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): context(*context), bActive(false) { }
-       ~eTimer()       { if (bActive) stop(); }
-
-       Signal0<void> timeout;
-       void activate();
-
-       bool isActive() { return bActive; }
-       timeval &getNextActivation() { return nextActivation; }
-
-       void start(long msec, bool singleShot=false);
-       void stop();
-       void changeInterval(long msek);
-       bool operator<(const eTimer& t) const   {               return nextActivation < t.nextActivation;               }
-};
+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;
+       pthread_mutex_t recalcLock;
+       
+       int m_now_is_invalid;
 public:
-       eMainloop():app_quit_now(0),loop_level(0),retval(0){    }
+       static void addTimeOffset(int offset);
        void addSocketNotifier(eSocketNotifier *sn);
        void removeSocketNotifier(eSocketNotifier *sn);
-       void addTimer(eTimer* e)        {               TimerList.push_back(e);         TimerList.sort();       }
-       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)
+       {
+               m_now_is_invalid = 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();
@@ -249,4 +226,42 @@ public:
                eApp = 0;
        }
 };
+
+                               // ... und Timer
+/**
+ * \brief Gives a callback after a specified timeout.
+ *
+ * This class emits the signal \c eTimer::timeout after the specified timeout.
+ */
+class eTimer
+{
+       friend class eMainloop;
+       eMainloop &context;
+       timeval nextActivation;
+       long interval;
+       bool bSingleShot;
+       bool bActive;
+public:
+       /**
+        * \brief Constructs a timer.
+        *
+        * 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(); }
+
+       PSignal0<void> timeout;
+       void activate();
+
+       bool isActive() { return bActive; }
+       timeval &getNextActivation() { return nextActivation; }
+
+       void start(long msec, bool b=false);
+       void stop();
+       void changeInterval(long msek);
+       bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
+       void startLongTimer( int seconds );
+       void addTimeOffset(int);
+};
 #endif