X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/a33ff213255db7f59090f70235ec06c502e2a2ce..4ea4f33a6a0382249996c4dae4db31ae2e059dbb:/lib/base/ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index aaabd30d..c4dab621 100644
--- 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,18 +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;
@@ -113,19 +123,12 @@ static inline timeval operator-=( timeval &t1, const long msek )
 	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 )
 {
 	timeval now;
-  gettimeofday(&now,0);
-
+	gettimeofday(&now,0);
+	if ( (orig-now).tv_sec > 2000 )
+		return 2000*1000*1000;
 	return (orig-now).tv_sec*1000000 + (orig-now).tv_usec;
 }
 
@@ -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<void, int> activated;
-	void activate(int what) { /*emit*/ activated(what); }
 
 	void start();
 	void stop();
@@ -171,6 +175,8 @@ public:
 	void setRequested(int req) { requested=req; }
 };
 
+#endif
+
 class eTimer;
 
 			// werden in einer mainloop verarbeitet
@@ -179,41 +185,64 @@ 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;
-	int timer_offset;
+	int time_offset;
+	int m_is_idle;
 	pthread_mutex_t recalcLock;
-	inline void doRecalcTimers();
-	inline void addSocketNotifier(eSocketNotifier *sn);
-	inline void removeSocketNotifier(eSocketNotifier *sn);
-	inline void addTimer(eTimer* e)	{		TimerList.insert_in_order(e);	}
-	inline void removeTimer(eTimer* e)	{		TimerList.remove(e);	}
+	
+	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()
-	{
-		existing_loops.remove(this);
-		pthread_mutex_destroy(&recalcLock);
-	}
+	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();
-	void setTimerOffset( int );
-	int getTimerOffset() { return timer_offset; }
-	bool isAppQuitNowSet() { return app_quit_now; }
+#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; }
 };
 
 /**
@@ -236,6 +265,7 @@ public:
 	}
 };
 
+#ifndef SWIG
 				// ... und Timer
 /**
  * \brief Gives a callback after a specified timeout.
@@ -250,7 +280,8 @@ class eTimer
 	long interval;
 	bool bSingleShot;
 	bool bActive;
-	inline void recalc(int);
+	void addTimeOffset(int);
+	void activate();
 public:
 	/**
 	 * \brief Constructs a timer.
@@ -262,15 +293,17 @@ public:
 	~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);
-	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