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;
return t1;
}
-static inline timeval timeout_timeval ( const timeval & orig )
-{
- timeval now;
- gettimeofday(&now,0);
-
- return orig-now;
-}
-
-static inline long timeout_usec ( const timeval & orig )
+static inline int timeval_to_usec(const timeval &t1)
{
- timeval now;
- gettimeofday(&now,0);
-
- return (orig-now).tv_sec*1000000 + (orig-now).tv_usec;
+ return t1.tv_sec*1000000 + t1.tv_usec;
}
+#endif
class eMainloop;
// werden in einer mainloop verarbeitet
class eMainloop
{
+ friend class eTimer;
+ friend class eSocketNotifier;
std::map<int, eSocketNotifier*> notifiers;
- ePtrList<eTimer> TimerList;
- bool app_exit_loop;
+ ePtrList<eTimer> 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){ }
+ pthread_mutex_t recalcLock;
+
+ int m_now_is_invalid;
+ int m_interrupt_requested;
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:
+ static void addTimeOffset(int offset);
+
+#ifndef SWIG
+ static ePtrList<eMainloop> existing_loops;
+#endif
+ eMainloop()
+ :app_quit_now(0),loop_level(0),retval(0), m_interrupt_requested(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; }
-
- 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();
+};
/**
* \brief The application class.
*/
class eTimer
{
+ friend class eMainloop;
eMainloop &context;
timeval nextActivation;
long interval;
bool bSingleShot;
bool bActive;
+ void addTimeOffset(int);
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(); }
+ 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; }
+#ifndef SWIG
+ bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
+#endif
+ void startLongTimer( int seconds );
};
-
#endif