X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d63d2c3c6cbbd574dda4f8b00ebe6c661735edd5..f097c3b368c10b7c88f63038459c4c5a38889a1f:/lib/base/ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index b929cb6d..a224e2cc 100644
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -9,17 +9,25 @@
 #include <time.h>
 
 #include <lib/base/eptrlist.h>
+#include <lib/python/connections.h>
 #include <libsig_comp.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;
@@ -112,21 +120,11 @@ 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;
 }
+#endif
 
 class eMainloop;
 
@@ -142,11 +140,13 @@ class eSocketNotifier
 {
 public:
 	enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
+#ifndef SWIG
 private:
 	eMainloop &context;
 	int fd;
 	int state;
 	int requested;		// requested events (POLLIN, ...)
+#endif
 public:
 	/**
 	 * \brief Constructs a eSocketNotifier.
@@ -158,7 +158,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,64 +170,66 @@ 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
 {
-	std::map<int, eSocketNotifier*> notifiers;
-	ePtrList<eTimer> TimerList;
-	bool app_exit_loop;
+#ifndef SWIG
+	friend class eTimer;
+	friend class eSocketNotifier;
+	std::multimap<int, eSocketNotifier*> notifiers;
+	ePtrList<eTimer> m_timer_list;
 	bool app_quit_now;
 	int loop_level;
-	void processOneEvent();
+	int processOneEvent(unsigned int user_timeout, PyObject **res=0, PyObject *additional=0);
 	int retval;
+	pthread_mutex_t recalcLock;
+	
+	int m_now_is_invalid;
+#endif
 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);
+
+#ifndef SWIG
+	static ePtrList<eMainloop> existing_loops;
+#endif
 
+	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; }
-	
-	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, PyObject *additional=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);
 };
 
 /**
@@ -249,4 +251,46 @@ 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
+{
+#ifndef SWIG
+	friend class eMainloop;
+	eMainloop &context;
+	timeval nextActivation;
+	long interval;
+	bool bSingleShot;
+	bool bActive;
+#endif
+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);
+#ifndef SWIG
+	bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
+#endif
+	void startLongTimer( int seconds );
+	void addTimeOffset(int);
+};
 #endif