X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/dba614edd2aad3c17e244914eaef3809d8300cb1..936231df33baf5f16adb58b3e19de30332aae398:/lib/base/ebase.h diff --git a/lib/base/ebase.h b/lib/base/ebase.h index d9a17b79..10b46120 100644 --- a/lib/base/ebase.h +++ b/lib/base/ebase.h @@ -1,6 +1,7 @@ #ifndef __ebase_h #define __ebase_h +#ifndef SWIG #include #include #include @@ -9,124 +10,126 @@ #include #include -#include #include +#endif + +#include class eApplication; extern eApplication* eApp; -static inline bool operator<( const timeval &t1, const timeval &t2 ) +#ifndef SWIG + /* TODO: remove these inlines. */ +static inline bool operator<( const timespec &t1, const timespec &t2 ) { - return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_usec < t2.tv_usec); + return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_nsec < t2.tv_nsec); } -static inline timeval &operator+=( timeval &t1, const timeval &t2 ) +static inline bool operator<=( const timespec &t1, const timespec &t2 ) +{ + return t1.tv_sec < t2.tv_sec || (t1.tv_sec == t2.tv_sec && t1.tv_nsec <= t2.tv_nsec); +} + +static inline timespec &operator+=( timespec &t1, const timespec &t2 ) { t1.tv_sec += t2.tv_sec; - if ( (t1.tv_usec += t2.tv_usec) >= 1000000 ) + if ( (t1.tv_nsec += t2.tv_nsec) >= 1000000000 ) { t1.tv_sec++; - t1.tv_usec -= 1000000; + t1.tv_nsec -= 1000000000; } return t1; } -static inline timeval operator+( const timeval &t1, const timeval &t2 ) +static inline timespec operator+( const timespec &t1, const timespec &t2 ) { - timeval tmp; + timespec tmp; tmp.tv_sec = t1.tv_sec + t2.tv_sec; - if ( (tmp.tv_usec = t1.tv_usec + t2.tv_usec) >= 1000000 ) + if ( (tmp.tv_nsec = t1.tv_nsec + t2.tv_nsec) >= 1000000000 ) { tmp.tv_sec++; - tmp.tv_usec -= 1000000; + tmp.tv_nsec -= 1000000000; } return tmp; } -static inline timeval operator-( const timeval &t1, const timeval &t2 ) +static inline timespec operator-( const timespec &t1, const timespec &t2 ) { - timeval tmp; + timespec tmp; tmp.tv_sec = t1.tv_sec - t2.tv_sec; - if ( (tmp.tv_usec = t1.tv_usec - t2.tv_usec) < 0 ) + if ( (tmp.tv_nsec = t1.tv_nsec - t2.tv_nsec) < 0 ) { tmp.tv_sec--; - tmp.tv_usec += 1000000; + tmp.tv_nsec += 1000000000; } return tmp; } -static inline timeval operator-=( timeval &t1, const timeval &t2 ) +static inline timespec operator-=( timespec &t1, const timespec &t2 ) { t1.tv_sec -= t2.tv_sec; - if ( (t1.tv_usec -= t2.tv_usec) < 0 ) + if ( (t1.tv_nsec -= t2.tv_nsec) < 0 ) { t1.tv_sec--; - t1.tv_usec += 1000000; + t1.tv_nsec += 1000000000; } return t1; } -static inline timeval &operator+=( timeval &t1, const long msek ) +static inline timespec &operator+=( timespec &t1, const long msek ) { t1.tv_sec += msek / 1000; - if ( (t1.tv_usec += (msek % 1000) * 1000) >= 1000000 ) + if ( (t1.tv_nsec += (msek % 1000) * 1000000) >= 1000000000 ) { t1.tv_sec++; - t1.tv_usec -= 1000000; + t1.tv_nsec -= 1000000000; } return t1; } -static inline timeval operator+( const timeval &t1, const long msek ) +static inline timespec operator+( const timespec &t1, const long msek ) { - timeval tmp; + timespec tmp; tmp.tv_sec = t1.tv_sec + msek / 1000; - if ( (tmp.tv_usec = t1.tv_usec + (msek % 1000) * 1000) >= 1000000 ) + if ( (tmp.tv_nsec = t1.tv_nsec + (msek % 1000) * 1000000) >= 1000000000 ) { tmp.tv_sec++; - tmp.tv_usec -= 1000000; + tmp.tv_nsec -= 1000000; } return tmp; } -static inline timeval operator-( const timeval &t1, const long msek ) +static inline timespec operator-( const timespec &t1, const long msek ) { - timeval tmp; + timespec tmp; tmp.tv_sec = t1.tv_sec - msek / 1000; - if ( (tmp.tv_usec = t1.tv_usec - (msek % 1000)*1000) < 0 ) + if ( (tmp.tv_nsec = t1.tv_nsec - (msek % 1000)*1000000) < 0 ) { tmp.tv_sec--; - tmp.tv_usec += 1000000; + tmp.tv_nsec += 1000000000; } return tmp; } -static inline timeval operator-=( timeval &t1, const long msek ) +static inline timespec operator-=( timespec &t1, const long msek ) { t1.tv_sec -= msek / 1000; - if ( (t1.tv_usec -= (msek % 1000) * 1000) < 0 ) + if ( (t1.tv_nsec -= (msek % 1000) * 1000000) < 0 ) { t1.tv_sec--; - t1.tv_usec += 1000000; + t1.tv_nsec += 1000000000; } return t1; } -static inline timeval timeout_timeval ( const timeval & orig ) +static inline long timeout_usec ( const timespec & orig ) { - 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; + timespec now; + clock_gettime(CLOCK_MONOTONIC, &now); + if ( (orig-now).tv_sec > 2000 ) + return 2000*1000*1000; + return (orig-now).tv_sec*1000000 + (orig-now).tv_nsec/1000; } class eMainloop; @@ -141,6 +144,7 @@ class eMainloop; */ class eSocketNotifier { + friend class eMainloop; public: enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP }; private: @@ -148,6 +152,7 @@ private: int fd; int state; int requested; // requested events (POLLIN, ...) + void activate(int what) { /*emit*/ activated(what); } public: /** * \brief Constructs a eSocketNotifier. @@ -160,7 +165,6 @@ public: ~eSocketNotifier(); PSignal1 activated; - void activate(int what) { /*emit*/ activated(what); } void start(); void stop(); @@ -171,33 +175,67 @@ public: void setRequested(int req) { requested=req; } }; +#endif + class eTimer; // werden in einer mainloop verarbeitet class eMainloop { + friend class eTimer; + friend class eSocketNotifier; std::map notifiers; - ePtrList TimerList; - bool app_exit_loop; + ePtrList m_timer_list; bool app_quit_now; int loop_level; - void processOneEvent(); + int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject()); int retval; -public: - eMainloop():app_quit_now(0),loop_level(0),retval(0){ } - void addSocketNotifier(eSocketNotifier *sn); + int m_is_idle; + + int m_interrupt_requested; + timespec m_twisted_timer; // twisted timer + + 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); +public: +#ifndef SWIG + static ePtrList existing_loops; +#endif + + eMainloop() + :app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_interrupt_requested(0) + { + existing_loops.push_back(this); + } + virtual ~eMainloop(); int looplevel() { return loop_level; } - - 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; } +}; /** * \brief The application class. @@ -219,6 +257,7 @@ public: } }; +#ifndef SWIG // ... und Timer /** * \brief Gives a callback after a specified timeout. @@ -227,11 +266,13 @@ public: */ class eTimer { + friend class eMainloop; eMainloop &context; - timeval nextActivation; + timespec nextActivation; long interval; bool bSingleShot; bool bActive; + void activate(); public: /** * \brief Constructs a timer. @@ -239,19 +280,21 @@ 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 timeout; - void activate(); - bool isActive() { return bActive; } - timeval &getNextActivation() { return nextActivation; } + bool isActive() { return bActive; } + + timespec &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; } + void startLongTimer( int seconds ); + bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; } }; +#endif // SWIG #endif