X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/0c9e75c44d610465017a08874a5e2f585bc554aa..34e9c6040287cab5b5af08d5d6634f2802109436:/lib/base/ebase.h

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index b464b44c..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,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,11 +123,14 @@ 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 +144,15 @@ 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
+	void activate(int what) { /*emit*/ activated(what); }
 public:
 	/**
 	 * \brief Constructs a eSocketNotifier.
@@ -159,7 +165,6 @@ public:
 	~eSocketNotifier();
 
 	PSignal1<void, int> activated;
-	void activate(int what) { /*emit*/ activated(what); }
 
 	void start();
 	void stop();
@@ -170,48 +175,50 @@ public:
 	void setRequested(int req) { requested=req; }
 };
 
+#endif
+
 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, PyObject **res=0, PyObject *additional=0);
+	int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
 	int retval;
+	int time_offset;
+	int m_is_idle;
 	pthread_mutex_t recalcLock;
 	
-	int m_now_is_invalid;
 	int m_interrupt_requested;
-#endif
-public:
-	static void addTimeOffset(int offset);
- 	void addSocketNotifier(eSocketNotifier *sn);
+	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), 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
@@ -223,16 +230,19 @@ public:
 		  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; }
 };
 
 /**
@@ -255,6 +265,7 @@ public:
 	}
 };
 
+#ifndef SWIG
 				// ... und Timer
 /**
  * \brief Gives a callback after a specified timeout.
@@ -263,14 +274,14 @@ public:
  */
 class eTimer
 {
-#ifndef SWIG
 	friend class eMainloop;
 	eMainloop &context;
 	timeval nextActivation;
 	long interval;
 	bool bSingleShot;
 	bool bActive;
-#endif
+	void addTimeOffset(int);
+	void activate();
 public:
 	/**
 	 * \brief Constructs a timer.
@@ -282,18 +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);
-#ifndef SWIG
-	bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
-#endif
 	void startLongTimer( int seconds );
-	void addTimeOffset(int);
+	bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
 };
+#endif  // SWIG
+
 #endif