[LTP] [POSIX][PATCH 1/2]Use aio_error instead signal hander at aio_suspend/1-1

Bian Naimeng
2010-11-11T03:17:02Z

aio_suspend may be interrupted by IO request's completion signal, so we
should use aio_error instead signal hander to check whether this request
has complete.

Signed-off-by: Bian Naimeng <biannm@cn.fujitsu.com>

---
.../conformance/interfaces/aio_suspend/1-1.c | 49 +++++++------------
1 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/1-1.c b/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/1-1.c
index 7d33e62..63d986e 100644
--- a/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/1-1.c
+++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/1-1.c
@@ -44,18 +44,23 @@
#define BUF_SIZE 1024*1024
#define WAIT_FOR_AIOCB 6

-int received_selected = 0;
int received_all = 0;

-void
-sigrt1_handler(int signum, siginfo_t *info, void *context)
+int selected_request_status(struct aiocb *paiocb, int expect)
{
- if (info->si_value.sival_int == WAIT_FOR_AIOCB)
- received_selected = 1;
+ int err = aio_error(paiocb);
+
+ if (err != expect) {
+ printf (TNAME " Selected request expect %d[%s], not %d[%s]\n",
+ expect, strerror(expect), err, strerror(err));
+ return 0;
+ }
+
+ return 1;
}

void
-sigrt2_handler(int signum, siginfo_t *info, void *context)
+sigrt1_handler(int signum, siginfo_t *info, void *context)
{
received_all = 1;
}
@@ -123,37 +128,25 @@ main ()
aiocbs[i]->aio_buf = &bufs[i*BUF_SIZE];
aiocbs[i]->aio_nbytes = BUF_SIZE;
aiocbs[i]->aio_lio_opcode = LIO_READ;
-
- /* Use SIRTMIN+1 for individual completions */
- aiocbs[i]->aio_sigevent.sigev_notify = SIGEV_SIGNAL;
- aiocbs[i]->aio_sigevent.sigev_signo = SIGRTMIN+1;
- aiocbs[i]->aio_sigevent.sigev_value.sival_int = i;
}

/* Use SIGRTMIN+2 for list completion */
event.sigev_notify = SIGEV_SIGNAL;
- event.sigev_signo = SIGRTMIN+2;
+ event.sigev_signo = SIGRTMIN+1;
event.sigev_value.sival_ptr = NULL;

- /* Setup handler for individual operation completion */
+ /* Setup handler for list completion */
action.sa_sigaction = sigrt1_handler;
sigemptyset(&action.sa_mask);
action.sa_flags = SA_SIGINFO|SA_RESTART;
sigaction(SIGRTMIN+1, &action, NULL);

- /* Setup handler for list completion */
- action.sa_sigaction = sigrt2_handler;
- sigemptyset(&action.sa_mask);
- action.sa_flags = SA_SIGINFO|SA_RESTART;
- sigaction(SIGRTMIN+2, &action, NULL);
-
/* Setup suspend list */
plist[0] = NULL;
plist[1] = aiocbs[WAIT_FOR_AIOCB];

/* Submit request list */
ret = lio_listio(LIO_NOWAIT, aiocbs, NUM_AIOCBS, &event);
-
if (ret) {
printf(TNAME " Error at lio_listio() %d: %s\n", errno, strerror(errno));
for (i=0; i<NUM_AIOCBS; i++)
@@ -165,9 +158,7 @@ main ()
}

/* Check selected request has not completed yet */
- if (received_selected) {
- printf (TNAME " Error : AIOCB %d already completed before suspend\n",
- WAIT_FOR_AIOCB);
+ if (!selected_request_status(aiocbs[WAIT_FOR_AIOCB], EINPROGRESS)) {
for (i=0; i<NUM_AIOCBS; i++)
free (aiocbs[i]);
free (bufs);
@@ -178,11 +169,8 @@ main ()

/* Suspend on selected request */
ret = aio_suspend((const struct aiocb **)plist, 2, NULL);
-
- /* Check selected request has completed */
- if (!received_selected) {
- printf (TNAME " Error : AIOCB %d should have completed after suspend\n",
- WAIT_FOR_AIOCB);
+ if (ret) {
+ printf (TNAME " Error at aio_suspend() %d: %s\n", errno, strerror (errno));
for (i=0; i<NUM_AIOCBS; i++)
free (aiocbs[i]);
free (bufs);
@@ -191,9 +179,8 @@ main ()
exit (PTS_FAIL);
}

-
- if (ret) {
- printf (TNAME " Error at aio_suspend() %d: %s\n", errno, strerror (errno));
+ /* Check selected request has completed */
+ if (!selected_request_status(aiocbs[WAIT_FOR_AIOCB], 0)) {
for (i=0; i<NUM_AIOCBS; i++)
free (aiocbs[i]);
free (bufs);
--
1.7.0.4