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

diff --git a/lib/base/ebase.h b/lib/base/ebase.h
index 10b46120..f6fc07d3 100644
--- a/lib/base/ebase.h
+++ b/lib/base/ebase.h
@@ -142,8 +142,9 @@ class eMainloop;
  * This class emits the signal \c eSocketNotifier::activate whenever the
  * event specified by \c req is available.
  */
-class eSocketNotifier
+class eSocketNotifier: iObject
 {
+	DECLARE_REF(eSocketNotifier);
 	friend class eMainloop;
 public:
 	enum { Read=POLLIN, Write=POLLOUT, Priority=POLLPRI, Error=POLLERR, Hungup=POLLHUP };
@@ -153,6 +154,7 @@ private:
 	int state;
 	int requested;		// requested events (POLLIN, ...)
 	void activate(int what) { /*emit*/ activated(what); }
+	eSocketNotifier(eMainloop *context, int fd, int req, bool startnow);
 public:
 	/**
 	 * \brief Constructs a eSocketNotifier.
@@ -161,7 +163,7 @@ public:
 	 * \param req The events to watch to, normally either \c Read or \c Write. You can specify any events that \c poll supports.
 	 * \param startnow Specifies if the socketnotifier should start immediately.
 	 */
-	eSocketNotifier(eMainloop *context, int fd, int req, bool startnow=true);
+	static eSocketNotifier* create(eMainloop *context, int fd, int req, bool startnow=true) { return new eSocketNotifier(context, fd, req, startnow); }
 	~eSocketNotifier();
 
 	PSignal1<void, int> activated;
@@ -173,6 +175,8 @@ public:
 	int getFD() { return fd; }
 	int getRequested() { return requested; }
 	void setRequested(int req) { requested=req; }
+
+	eSmartPtrList<iObject> m_clients;
 };
 
 #endif
@@ -191,6 +195,8 @@ class eMainloop
 	int processOneEvent(unsigned int user_timeout, PyObject **res=0, ePyObject additional=ePyObject());
 	int retval;
 	int m_is_idle;
+	int m_idle_count;
+	eSocketNotifier *m_inActivate;
 
 	int m_interrupt_requested;
 	timespec m_twisted_timer; // twisted timer
@@ -199,13 +205,11 @@ class eMainloop
 	void removeSocketNotifier(eSocketNotifier *sn);
 	void addTimer(eTimer* e);
 	void removeTimer(eTimer* e);
-public:
-#ifndef SWIG
 	static ePtrList<eMainloop> existing_loops;
-#endif
-
+	static bool isValid(eMainloop *);
+public:
 	eMainloop()
-		:app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_interrupt_requested(0)
+		:app_quit_now(0),loop_level(0),retval(0), m_is_idle(0), m_idle_count(0), m_inActivate(0), m_interrupt_requested(0)
 	{
 		existing_loops.push_back(this);
 	}
@@ -235,6 +239,7 @@ public:
 
 		/* 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; }
+	int idleCount() { return m_idle_count; }
 };
 
 /**
@@ -264,8 +269,9 @@ public:
  *
  * This class emits the signal \c eTimer::timeout after the specified timeout.
  */
-class eTimer
+class eTimer: iObject
 {
+	DECLARE_REF(eTimer);
 	friend class eMainloop;
 	eMainloop &context;
 	timespec nextActivation;
@@ -273,6 +279,8 @@ class eTimer
 	bool bSingleShot;
 	bool bActive;
 	void activate();
+
+	eTimer(eMainloop *context): context(*context), bActive(false) { }
 public:
 	/**
 	 * \brief Constructs a timer.
@@ -280,7 +288,7 @@ public:
 	 * 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) { }
+	static eTimer *create(eMainloop *context=eApp) { return new eTimer(context); }
 	~eTimer() { if (bActive) stop(); }
 
 	PSignal0<void> timeout;
@@ -294,6 +302,7 @@ public:
 	void changeInterval(long msek);
 	void startLongTimer( int seconds );
 	bool operator<(const eTimer& t) const { return nextActivation < t.nextActivation; }
+	eSmartPtrList<iObject> m_clients;
 };
 #endif  // SWIG