X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/1394bbf36f7e0cc591f1a31b7d5db4e8f0f2c0c6..7d27b9f23f076a18a59ac6269c9db36345f8aa03:/lib/base/ebase.cpp

diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp
index 75307e85..6efbf90b 100644
--- a/lib/base/ebase.cpp
+++ b/lib/base/ebase.cpp
@@ -24,7 +24,7 @@ void eSocketNotifier::start()
 		stop();
 
 	context.addSocketNotifier(this);
-	state=1;
+	state=2;  // running but not in poll yet
 }
 
 void eSocketNotifier::stop()
@@ -118,8 +118,7 @@ void eMainloop::addSocketNotifier(eSocketNotifier *sn)
 {
 	int fd = sn->getFD();
 	ASSERT(notifiers.find(fd) == notifiers.end());
-	ASSERT(new_notifiers.find(fd) == new_notifiers.end());
-	new_notifiers[fd]=sn;
+	notifiers[fd]=sn;
 }
 
 void eMainloop::removeSocketNotifier(eSocketNotifier *sn)
@@ -128,9 +127,6 @@ void eMainloop::removeSocketNotifier(eSocketNotifier *sn)
 	std::map<int,eSocketNotifier*>::iterator i(notifiers.find(fd));
 	if (i != notifiers.end())
 		return notifiers.erase(i);
-	i = new_notifiers.find(fd);
-	if (i != new_notifiers.end())
-		return new_notifiers.erase(i);
 	eFatal("removed socket notifier which is not present");
 }
 
@@ -157,9 +153,8 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObj
 			/* if current timer already passed, don't delay infinite. */
 		if (poll_timeout < 0)
 			poll_timeout = 0;
-			
-			/* convert us to ms */
-		poll_timeout /= 1000;
+		else /* convert us to ms */
+			poll_timeout /= 1000;
 	}
 	
 	if ((user_timeout > 0) && (poll_timeout > 0) && ((unsigned int)poll_timeout > user_timeout))
@@ -168,12 +163,6 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObj
 		return_reason = 1;
 	}
 
-	for (std::map<int, eSocketNotifier*>::iterator it(new_notifiers.begin()); it != new_notifiers.end();)
-	{
-		notifiers[it->first]=it->second;
-		new_notifiers.erase(it++);
-	}
-
 	int nativecount=notifiers.size(),
 		fdcount=nativecount,
 		ret=0;
@@ -187,6 +176,7 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObj
 	int i=0;
 	for (; i < nativecount; ++i, ++it)
 	{
+		it->second->state = 1; // running and in poll
 		pfd[i].fd = it->first;
 		pfd[i].events = it->second->getRequested();
 	}
@@ -200,27 +190,32 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObj
 			pfd[i++].events = PyInt_AsLong(val);
 		}
 	}
-	
-	ret = ::poll(pfd, fdcount, poll_timeout);
+
+	if (this == eApp)
+		Py_BEGIN_ALLOW_THREADS
+		ret = ::poll(pfd, fdcount, poll_timeout);
+		Py_END_ALLOW_THREADS
+	else
+		ret = ::poll(pfd, fdcount, poll_timeout);
+
 			/* ret > 0 means that there are some active poll entries. */
 	if (ret > 0)
 	{
 		int i=0;
 		return_reason = 0;
-		for (; i < nativecount ; ++i)
+		for (; i < nativecount; ++i)
 		{
 			if (pfd[i].revents)
 			{
-				int handled = 0;
 				it = notifiers.find(pfd[i].fd);
-				if (it != notifiers.end())
+				if (it != notifiers.end()
+					&& it->second->state == 1) // added and in poll
 				{
 					int req = it->second->getRequested();
-					handled |= req;
 					if (pfd[i].revents & req)
-						it->second->activate(pfd[i].revents);
+						it->second->activate(pfd[i].revents & req);
+					pfd[i].revents &= ~req;
 				}
-				pfd[i].revents &= ~handled;
 				if (pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL))
 					eDebug("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d)", pfd[i].fd, pfd[i].revents);
 			}
@@ -238,18 +233,14 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObj
 				Py_DECREF(it);
 			}
 		}
-			
-		ret = 1; /* poll did not timeout. */
-	} else if (ret < 0)
+	}
+	else if (ret < 0)
 	{
 			/* when we got a signal, we get EINTR. */
 		if (errno != EINTR)
 			eDebug("poll made error (%m)");
 		else
-		{
-			return_reason = 2;
-			ret = -1; /* don't assume the timeout has passed when we got a signal */
-		}
+			return_reason = 2; /* don't assume the timeout has passed when we got a signal */
 	}
 	
 		/* when we not processed anything, check timers. */
@@ -260,7 +251,7 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObj
 
 		if (ret || m_now_is_invalid)
 			gettimeofday(&now, 0);
-		else
+		else // poll timeoutet
 			now += poll_timeout;
 
 			/* process all timers which are ready. first remove them out of the list. */
@@ -284,7 +275,7 @@ void eMainloop::removeTimer(eTimer* e)
 int eMainloop::iterate(unsigned int user_timeout, PyObject **res, ePyObject dict)
 {
 	int ret = 0;
-	
+
 	timeval user_timer;
 	gettimeofday(&user_timer, 0);
 	user_timer += user_timeout;
@@ -297,22 +288,22 @@ int eMainloop::iterate(unsigned int user_timeout, PyObject **res, ePyObject dict
 			m_interrupt_requested = 0;
 			return 0;
 		}
-		if (app_quit_now) return -1;
-		timeval now, timeout;
-		gettimeofday(&now, 0);
-		timeout = user_timer - now;
-		
-		if (user_timeout && (user_timer <= now))
-			return 0;
-		
+
+		if (app_quit_now)
+			return -1;
+
 		int to = 0;
 		if (user_timeout)
+		{
+			timeval now, timeout;
+			gettimeofday(&now, 0);
+			if (user_timer<=now) // timeout
+				return 0;
+			timeout = user_timer - now;
 			to = timeout.tv_sec * 1000 + timeout.tv_usec / 1000;
-		
+		}
 		ret = processOneEvent(to, res, dict);
-		if (res && *res)
-			return ret;
-	} while (ret == 0);
+	} while ( !ret && !(res && *res) );
 	
 	return ret;
 }
@@ -334,20 +325,15 @@ PyObject *eMainloop::poll(ePyObject timeout, ePyObject dict)
 	PyObject *res=0;
 	
 	if (app_quit_now)
-	{
-		Py_INCREF(Py_None);
-		return Py_None;
-	}
+		Py_RETURN_NONE;
 	
 	int user_timeout = (timeout == Py_None) ? 0 : PyInt_AsLong(timeout);
 
 	iterate(user_timeout, &res, dict);
-	ePyObject ret(res);
-	
-	if (!ret) /* return empty list on timeout */
-		return PyList_New(0);
-	
-	return ret;
+	if (res)
+		return res;
+
+	return PyList_New(0); /* return empty list on timeout */
 }
 
 void eMainloop::interruptPoll()