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

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index aaabd30d..a224e2cc 100644
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -16,11 +16,18 @@ 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,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;
 
@@ -143,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.
@@ -176,27 +175,34 @@ class eTimer;
 			// werden in einer mainloop verarbeitet
 class eMainloop
 {
+#ifndef SWIG
 	friend class eTimer;
 	friend class eSocketNotifier;
-	std::map<int, eSocketNotifier*> notifiers;
-	ePtrList<eTimer> TimerList;
-	bool app_exit_loop;
+	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;
-	int timer_offset;
 	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_now_is_invalid;
+#endif
 public:
+	static void addTimeOffset(int offset);
+ 	void addSocketNotifier(eSocketNotifier *sn);
+	void removeSocketNotifier(eSocketNotifier *sn);
+	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),timer_offset(0)
+		:app_quit_now(0),loop_level(0),retval(0)
 	{
+		m_now_is_invalid = 0;
 		existing_loops.push_back(this);
 		pthread_mutex_init(&recalcLock, 0);
 	}
@@ -207,13 +213,23 @@ public:
 	}
 	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, 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);
 };
 
 /**
@@ -244,13 +260,14 @@ public:
  */
 class eTimer
 {
+#ifndef SWIG
 	friend class eMainloop;
 	eMainloop &context;
 	timeval nextActivation;
 	long interval;
 	bool bSingleShot;
 	bool bActive;
-	inline void recalc(int);
+#endif
 public:
 	/**
 	 * \brief Constructs a timer.
@@ -270,7 +287,10 @@ public:
 	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