X-Git-Url: http://code.vuplus.com/gitweb/?a=blobdiff_plain;f=lib%2Fbase%2Febase.cpp;h=161a7f47e21216a8b7dfb0a3642eeee7d0ce8568;hb=6629073331fbe67edfa9f4d591c9df6e41c465a6;hp=67e02347834954321dcee9ff0f459cc3f71d1347;hpb=015545dc0fb37a24f6ad4d2820d34a16bd385f94;p=vuplus_dvbapp

diff --git a/lib/base/ebase.cpp b/lib/base/ebase.cpp
index 67e0234..161a7f4 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()
@@ -123,15 +123,14 @@ void eMainloop::addSocketNotifier(eSocketNotifier *sn)
 
 void eMainloop::removeSocketNotifier(eSocketNotifier *sn)
 {
-	for (std::map<int,eSocketNotifier*>::iterator i = notifiers.find(sn->getFD());
-			i != notifiers.end();
-			++i)
-		if (i->second == sn)
-			return notifiers.erase(i);
+	int fd = sn->getFD();
+	std::map<int,eSocketNotifier*>::iterator i(notifiers.find(fd));
+	if (i != notifiers.end())
+		return notifiers.erase(i);
 	eFatal("removed socket notifier which is not present");
 }
 
-int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, PyObject *additional)
+int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, ePyObject additional)
 {
 	int return_reason = 0;
 		/* get current time */
@@ -164,7 +163,7 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, PyObje
 		poll_timeout = user_timeout;
 		return_reason = 1;
 	}
-	
+
 	int nativecount=notifiers.size(),
 		fdcount=nativecount,
 		ret=0;
@@ -178,6 +177,7 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, PyObje
 	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();
 	}
@@ -191,27 +191,32 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, PyObje
 			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);
 			}
@@ -222,7 +227,7 @@ int eMainloop::processOneEvent(unsigned int user_timeout, PyObject **res, PyObje
 			{
 				if (!*res)
 					*res = PyList_New(0);
-				PyObject *it = PyTuple_New(2);
+				ePyObject it = PyTuple_New(2);
 				PyTuple_SET_ITEM(it, 0, PyInt_FromLong(pfd[i].fd));
 				PyTuple_SET_ITEM(it, 1, PyInt_FromLong(pfd[i].revents));
 				PyList_Append(*res, it);
@@ -272,7 +277,7 @@ void eMainloop::removeTimer(eTimer* e)
 	m_timer_list.remove(e);
 }
 
-int eMainloop::iterate(unsigned int user_timeout, PyObject **res, PyObject *dict)
+int eMainloop::iterate(unsigned int user_timeout, PyObject **res, ePyObject dict)
 {
 	int ret = 0;
 	
@@ -320,24 +325,22 @@ void eMainloop::reset()
 	app_quit_now=false;
 }
 
-PyObject *eMainloop::poll(PyObject *timeout, PyObject *dict)
+PyObject *eMainloop::poll(ePyObject timeout, ePyObject dict)
 {
-	PyObject *res = 0;
+	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 (!res) /* return empty list on timeout */
-		res = PyList_New(0);
+	if (!ret) /* return empty list on timeout */
+		return PyList_New(0);
 	
-	return res;
+	return ret;
 }
 
 void eMainloop::interruptPoll()