debian-packages/eventcore
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix notification/resource management bugs.

Browse source 
- Enforce that objects stay alive as long as a callback is pending
- Avoid multiple connect callbacks for connectStream
This commit is contained in:
Sönke Ludwig 2016-10-07 20:22:39 +02:00
parent 4db1a68d6e
commit c526b58866
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
source/eventcore/drivers/posix.d
View file

@ -177,6 +177,7 @@ abstract class PosixEventDriver : EventDriver,
private void onConnect(FD sock) private void onConnect(FD sock)
{ {
setNotifyCallback!(EventType.write)(sock, null);
m_fds[sock].connectCallback(cast(StreamSocketFD)sock, ConnectStatus.connected); m_fds[sock].connectCallback(cast(StreamSocketFD)sock, ConnectStatus.connected);
} }
@ -832,8 +833,7 @@ abstract class PosixEventDriver : EventDriver,
{ {
//log("start notify %s %s", evt, fd); //log("start notify %s %s", evt, fd);
//assert(m_fds[fd].callback[evt] is null, "Waiting for event which is already being waited for."); //assert(m_fds[fd].callback[evt] is null, "Waiting for event which is already being waited for.");
m_fds[fd].callback[evt] = callback; if (callback) setNotifyCallback!evt(fd, callback);
m_waiterCount++;
updateFD(fd, m_fds[fd].eventMask); updateFD(fd, m_fds[fd].eventMask);
} }
@ -841,8 +841,7 @@ abstract class PosixEventDriver : EventDriver,
{ {
//log("stop notify %s %s", evt, fd); //log("stop notify %s %s", evt, fd);
//ssert(m_fds[fd].callback[evt] !is null, "Stopping waiting for event which is not being waited for."); //ssert(m_fds[fd].callback[evt] !is null, "Stopping waiting for event which is not being waited for.");
m_fds[fd].callback[evt] = null; if (m_fds[fd].callback) setNotifyCallback!evt(fd, null);
m_waiterCount--;
updateFD(fd, m_fds[fd].eventMask); updateFD(fd, m_fds[fd].eventMask);
} }
@ -850,6 +849,14 @@ abstract class PosixEventDriver : EventDriver,
{ {
assert((callback !is null) != (m_fds[fd].callback[evt] !is null), assert((callback !is null) != (m_fds[fd].callback[evt] !is null),
"Overwriting notification callback."); "Overwriting notification callback.");
// ensure that the FD doesn't get closed before the callback gets called.
if (callback !is null) {
m_waiterCount++;
m_fds[fd].refCount++;
} else {
m_fds[fd].refCount--;
m_waiterCount--;
}
m_fds[fd].callback[evt] = callback; m_fds[fd].callback[evt] = callback;
} }