Hi!
> 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 <[email protected]>
>
> ---
> .../conformance/interfaces/aio_suspend/4-1.c | 65
> +++++++-------------
> 1 files changed, 23 insertions(+), 42 deletions(-)
>
> diff --git
> a/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/4-1.c
> b/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/4-1.c
> index 260c26a..6699ab4 100644
> --- a/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/4-1.c
> +++ b/testcases/open_posix_testsuite/conformance/interfaces/aio_suspend/4-1.c
> @@ -41,18 +41,24 @@
> #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;
> }
> @@ -68,7 +74,7 @@ main ()
> char *bufs;
> struct sigaction action;
> struct sigevent event;
> - struct timespec ts = {0, 10000000}; /* 10 ms */
> + struct timespec ts = {0, 1000}; /* 1 us */
> int errors = 0;
> int ret;
> int err;
> @@ -121,39 +127,28 @@ 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;
Same here.
> - /* 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);
> -
Here.
> if (ret) {
> - printf(TNAME " Error at lio_listio() %d: %s\n", errno,
> strerror(errno));
> + printf (TNAME " Error at lio_listio() %d: %s\n",
> + errno, strerror(errno));
> for (i=0; i<NUM_AIOCBS; i++)
> free (aiocbs[i]);
> free (bufs);
> @@ -163,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);
And here.
> @@ -177,21 +170,10 @@ main ()
> /* Suspend on selected request */
> ret = aio_suspend((const struct aiocb **)plist, 2, &ts);
Useless cast (and I've missed it in comments for previous patch).
> - /* Check selected request has not completed */
> - if (received_selected) {
> - printf (TNAME " Error : AIOCB %d should not have completed
> after timed out suspend\n",
> - WAIT_FOR_AIOCB);
> - for (i=0; i<NUM_AIOCBS; i++)
> - free (aiocbs[i]);
> - free (bufs);
> - free (aiocbs);
> - close (fd);
> - exit (PTS_FAIL);
> - }
> -
> /* timed out aio_suspend should return -1 and set errno to EAGAIN */
> - if (ret != -1) {
> - printf (TNAME " aio_suspend() should return -1\n");
> + if (ret != -1 || errno != EAGAIN) {
> + printf (TNAME " aio_suspend() should return -1 and set errno "
> + "to EAGAIN: %d, %s\n", ret, strerror(errno));
> for (i=0; i<NUM_AIOCBS; i++)
> free (aiocbs[i]);
> free (bufs);
> @@ -200,9 +182,8 @@ main ()
> exit (PTS_FAIL);
> }
>
> - if (errno != EAGAIN) {
> - printf (TNAME " aio_suspend() should set errno to EAGAIN: %d
> (%s)\n",
> - errno, strerror (errno));
> + /* Check selected request has not completed */
> + if (!selected_request_status(aiocbs[WAIT_FOR_AIOCB], EINPROGRESS)) {
> for (i=0; i<NUM_AIOCBS; i++)
> free (aiocbs[i]);
> free (bufs);
I think we should print here, why the test has failed.
--
Cyril Hrubis
[email protected]
------------------------------------------------------------------------------
Centralized Desktop Delivery: Dell and VMware Reference Architecture
Simplifying enterprise desktop deployment and management using
Dell EqualLogic storage and VMware View: A highly scalable, end-to-end
client virtualization framework. Read more!
http://p.sf.net/sfu/dell-eql-dev2dev
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
