Revision: 14429
Author: adrian.chadd
Date: Sun Feb 21 22:05:38 2010
Log: Don't assert() out here ; just warn.
http://code.google.com/p/lusca-cache/source/detail?r=14429
Modified:
/playpen/LUSCA_HEAD_zerocopy_storeread/libasyncio/async_io.c
=======================================
--- /playpen/LUSCA_HEAD_zerocopy_storeread/libasyncio/async_io.c Sat Feb 20
08:57:13 2010
+++ /playpen/LUSCA_HEAD_zerocopy_storeread/libasyncio/async_io.c Sun Feb 21
22:05:38 2010
@@ -242,8 +242,8 @@
ctrlp->done_handler = NULL;
ctrlp->done_handler_data = NULL;
debug(32, 0) ("this be aioCancel. Danger ahead!\n");
- if (ctrlp->operation == _AIO_READ)
- assert(cbdataValid(their_data));
+ if (ctrlp->operation == _AIO_READ && (! cbdataValid(their_data)))
+ debug(32, 0) ("aioCancel: cancelling AIO_READ with an
invalid cbdata pointer; investigate!\n");
if (cbdataValid(their_data))
done_handler(fd, their_data, NULL, -2, -2);
cbdataUnlock(their_data);
@@ -447,8 +447,8 @@
their_data = ctrlp->done_handler_data;
ctrlp->done_handler = NULL;
ctrlp->done_handler_data = NULL;
- if (ctrlp->operation == _AIO_READ)
- assert(cbdataValid(their_data));
+ if (ctrlp->operation == _AIO_READ && (! cbdataValid(their_data)))
+ debug(32, 0) ("aioCheckCallbacks: completing AIO_READ with
an invalid cbdata pointer; investigate!\n");
if (cbdataValid(their_data)) {
retval = 1; /* Return that we've actually done some work */
done_handler(ctrlp->fd, their_data, ctrlp->bufp,
--
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en.
