fixes for previous commit

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

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index 7fd5af02599bf62589f7e916d42bfd64f08fb29b..bab1b5f372aa71a0771595590853763a69cba646 100644 (file)
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -1,6 +1,7 @@
 #ifndef __ebase_h
 #define __ebase_h
 
+#ifndef SWIG
 #include <vector>
 #include <map>
 #include <sys/poll.h>
@@ -9,19 +10,27 @@
 #include <time.h>
 
 #include <lib/base/eptrlist.h>
-#include <lib/python/connections.h>
 #include <libsig_comp.h>
+#endif
+
+#include <lib/python/connections.h>
 
 class eApplication;
 
 extern eApplication* eApp;
 
+#ifndef SWIG
        /* 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);
 }
 
+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);
+}
+
 static inline timeval &operator+=( timeval &t1, const timeval &t2 )
 {
        t1.tv_sec += t2.tv_sec;
@@ -114,11 +123,17 @@ static inline timeval operator-=( timeval &t1, const long msek )
        return t1;
 }
 
-static inline int timeval_to_usec(const timeval &t1)
+static inline long timeout_usec ( const timeval & orig )
 {
-       return t1.tv_sec*1000000 + t1.tv_usec;
+       timeval now;
+       gettimeofday(&now,0);
+       if ( (orig-now).tv_sec > 2000 )
+               return 2000*1000*1000;
+       return (orig-now).tv_sec*1000000 + (orig-now).tv_usec;
 }
 
+#endif
+
 class eMainloop;
 
                                        // die beiden signalquellen: SocketNotifier...
@@ -131,6 +146,7 @@ class eMainloop;
  */
 class eSocketNotifier
 {
+       friend class eMainloop;
 public:
        enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
 private:
@@ -170,39 +186,69 @@ class eMainloop
        friend class eSocketNotifier;
        std::map<int, eSocketNotifier*> notifiers;
        ePtrList<eTimer> m_timer_list;
-       bool app_exit_loop;
        bool app_quit_now;
        int loop_level;
-       void processOneEvent();
+       int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
        int retval;
-       int timer_offset;
+       int time_offset;
+       int m_is_idle;
        pthread_mutex_t recalcLock;
-public:
-       void addTimeOffset(int offset);
-       void addSocketNotifier(eSocketNotifier *sn);
+       
+       int m_interrupt_requested;
+       timeval m_twisted_timer; // twisted timer
+       
+       void addSocketNotifier(eSocketNotifier *sn);
        void removeSocketNotifier(eSocketNotifier *sn);
        void addTimer(eTimer* e);
        void removeTimer(eTimer* e);
+       void applyTimeOffset();
+public:
+       static void addTimeOffset(int offset);
+       void addInstanceTimeOffset(int offset);
+       int getTimeOffset() { return time_offset; }
 
+#ifndef SWIG
        static ePtrList<eMainloop> existing_loops;
+#endif
+
        eMainloop()
-               :app_quit_now(0),loop_level(0),retval(0),timer_offset(0)
+               :app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_interrupt_requested(0)
        {
                existing_loops.push_back(this);
                pthread_mutex_init(&recalcLock, 0);
        }
-       ~eMainloop()
+       virtual ~eMainloop()
        {
                existing_loops.remove(this);
                pthread_mutex_destroy(&recalcLock);
+               for (std::map<int, eSocketNotifier*>::iterator it(notifiers.begin());it != notifiers.end();++it)
+                       it->second->stop();
        }
+
        int looplevel() { return loop_level; }
 
-               /* OBSOLETE. DONT USE. */
-       int exec();  // recursive enter the loop
+#ifndef SWIG
        void quit(int ret=0); // leave all pending loops (recursive leave())
-       void enter_loop();
-       void exit_loop();
+#endif
+
+               /* a user supplied timeout. enter_loop will return with:
+                 0 - no timeout, no signal
+                 1 - timeout
+                 2 - signal
+               */
+       int iterate(unsigned int timeout=0, PyObject **res=0, SWIG_PYOBJECT(ePyObject) additional=(PyObject*)0);
+
+               /* run will iterate endlessly until the app is quit, and return
+                  the exit code */
+       int runLoop();
+       
+               /* our new shared polling interface. */
+       PyObject *poll(SWIG_PYOBJECT(ePyObject) dict, SWIG_PYOBJECT(ePyObject) timeout);
+       void interruptPoll();
+       void reset();
+       
+               /* m_is_idle needs to be atomic, but it doesn't really matter much, as it's read-only from outside */
+       int isIdle() { return m_is_idle; }
 };
 
 /**
@@ -239,6 +285,7 @@ class eTimer
        long interval;
        bool bSingleShot;
        bool bActive;
+       void addTimeOffset(int);
 public:
        /**
         * \brief Constructs a timer.
@@ -258,8 +305,9 @@ public:
        void start(long msec, bool b=false);
        void stop();
        void changeInterval(long msek);
+#ifndef SWIG
        bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
+#endif
        void startLongTimer( int seconds );
-       void addTimeOffset(int);
 };
 #endif