#include <lib/base/eerror.h>
#include <lib/base/elock.h>
+#include <lib/gdi/grc.h>
+
+DEFINE_REF(eSocketNotifier);
eSocketNotifier::eSocketNotifier(eMainloop *context, int fd, int requested, bool startnow): context(*context), fd(fd), state(0), requested(requested)
{
- if (startnow)
+ if (startnow)
start();
}
void eSocketNotifier::stop()
{
if (state)
+ {
+ state=0;
context.removeSocketNotifier(this);
-
- state=0;
+ }
}
- // timer
+DEFINE_REF(eTimer);
+
void eTimer::start(long msek, bool singleShot)
{
if (bActive)
void eMainloop::addSocketNotifier(eSocketNotifier *sn)
{
int fd = sn->getFD();
+ if (m_inActivate && m_inActivate->ref.count == 1)
+ {
+ /* when the current active SocketNotifier's refcount is one,
+ then no more external references are existing.
+ So it gets destroyed when the activate callback is finished (->AddRef() / ->Release() calls in processOneEvent).
+ But then the sn->stop() is called to late for the next Asserion.
+ Thus we call sn->stop() here (this implicitly calls eMainloop::removeSocketNotifier) and we don't get trouble
+ with the next Assertion.
+ */
+ m_inActivate->stop();
+ }
ASSERT(notifiers.find(fd) == notifiers.end());
notifiers[fd]=sn;
}
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");
+ {
+ notifiers.erase(i);
+ return;
+ }
+ for (i = notifiers.begin(); i != notifiers.end(); ++i)
+ eDebug("fd=%d, sn=%d", i->second->getFD(), (void*)i->second);
+ eFatal("removed socket notifier which is not present, fd=%d", fd);
}
int eMainloop::processOneEvent(unsigned int twisted_timeout, PyObject **res, ePyObject additional)
{
/* process all timers which are ready. first remove them out of the list. */
while (!m_timer_list.empty() && (poll_timeout = timeout_usec( m_timer_list.begin()->getNextActivation() ) ) <= 0 )
- m_timer_list.begin()->activate();
+ {
+ eTimer *tmr = m_timer_list.begin();
+ tmr->AddRef();
+ tmr->activate();
+ tmr->Release();
+ }
if (poll_timeout < 0)
poll_timeout = 0;
else /* convert us to ms */
// build the poll aray
pollfd pfd[fdcount]; // make new pollfd array
std::map<int,eSocketNotifier*>::iterator it = notifiers.begin();
+
int i=0;
for (; i < nativecount; ++i, ++it)
{
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
+
} else
ret = ::poll(pfd, fdcount, poll_timeout);
if (it != notifiers.end()
&& it->second->state == 1) // added and in poll
{
- int req = it->second->getRequested();
- if (pfd[i].revents & req)
- it->second->activate(pfd[i].revents & req);
+ m_inActivate = it->second;
+ int req = m_inActivate->getRequested();
+ if (pfd[i].revents & req) {
+ m_inActivate->AddRef();
+ m_inActivate->activate(pfd[i].revents & req);
+ m_inActivate->Release();
+ }
pfd[i].revents &= ~req;
+ m_inActivate = 0;
}
if (pfd[i].revents & (POLLERR|POLLHUP|POLLNVAL))
eDebug("poll: unhandled POLLERR/HUP/NVAL for fd %d(%d)", pfd[i].fd, pfd[i].revents);
static int
eTimerPy_traverse(eTimerPy *self, visitproc visit, void *arg)
{
- PyObject *obj = self->tm->timeout.get();
- Py_VISIT(obj);
+ PyObject *obj = self->tm->timeout.getSteal();
+ if (obj) {
+ Py_VISIT(obj);
+ }
return 0;
}
static int
eTimerPy_clear(eTimerPy *self)
{
- PyObject *obj = self->tm->timeout.get();
- Py_CLEAR(obj);
+ PyObject *obj = self->tm->timeout.getSteal(true);
+ if (obj)
+ Py_CLEAR(obj);
return 0;
}
if (self->in_weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) self);
eTimerPy_clear(self);
- delete self->tm;
+ self->tm->Release();
self->ob_type->tp_free((PyObject*)self);
}
eTimerPy_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
eTimerPy *self = (eTimerPy *)type->tp_alloc(type, 0);
- self->tm = new eTimer(eApp);
+ self->tm = eTimer::create(eApp);
+ self->tm->AddRef();
self->in_weakreflist = NULL;
return (PyObject *)self;
}
static PyObject *
eTimerPy_start_long(eTimerPy* self, PyObject *args)
{
- long v=0;
- if (!PyArg_ParseTuple(args, "l", &v)) {
+ int v=0;
+ if (!PyArg_ParseTuple(args, "i", &v)) {
return NULL;
}
self->tm->startLongTimer(v);
static int
eSocketNotifierPy_traverse(eSocketNotifierPy *self, visitproc visit, void *arg)
{
- PyObject *obj = self->sn->activated.get();
- Py_VISIT(obj);
+ PyObject *obj = self->sn->activated.getSteal();
+ if (obj)
+ Py_VISIT(obj);
return 0;
}
static int
eSocketNotifierPy_clear(eSocketNotifierPy *self)
{
- PyObject *obj = self->sn->activated.get();
- Py_CLEAR(obj);
+ PyObject *obj = self->sn->activated.getSteal(true);
+ if (obj)
+ Py_CLEAR(obj);
return 0;
}
if (self->in_weakreflist != NULL)
PyObject_ClearWeakRefs((PyObject *) self);
eSocketNotifierPy_clear(self);
- delete self->sn;
+ self->sn->Release();
self->ob_type->tp_free((PyObject*)self);
}
}
else if (size < 2 || !PyArg_ParseTuple(args, "ii", &fd, &req))
return NULL;
- self->sn = new eSocketNotifier(eApp, fd, req, immediate_start);
+ self->sn = eSocketNotifier::create(eApp, fd, req, immediate_start);
+ self->sn->AddRef();
self->in_weakreflist = NULL;
return (PyObject *)self;
}
void eBaseInit(void)
{
- PyObject* m;
-
- m = Py_InitModule3("eBaseImpl", module_methods,
+ PyObject* m = Py_InitModule3("eBaseImpl", module_methods,
"Module that implements some enigma classes with working cyclic garbage collection.");
if (m == NULL)
git.cweiske.de / enigma2.git / blobdiff