diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2007-05-07 04:23:14 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2007-05-07 04:23:14 +0000 |
| commit | aa75f64c626d40a05177e2d25053db988c339779 (patch) | |
| tree | 5c0790847aa801ad7a6288f3ed34b0578a45b88f | |
| parent | 711deb05844be0f8ede7b4ef30838b969d8571bc (diff) | |
| download | glibc-aa75f64c626d40a05177e2d25053db988c339779.zip glibc-aa75f64c626d40a05177e2d25053db988c339779.tar.gz glibc-aa75f64c626d40a05177e2d25053db988c339779.tar.bz2 | |
* posix/unistd.h: Remove __THROW from fdatasync.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/tst-cancel-wrappers.sh | 3 | ||||
| -rw-r--r-- | nptl/tst-cancel4.c | 44 | ||||
| -rw-r--r-- | posix/unistd.h | 2 |
5 files changed, 55 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2007-05-06 Ulrich Drepper <drepper@redhat.com> + + * posix/unistd.h: Remove __THROW from fdatasync. + 2007-05-06 Mike Frysinger <vapier@gentoo.org> * sysdeps/unix/sysv/linux/syscalls.list (fdatasync): Add "C" to args. diff --git a/nptl/ChangeLog b/nptl/ChangeLog index ce3ca41..fe25da2 100644 --- a/nptl/ChangeLog +++ b/nptl/ChangeLog @@ -1,3 +1,8 @@ +2007-05-06 Mike Frysinger <vapier@gentoo.org> + + * tst-cancel-wrappers.sh: Set C["fdatasync"] to 1. + * tst-cancel4.c (tf_fdatasync): New test. + 2007-04-27 Ulrich Drepper <drepper@redhat.com> [BZ #4392] diff --git a/nptl/tst-cancel-wrappers.sh b/nptl/tst-cancel-wrappers.sh index d6f16d1..61b9fb5 100644 --- a/nptl/tst-cancel-wrappers.sh +++ b/nptl/tst-cancel-wrappers.sh @@ -1,6 +1,6 @@ #! /bin/sh # Test whether all cancelable functions are cancelable. -# Copyright (C) 2002, 2003 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2007 Free Software Foundation, Inc. # This file is part of the GNU C Library. # Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. @@ -26,6 +26,7 @@ C["close"]=1 C["connect"]=1 C["creat"]=1 C["fcntl"]=1 +C["fdatasync"]=1 C["fsync"]=1 C["msgrcv"]=1 C["msgsnd"]=1 diff --git a/nptl/tst-cancel4.c b/nptl/tst-cancel4.c index 73cfa44..45df6ce 100644 --- a/nptl/tst-cancel4.c +++ b/nptl/tst-cancel4.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. @@ -1571,6 +1571,47 @@ tf_fsync (void *arg) static void * +tf_fdatasync (void *arg) +{ + if (arg == NULL) + // XXX If somebody can provide a portable test case in which fdatasync() + // blocks we can enable this test to run in both rounds. + abort (); + + tempfd = open ("Makefile", O_RDONLY); + if (tempfd == -1) + { + printf ("%s: cannot open Makefile\n", __FUNCTION__); + exit (1); + } + + int r = pthread_barrier_wait (&b2); + if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD) + { + printf ("%s: barrier_wait failed\n", __FUNCTION__); + exit (1); + } + + r = pthread_barrier_wait (&b2); + if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD) + { + printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__); + exit (1); + } + + pthread_cleanup_push (cl, NULL); + + fdatasync (tempfd); + + pthread_cleanup_pop (0); + + printf ("%s: fdatasync returned\n", __FUNCTION__); + + exit (1); +} + + +static void * tf_msync (void *arg) { if (arg == NULL) @@ -2078,6 +2119,7 @@ static struct ADD_TEST (pread, 2, 1), ADD_TEST (pwrite, 2, 1), ADD_TEST (fsync, 2, 1), + ADD_TEST (fdatasync, 2, 1), ADD_TEST (msync, 2, 1), ADD_TEST (sendto, 2, 1), ADD_TEST (sendmsg, 2, 1), diff --git a/posix/unistd.h b/posix/unistd.h index 577925c..a86968a 100644 --- a/posix/unistd.h +++ b/posix/unistd.h @@ -1062,7 +1062,7 @@ extern int lockf64 (int __fd, int __cmd, __off64_t __len) __wur; #if defined __USE_POSIX199309 || defined __USE_UNIX98 /* Synchronize at least the data part of a file with the underlying media. */ -extern int fdatasync (int __fildes) __THROW; +extern int fdatasync (int __fildes); #endif /* Use POSIX199309 */ |