#ifndef __ebase_h
#define __ebase_h
+#ifndef SWIG
#include <vector>
#include <map>
#include <sys/poll.h>
#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;
#ifndef SWIG
/* TODO: remove these inlines. */
-static inline bool operator<( const 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_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 bool operator<=( const 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_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 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 int timeval_to_usec(const timeval &t1)
+static inline long timeout_usec ( const timespec & orig )
{
- return t1.tv_sec*1000000 + t1.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;
}
-#endif
class eMainloop;
*/
class eSocketNotifier
{
+ friend class eMainloop;
public:
enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
private:
int fd;
int state;
int requested; // requested events (POLLIN, ...)
+ void activate(int what) { /*emit*/ activated(what); }
public:
/**
* \brief Constructs a eSocketNotifier.
~eSocketNotifier();
PSignal1<void, int> activated;
- void activate(int what) { /*emit*/ activated(what); }
void start();
void stop();
void setRequested(int req) { requested=req; }
};
+#endif
+
class eTimer;
// werden in einer mainloop verarbeitet
ePtrList<eTimer> m_timer_list;
bool app_quit_now;
int loop_level;
- int processOneEvent(unsigned int user_timeout, PyObject **res=0, PyObject *additional=0);
+ int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
int retval;
- pthread_mutex_t recalcLock;
-
- int m_now_is_invalid;
+ int m_is_idle;
+
int m_interrupt_requested;
- void addSocketNotifier(eSocketNotifier *sn);
+ timespec m_twisted_timer; // twisted timer
+
+ void addSocketNotifier(eSocketNotifier *sn);
void removeSocketNotifier(eSocketNotifier *sn);
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)
+ :app_quit_now(0),loop_level(0),retval(0), m_is_idle(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);
}
+ virtual ~eMainloop();
+
int looplevel() { return loop_level; }
#ifndef SWIG
1 - timeout
2 - signal
*/
- int iterate(unsigned int timeout=0, PyObject **res=0, PyObject *additional=0);
-
+ 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(PyObject *dict, PyObject *timeout);
+ 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; }
};
/**
}
};
+#ifndef SWIG
// ... und Timer
/**
* \brief Gives a callback after a specified timeout.
{
friend class eMainloop;
eMainloop &context;
- timeval nextActivation;
+ timespec nextActivation;
long interval;
bool bSingleShot;
bool bActive;
- void addTimeOffset(int);
+ void activate();
public:
/**
* \brief Constructs a timer.
~eTimer() { if (bActive) stop(); }
PSignal0<void> timeout;
- void activate();
bool isActive() { return bActive; }
- timeval &getNextActivation() { return nextActivation; }
+
+ timespec &getNextActivation() { return nextActivation; }
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 );
+ bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
};
+#endif // SWIG
+
#endif
git.cweiske.de / enigma2.git / blobdiff