Update.

2000-07-26  Andreas Jaeger  <aj@suse.de>

	* rt/tst-aio.c: Add tests for aio_fsync and aio_cancel.
	(do_wait): Test requests with aio_return.
	(do_test): Change callers of do_wait.

2000-07-27  Ulrich Drepper  <drepper@redhat.com>

	* rt/aio_misc.c (__aio_remove_request): New function.  Handle removing
	from request list.  Don't do the list handling here, call
	__aio_remove_request.
	* rt/aio_misc.h: Add prototype for __aio_remove_request.
	* rt/aio_cancel.c: Don't assume __aio_find_req_fd succeeds since the
	request might already be processed.  Don't do the list handling
	here, call __aio_remove_request.

	* rt/aio_misc.c: Don't depend on aio_reqprio field for LIO_SYNC and
	LIO_DSYNC.

	* rt/aio_misc.c: Add comment explaining why writer memory barriers
	are missing.

1 files changed, 99 insertions, 10 deletions

diff --git a/rt/tst-aio.c b/rt/tst-aio.c
index 9a83a27..8a6f103 100644
--- a/rt/tst-aio.c
+++ b/rt/tst-aio.c
@@ -100,23 +100,38 @@ test_file (const void *buf, size_t size, int fd, const char *msg)
 }
 
 
-void
-do_wait (struct aiocb **cbp, size_t nent)
+int
+do_wait (struct aiocb **cbp, size_t nent, int allowed_err)
 {
   int go_on;
+  size_t cnt;
+  int result = 0;
+
   do
     {
-      size_t cnt;
-
       aio_suspend ((const struct aiocb *const *) cbp, nent, NULL);
       go_on = 0;
       for (cnt = 0; cnt < nent; ++cnt)
-	if (cbp[cnt] != NULL && aio_error (cbp[cnt]) == EINPROGRESS)
-	  go_on = 1;
-	else
-	  cbp[cnt] = NULL;
+	if (cbp[cnt] != NULL)
+	  {
+	    if (aio_error (cbp[cnt]) == EINPROGRESS)
+	      go_on = 1;
+	    else
+	      {
+		if (aio_return (cbp[cnt]) == -1
+		    && (allowed_err == 0
+			|| aio_error (cbp[cnt]) != allowed_err))
+		  {
+		    error (0, aio_error (cbp[cnt]), "Operation failed\n");
+		    result = 1;
+		  }
+		cbp[cnt] = NULL;
+	      }
+	  }
     }
   while (go_on);
+
+  return result;
 }
 
 
@@ -124,7 +139,9 @@ int
 do_test (int argc, char *argv[])
 {
   struct aiocb cbs[10];
+  struct aiocb cbs_fsync;
   struct aiocb *cbp[10];
+  struct aiocb *cbp_fsync[1];
   char buf[1000];
   size_t cnt;
   int result = 0;
@@ -146,7 +163,7 @@ do_test (int argc, char *argv[])
   for (cnt = 10; cnt > 0; )
     aio_write (cbp[--cnt]);
   /* Wait 'til the results are there.  */
-  do_wait (cbp, 10);
+  result |= do_wait (cbp, 10, 0);
   /* Test this.  */
   result |= test_file (buf, sizeof (buf), fd, "aio_write");
 
@@ -160,7 +177,7 @@ do_test (int argc, char *argv[])
       aio_read (cbp[cnt]);
     }
   /* Wait 'til the results are there.  */
-  do_wait (cbp, 10);
+  result |= do_wait (cbp, 10, 0);
   /* Test this.  */
   for (cnt = 0; cnt < 1000; ++cnt)
     if (buf[cnt] != '0' + (cnt / 100))
@@ -191,5 +208,77 @@ do_test (int argc, char *argv[])
   /* ...and immediately test it since we started it in wait mode.  */
   result |= test_file (buf, sizeof (buf), fd, "lio_listio (write)");
 
+  /* Test aio_fsync.  */
+  cbs_fsync.aio_fildes = fd;
+  cbs_fsync.aio_sigevent.sigev_notify = SIGEV_NONE;
+  cbp_fsync[0] = &cbs_fsync;
+
+  /* Remove the test file contents first.  */
+  if (ftruncate (fd, 0) < 0)
+    {
+      error (0, errno, "ftruncate failed\n");
+      result = 1;
+    }
+
+  /* Write again.  */
+  for (cnt = 10; cnt > 0; )
+    aio_write (cbp[--cnt]);
+
+  if (aio_fsync (O_SYNC, &cbs_fsync) < 0)
+    {
+      error (0, errno, "aio_fsync failed\n");
+      result = 1;
+    }
+  result |= do_wait (cbp_fsync, 1, 0);
+
+  /* ...and test since all data should be on disk now.  */
+  result |= test_file (buf, sizeof (buf), fd, "aio_fsync (aio_write)");
+
+  /* Test aio_cancel.  */
+  /* Remove the test file contents first.  */
+  if (ftruncate (fd, 0) < 0)
+    {
+      error (0, errno, "ftruncate failed\n");
+      result = 1;
+    }
+
+  /* Write again.  */
+  for (cnt = 10; cnt > 0; )
+    aio_write (cbp[--cnt]);
+
+  /* Cancel all requests.  */
+  if (aio_cancel (fd, NULL) == -1)
+    printf ("aio_cancel (fd, NULL) cannot cancel anything\n");
+
+  result |= do_wait (cbp, 10, ECANCELED);
+
+  /* Another test for aio_cancel.  */
+  /* Remove the test file contents first.  */
+  if (ftruncate (fd, 0) < 0)
+    {
+      error (0, errno, "ftruncate failed\n");
+      result = 1;
+    }
+
+  /* Write again.  */
+  for (cnt = 10; cnt > 0; )
+    {
+      --cnt;
+      cbp[cnt] = &cbs[cnt];
+      aio_write (cbp[cnt]);
+    }
+  puts ("finished3");
+
+  /* Cancel all requests.  */
+  for (cnt = 10; cnt > 0; )
+    if (aio_cancel (fd, cbp[--cnt]) == -1)
+      /* This is not an error.  The request can simply be finished.  */
+      printf ("aio_cancel (fd, cbp[%Zd]) cannot be canceled\n", cnt);
+  puts ("finished2");
+
+  result |= do_wait (cbp, 10, ECANCELED);
+
+  puts ("finished");
+
   return result;
 }