diff options
| author | Greg Ames <gregames@apache.org> | 2013-01-17 22:32:56 +0000 |
|---|---|---|
| committer | Greg Ames <gregames@apache.org> | 2013-01-17 22:32:56 +0000 |
| commit | 9bc61714783bad05c2e8ddbe891de955dc2b6dc9 (patch) | |
| tree | ea8b91978f66622cf6daa918f23907e62f51cb3e /poll | |
| parent | e51341421c5cabb9298c3b08cdfd3031749e532b (diff) | |
| download | apr-9bc61714783bad05c2e8ddbe891de955dc2b6dc9.tar.gz | |
change asyncio to take a struct aiocb input arg
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1434941 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'poll')
| -rw-r--r-- | poll/unix/z_asio.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/poll/unix/z_asio.c b/poll/unix/z_asio.c index fa236f95c..9343f6b08 100644 --- a/poll/unix/z_asio.c +++ b/poll/unix/z_asio.c @@ -171,7 +171,7 @@ struct asio_elem_t #endif /* DEBUG */ -static int asyncio(asio_elem_t *elem) +static int asyncio(struct aiocb *a) { DBG_BUFF int rv; @@ -182,9 +182,9 @@ static int asyncio(asio_elem_t *elem) #define AIO BPX1AIO #endif - AIO(sizeof(struct aiocb), &(elem->a), &rv, &errno, __err2ad()); - DBG3(4, "BPX4AIO aiocb %p elem %p rv %d\n", - &(elem->a), elem, rv); + AIO(sizeof(struct aiocb), a, &rv, &errno, __err2ad()); + DBG2(4, "BPX4AIO aiocb %p rv %d\n", + a, rv); #ifdef DEBUG if (rv < 0) { DBG2(4, "errno %d errnojr %08x\n", @@ -404,7 +404,7 @@ static apr_status_t asio_pollset_add(apr_pollset_t *pollset, elem->pfd = *descriptor; elem->os_pfd.events = get_event(descriptor->reqevents); - if (0 != asyncio(elem)) { + if (0 != asyncio(&elem->a)) { rv = errno; DBG3(4, "pollset %p asio failed fd %d, errno %p\n", pollset, elem->os_pfd.fd, rv); @@ -506,7 +506,7 @@ static apr_status_t asio_pollset_remove(apr_pollset_t *pollset, /* we want *msgrcv to collect cancel notifications to remove races * in garbage collection */ - rv = asyncio(elem); + rv = asyncio(&elem->a); DBG1(4, "asyncio returned %d\n", rv); if (rv == 1) { @@ -625,7 +625,7 @@ static apr_status_t asio_pollset_poll(apr_pollset_t *pollset, elem->a.aio_cflags = AIO_OK2COMPIMD; - if (0 != (ret = asyncio(elem))) { + if (0 != (ret = asyncio(&elem->a))) { if (ret == 1) { DBG(4, "asyncio() completed inline\n"); /* it's ready now */ |