X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/d026012d8ba6198d879df68cb4bf6c92c95a633a..2afcb9094eb0596e2ce4fef77d8208f399ca8e8d:/lib/base/ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index fffe252f..f14d07ac 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,8 +10,10 @@
 #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;
 
@@ -120,10 +123,15 @@ static inline timeval operator-=( timeval &t1, const long msek )
 	return t1;
 }
 
-static inline int timeval_to_usec(const timeval &t1)
+static inline long timeout_usec ( const timeval & orig )
 {
-	return t1.tv_sec*1000000 + t1.tv_usec;
+	timeval now;
+	gettimeofday(&now,0);
+	if ( (orig-now).tv_sec > 2000 )
+		return 2000*1000*1000;
+	return (orig-now).tv_sec*1000000 + (orig-now).tv_usec;
 }
+
 #endif
 
 class eMainloop;
@@ -138,15 +146,14 @@ class eMainloop;
  */
 class eSocketNotifier
 {
+	friend class eMainloop;
 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.
@@ -175,34 +182,37 @@ class eTimer;
 			// werden in einer mainloop verarbeitet
 class eMainloop
 {
-#ifndef SWIG
 	friend class eTimer;
 	friend class eSocketNotifier;
-	std::multimap<int, eSocketNotifier*> notifiers;
+	std::map<int, eSocketNotifier*> notifiers;
 	ePtrList<eTimer> m_timer_list;
 	bool app_quit_now;
 	int loop_level;
-	int processOneEvent(unsigned int user_timeout);
+	int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
 	int retval;
+	int time_offset;
 	pthread_mutex_t recalcLock;
 	
-	int m_now_is_invalid;
-#endif
-public:
-	static void addTimeOffset(int offset);
- 	void addSocketNotifier(eSocketNotifier *sn);
+	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)
+		: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);
 	}
@@ -222,11 +232,16 @@ public:
 		  1 - timeout
 		  2 - signal
 		*/
-	int iterate(unsigned int timeout=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(SWIG_PYOBJECT(ePyObject) dict, SWIG_PYOBJECT(ePyObject) timeout);
+	void interruptPoll();
+	void reset();
 };
 
 /**
@@ -257,14 +272,13 @@ public:
  */
 class eTimer
 {
-#ifndef SWIG
 	friend class eMainloop;
 	eMainloop &context;
 	timeval nextActivation;
 	long interval;
 	bool bSingleShot;
 	bool bActive;
-#endif
+	void addTimeOffset(int);
 public:
 	/**
 	 * \brief Constructs a timer.
@@ -288,6 +302,5 @@ public:
 	bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
 #endif
 	void startLongTimer( int seconds );
-	void addTimeOffset(int);
 };
 #endif