hyung-hwan/hio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enhanced mio_killdev() to clear unfired completed write events

Browse Source
This commit is contained in:
hyung-hwan 2019-01-14 08:45:56 +00:00
parent 306384370c
commit ec28cccdd3
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mio/lib/mio.c
View File

@ -395,16 +395,6 @@ void mio_fini (mio_t* mio)
mio_dev_t* tail; mio_dev_t* tail;
} diehard; } diehard;
/* clear completed write event queues - TODO: do i need to fire these? */
while (!MIO_CWQ_ISEMPTY(&mio->cwq))
{
mio_cwq_t* cwq;
cwq = MIO_CWQ_HEAD(&mio->cwq);
MIO_CWQ_UNLINK (cwq);
MIO_MMGR_FREE (mio->mmgr, cwq);
}
/* kill all registered devices */ /* kill all registered devices */
while (mio->actdev.head) while (mio->actdev.head)
{ {
@ -740,6 +730,7 @@ static MIO_INLINE int __exec (mio_t* mio)
mio_cwq_t* cwq; mio_cwq_t* cwq;
cwq = MIO_CWQ_HEAD(&mio->cwq); cwq = MIO_CWQ_HEAD(&mio->cwq);
if (cwq->dev->dev_evcb->on_write(cwq->dev, cwq->olen, cwq->ctx, &cwq->dstaddr) <= -1) return -1; if (cwq->dev->dev_evcb->on_write(cwq->dev, cwq->olen, cwq->ctx, &cwq->dstaddr) <= -1) return -1;
cwq->dev->cw_count--;
MIO_CWQ_UNLINK (cwq); MIO_CWQ_UNLINK (cwq);
MIO_MMGR_FREE (mio->mmgr, cwq); MIO_MMGR_FREE (mio->mmgr, cwq);
} }
@ -909,6 +900,7 @@ mio_dev_t* mio_makedev (mio_t* mio, mio_oow_t dev_size, mio_dev_mth_t* dev_mth,
dev->dev_mth = dev_mth; dev->dev_mth = dev_mth;
dev->dev_evcb = dev_evcb; dev->dev_evcb = dev_evcb;
MIO_WQ_INIT (&dev->wq); MIO_WQ_INIT (&dev->wq);
dev->cw_count = 0;
/* call the callback function first */ /* call the callback function first */
mio->errnum = MIO_ENOERR; mio->errnum = MIO_ENOERR;
@ -1064,16 +1056,22 @@ void mio_killdev (mio_t* mio, mio_dev_t* dev)
goto kill_device; goto kill_device;
} }
#if 0
/* clear completed write event queues - TODO: do i need to fire these? */ /* clear completed write event queues - TODO: do i need to fire these? */
while (!MIO_CWQ_ISEMPTY(&dev->cwq)) if (dev->cw_count > 0)
{ {
mio_cwq_t* q; mio_cwq_t* cwq, * next;
q = MIO_CWQ_HEAD(&dev->cwq); cwq = MIO_CWQ_HEAD(&mio->cwq);
MIO_CWQ_UNLINK (q); while (cwq != &mio->cwq)
MIO_MMGR_FREE (mio->mmgr, q); {
next = MIO_CWQ_NEXT(cwq);
if (cwq->dev == dev)
{
MIO_CWQ_UNLINK (cwq);
MIO_MMGR_FREE (mio->mmgr, cwq);
}
cwq = next;
}
} }
#endif
/* clear pending send requests */ /* clear pending send requests */
while (!MIO_WQ_ISEMPTY(&dev->wq)) while (!MIO_WQ_ISEMPTY(&dev->wq))
@ -1441,6 +1439,7 @@ enqueue_completed_write:
cwq->olen = len; cwq->olen = len;
MIO_CWQ_ENQ (&dev->mio->cwq, cwq); MIO_CWQ_ENQ (&dev->mio->cwq, cwq);
dev->cw_count++; /* increment the number of complete write operations */
return 0; return 0;
} }

1
mio/lib/mio.h
View File

@ -308,6 +308,7 @@ struct mio_wq_t
mio_dev_mth_t* dev_mth; \ mio_dev_mth_t* dev_mth; \
mio_dev_evcb_t* dev_evcb; \ mio_dev_evcb_t* dev_evcb; \
mio_wq_t wq; \ mio_wq_t wq; \
mio_oow_t cw_count; \
mio_dev_t* dev_prev; \ mio_dev_t* dev_prev; \
mio_dev_t* dev_next mio_dev_t* dev_next