diff options
| -rw-r--r-- | ChangeLog | 15 | ||||
| -rw-r--r-- | rt/Makefile | 9 | ||||
| -rw-r--r-- | rt/tst-aio.c | 4 | ||||
| -rw-r--r-- | rt/tst-aio3.c | 89 | ||||
| -rw-r--r-- | rt/tst-aio4.c | 141 | ||||
| -rw-r--r-- | rt/tst-aio5.c | 123 | ||||
| -rw-r--r-- | rt/tst-aio64.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/netinet/ip.h | 25 |
8 files changed, 381 insertions, 29 deletions
@@ -1,3 +1,18 @@ +2000-07-26 Andreas Jaeger <aj@suse.de> + + * rt/tst-aio4.c: New file, slighlty modified version of tst-aio2. + * rt/tst-aio5.c: New file, slighlty modified version of tst-aio2. + * rt/Makefile: Add rules to build and run tst-aio4 and tst-aio5. + + * rt/tst-aio.c (test_file): Fix typo. + * rt/tst-aio64.c (test_file): Likewise. + + * rt/tst-aio3.c: New file, slightly modified version of tst-aio2. + * rt/Makefile: Add rules to build and run tst-aio3. + + * sysdeps/unix/sysv/linux/netinet/ip.h: Removed ip_options since + it's not needed and confuses only. + 2000-07-26 Ulrich Drepper <drepper@redhat.com> * resolv/res_init.c: Add support for nameserver communication with diff --git a/rt/Makefile b/rt/Makefile index 8eb019662e..f2c80fa8ad 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -40,7 +40,8 @@ include ../Makeconfig ifeq ($(have-thread-library),yes) -tests := tst-aio tst-aio64 tst-clock tst-shm tst-timer tst-aio2 +tests := tst-aio tst-aio64 tst-clock tst-shm tst-timer tst-aio2 tst-aio3 \ + tst-aio4 tst-aio5 extra-libs := librt extra-libs-others := $(extra-libs) @@ -57,12 +58,18 @@ $(objpfx)librt.so: $(common-objpfx)libc.so $(shared-thread-library) ifeq (yes,$(build-shared)) $(objpfx)tst-aio: $(objpfx)librt.so $(shared-thread-library) $(objpfx)tst-aio2: $(objpfx)librt.so $(shared-thread-library) +$(objpfx)tst-aio3: $(objpfx)librt.so $(shared-thread-library) +$(objpfx)tst-aio4: $(objpfx)librt.so $(shared-thread-library) +$(objpfx)tst-aio5: $(objpfx)librt.so $(shared-thread-library) $(objpfx)tst-aio64: $(objpfx)librt.so $(shared-thread-library) $(objpfx)tst-clock: $(objpfx)librt.so $(shared-thread-library) $(objpfx)tst-shm: $(objpfx)librt.so $(shared-thread-library) else $(objpfx)tst-aio: $(objpfx)librt.a $(static-thread-library) $(objpfx)tst-aio2: $(objpfx)librt.a $(static-thread-library) +$(objpfx)tst-aio3: $(objpfx)librt.a $(static-thread-library) +$(objpfx)tst-aio4: $(objpfx)librt.a $(static-thread-library) +$(objpfx)tst-aio5: $(objpfx)librt.a $(static-thread-library) $(objpfx)tst-aio64: $(objpfx)librt.a $(static-thread-library) $(objpfx)tst-clock: $(objpfx)librt.a $(static-thread-library) $(objpfx)tst-shm: $(objpfx)librt.a $(static-thread-library) diff --git a/rt/tst-aio.c b/rt/tst-aio.c index a6c0762a2a..9a83a2779f 100644 --- a/rt/tst-aio.c +++ b/rt/tst-aio.c @@ -1,5 +1,5 @@ /* Tests for AIO in librt. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 Free Software Foundation, Inc. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. The GNU C Library is free software; you can redistribute it and/or @@ -84,7 +84,7 @@ test_file (const void *buf, size_t size, int fd, const char *msg) if (pread (fd, tmp, size, 0) != size) { - error (0, errno, "%s: failed stat", msg); + error (0, errno, "%s: failed pread", msg); return 1; } diff --git a/rt/tst-aio3.c b/rt/tst-aio3.c new file mode 100644 index 0000000000..b5bd3704aa --- /dev/null +++ b/rt/tst-aio3.c @@ -0,0 +1,89 @@ +/* Test for notification mechanism in lio_listio. + Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <aio.h> +#include <signal.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +int flag; + + +void +thrfct (sigval_t arg) +{ + flag = 1; +} + + +int +do_test (int argc, char *argv[]) +{ + char name[] = "/tmp/aio3.XXXXXX"; + int fd; + struct aiocb *arr[1]; + struct aiocb cb; + static const char buf[] = "Hello World\n"; + + fd = mkstemp (name); + if (fd == -1) + { + printf ("cannot open temp name: %m\n"); + return 1; + } + + unlink (name); + + arr[0] = &cb; + + cb.aio_fildes = fd; + cb.aio_lio_opcode = LIO_WRITE; + cb.aio_reqprio = 0; + cb.aio_buf = (void *) buf; + cb.aio_nbytes = sizeof (buf) - 1; + cb.aio_sigevent.sigev_notify = SIGEV_THREAD; + cb.aio_sigevent.sigev_notify_function = thrfct; + cb.aio_sigevent.sigev_notify_attributes = NULL; + cb.aio_sigevent.sigev_value.sival_ptr = NULL; + + if (lio_listio (LIO_NOWAIT, arr, 1, NULL) < 0) + { + printf ("lio_listio failed: %m\n"); + return 1; + } + + if (aio_suspend ((const struct aiocb *const *) arr, 1, NULL) < 0) + { + printf ("aio_suspend failed: %m\n"); + return 1; + } + + if (flag != 0) + { + puts ("thread created, should not have happened"); + return 1; + } + + puts ("all OK"); + + return 0; +} + +#include "../test-skeleton.c" diff --git a/rt/tst-aio4.c b/rt/tst-aio4.c new file mode 100644 index 0000000000..1fd5ca59a7 --- /dev/null +++ b/rt/tst-aio4.c @@ -0,0 +1,141 @@ +/* Test for completion signal handling. + Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <aio.h> +#include <signal.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +/* We might need a bit longer timeout. */ +#define TIMEOUT 10 /* sec */ + +#define MY_SIGNO (SIGRTMIN + 11) + +volatile sig_atomic_t flag; + + +void +sighandler (const int signo) +{ + flag = signo; +} + +int +wait_flag (void) +{ + while (flag == 0) + { + puts ("Sleeping..."); + sleep (1); + } + + if (flag != MY_SIGNO) + { + printf ("signal handler received wrong signal, flag is %d\n", flag); + return 1; + } + + return 0; +} + + +int +do_test (int argc, char *argv[]) +{ + char name[] = "/tmp/aio4.XXXXXX"; + int fd; + struct aiocb *arr[1]; + struct aiocb cb; + static const char buf[] = "Hello World\n"; + struct aioinit init = {10, 20, 0}; + struct sigaction sa; + struct sigevent ev; + + fd = mkstemp (name); + if (fd == -1) + { + printf ("cannot open temp name: %m\n"); + return 1; + } + + unlink (name); + + /* Test also aio_init. */ + aio_init (&init); + + arr[0] = &cb; + + cb.aio_fildes = fd; + cb.aio_lio_opcode = LIO_WRITE; + cb.aio_reqprio = 0; + cb.aio_buf = (void *) buf; + cb.aio_nbytes = sizeof (buf) - 1; + cb.aio_sigevent.sigev_notify = SIGEV_SIGNAL; + cb.aio_sigevent.sigev_notify_function = NULL; + cb.aio_sigevent.sigev_notify_attributes = NULL; + cb.aio_sigevent.sigev_signo = MY_SIGNO; + cb.aio_sigevent.sigev_value.sival_ptr = NULL; + + ev.sigev_notify = SIGEV_SIGNAL; + ev.sigev_notify_function = NULL; + ev.sigev_notify_attributes = NULL; + ev.sigev_signo = MY_SIGNO; + + sa.sa_handler = sighandler; + sigemptyset (&sa.sa_mask); + sa.sa_flags = SA_RESTART; + sa.sa_restorer = NULL; + + if (sigaction (MY_SIGNO, &sa, NULL) < 0) + { + printf ("sigaction failed: %m\n"); + return 1; + } + + flag = 0; + /* First use aio_write. */ + if (aio_write (arr[0]) < 0) + { + printf ("aio_write failed: %m\n"); + return 1; + } + + if (wait_flag ()) + return 1; + + puts ("aio_write OK"); + + flag = 0; + /* Again with lio_listio. */ + if (lio_listio (LIO_NOWAIT, arr, 1, &ev) < 0) + { + printf ("lio_listio failed: %m\n"); + return 1; + } + + if (wait_flag ()) + return 1; + + puts ("all OK"); + + return 0; +} + +#include "../test-skeleton.c" diff --git a/rt/tst-aio5.c b/rt/tst-aio5.c new file mode 100644 index 0000000000..908f7c10da --- /dev/null +++ b/rt/tst-aio5.c @@ -0,0 +1,123 @@ +/* Test for completion thread handling. + Copyright (C) 2000 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <aio.h> +#include <signal.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +/* We might need a bit longer timeout. */ +#define TIMEOUT 10 /* sec */ + +#define MY_SIVAL 27 + +volatile sig_atomic_t flag; + + +void +callback (sigval_t s) +{ + flag = s.sival_int; +} + +int +wait_flag (void) +{ + while (flag == 0) + { + puts ("Sleeping..."); + sleep (1); + } + + if (flag != MY_SIVAL) + { + printf ("signal handler received wrong signal, flag is %d\n", flag); + return 1; + } + + return 0; +} + + +int +do_test (int argc, char *argv[]) +{ + char name[] = "/tmp/aio5.XXXXXX"; + int fd; + struct aiocb *arr[1]; + struct aiocb cb; + static const char buf[] = "Hello World\n"; + struct sigevent ev; + + fd = mkstemp (name); + if (fd == -1) + { + printf ("cannot open temp name: %m\n"); + return 1; + } + + unlink (name); + + arr[0] = &cb; + + cb.aio_fildes = fd; + cb.aio_lio_opcode = LIO_WRITE; + cb.aio_reqprio = 0; + cb.aio_buf = (void *) buf; + cb.aio_nbytes = sizeof (buf) - 1; + cb.aio_sigevent.sigev_notify = SIGEV_THREAD; + cb.aio_sigevent.sigev_notify_function = callback; + cb.aio_sigevent.sigev_notify_attributes = NULL; + cb.aio_sigevent.sigev_value.sival_int = MY_SIVAL; + + ev.sigev_notify = SIGEV_THREAD; + ev.sigev_notify_function = callback; + ev.sigev_notify_attributes = NULL; + ev.sigev_value.sival_int = MY_SIVAL; + + /* First use aio_write. */ + if (aio_write (arr[0]) < 0) + { + printf ("aio_write failed: %m\n"); + return 1; + } + + if (wait_flag ()) + return 1; + + puts ("aio_write OK"); + + flag = 0; + /* Again with lio_listio. */ + if (lio_listio (LIO_NOWAIT, arr, 1, &ev) < 0) + { + printf ("lio_listio failed: %m\n"); + return 1; + } + + if (wait_flag ()) + return 1; + + puts ("all OK"); + + return 0; +} + +#include "../test-skeleton.c" diff --git a/rt/tst-aio64.c b/rt/tst-aio64.c index 60db0dd1aa..74159c9662 100644 --- a/rt/tst-aio64.c +++ b/rt/tst-aio64.c @@ -1,5 +1,5 @@ /* Tests for 64bit AIO in librt. - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. The GNU C Library is free software; you can redistribute it and/or @@ -85,7 +85,7 @@ test_file (const void *buf, size_t size, int fd, const char *msg) if (pread (fd, tmp, size, 0) != size) { - error (0, errno, "%s: failed stat", msg); + error (0, errno, "%s: failed pread", msg); return 1; } diff --git a/sysdeps/unix/sysv/linux/netinet/ip.h b/sysdeps/unix/sysv/linux/netinet/ip.h index 49c6afd05f..4341ed24b3 100644 --- a/sysdeps/unix/sysv/linux/netinet/ip.h +++ b/sysdeps/unix/sysv/linux/netinet/ip.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,93,95,96,97,98,99 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,93,95,96,97,98,99,2000 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -42,29 +42,6 @@ struct timestamp u_int32_t data[9]; }; -struct ip_options - { - u_int32_t faddr; /* Saved first hop address */ - u_int8_t optlen; - u_int8_t srr; - u_int8_t rr; - u_int8_t ts; - unsigned int is_setbyuser:1; /* Set by setsockopt? */ - unsigned int is_data:1; /* Options in __data, rather than skb */ - unsigned int is_strictroute:1; /* Strict source route */ - unsigned int srr_is_hit:1; /* Packet destination addr was our one */ - unsigned int is_changed:1; /* IP checksum more not valid */ - unsigned int rr_needaddr:1; /* Need to record addr of outgoing dev */ - unsigned int ts_needtime:1; /* Need to record timestamp */ - unsigned int ts_needaddr:1; /* Need to record addr of outgoing dev */ - u_int8_t router_alert; - u_int8_t __pad1; - u_int8_t __pad2; -#ifdef __GNUC__ - u_int8_t __data[0]; -#endif - }; - struct iphdr { #if __BYTE_ORDER == __LITTLE_ENDIAN |