projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_599_picload_fd_leak' into experimental
[vuplus_dvbapp]
/
lib
/
base
/
ebase.cpp
diff --git
a/lib/base/ebase.cpp
b/lib/base/ebase.cpp
index
caccb39
..
700cce3
100644
(file)
--- a/
lib/base/ebase.cpp
+++ b/
lib/base/ebase.cpp
@@
-165,7
+165,7
@@
void eMainloop::removeSocketNotifier(eSocketNotifier *sn)
return;
}
for (i = notifiers.begin(); i != notifiers.end(); ++i)
return;
}
for (i = notifiers.begin(); i != notifiers.end(); ++i)
- eDebug("fd=%d, sn=%
d
", i->second->getFD(), (void*)i->second);
+ eDebug("fd=%d, sn=%
p
", i->second->getFD(), (void*)i->second);
eFatal("removed socket notifier which is not present, fd=%d", fd);
}
eFatal("removed socket notifier which is not present, fd=%d", fd);
}
@@
-243,14
+243,9
@@
int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePy
if (this == eApp)
{
if (this == eApp)
{
- gOpcode op;
- op.dc = 0;
- op.opcode = gOpcode::flush;
- gRC::getInstance()->submit(op);
Py_BEGIN_ALLOW_THREADS
ret = ::poll(pfd, fdcount, poll_timeout);
Py_END_ALLOW_THREADS
Py_BEGIN_ALLOW_THREADS
ret = ::poll(pfd, fdcount, poll_timeout);
Py_END_ALLOW_THREADS
-
} else
ret = ::poll(pfd, fdcount, poll_timeout);
} else
ret = ::poll(pfd, fdcount, poll_timeout);