From 0a8730cb83d636415926add300e5aea939cf751e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 17 May 2003 06:07:38 +0000 Subject: Update. * rt/Makefile (tests): Add tst-clock_nanosleep. * rt/tst-clock_nanosleep.c: New file. * posix/Makefile (tests): Add tst-nanosleep. * posix/tst-nanosleep.c: New file. --- ChangeLog | 5 +++++ posix/Makefile | 3 ++- posix/tst-nanosleep.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ rt/Makefile | 2 +- rt/tst-clock_nanosleep.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 122 insertions(+), 2 deletions(-) create mode 100644 posix/tst-nanosleep.c create mode 100644 rt/tst-clock_nanosleep.c diff --git a/ChangeLog b/ChangeLog index 5da2481..5659626 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2003-05-16 Ulrich Drepper + * rt/Makefile (tests): Add tst-clock_nanosleep. + * rt/tst-clock_nanosleep.c: New file. + * posix/Makefile (tests): Add tst-nanosleep. + * posix/tst-nanosleep.c: New file. + * sysdeps/unix/clock_nanosleep.c (CPUCLOCK_P): Fix definition. * include/features.h (__USE_XOPEN2K): Define also for diff --git a/posix/Makefile b/posix/Makefile index f8c4231..ed4d6ac 100644 --- a/posix/Makefile +++ b/posix/Makefile @@ -75,7 +75,8 @@ tests := tstgetopt testfnm runtests runptests \ tst-chmod bug-regex1 bug-regex2 bug-regex3 bug-regex4 \ tst-gnuglob tst-regex bug-regex5 bug-regex6 bug-regex7 \ bug-regex8 bug-regex9 bug-regex10 bug-regex11 bug-regex12 \ - bug-regex13 bug-regex14 bug-regex15 bug-regex16 tst-nice + bug-regex13 bug-regex14 bug-regex15 bug-regex16 tst-nice \ + tst-nanosleep ifeq (yes,$(build-shared)) test-srcs := globtest tests += wordexp-test tst-exec tst-spawn diff --git a/posix/tst-nanosleep.c b/posix/tst-nanosleep.c new file mode 100644 index 0000000..a087db8 --- /dev/null +++ b/posix/tst-nanosleep.c @@ -0,0 +1,57 @@ +/* Copyright (C) 2003 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include +#include + + +/* Test that nanosleep() does sleep. */ +static int +do_test (void) +{ + /* Current time. */ + struct timeval tv1; + (void) gettimeofday (&tv1, NULL); + + struct timespec ts; + ts.tv_sec = 1; + ts.tv_nsec = 0; + TEMP_FAILURE_RETRY (nanosleep (&ts, &ts)); + + /* At least one second must have passed. */ + struct timeval tv2; + (void) gettimeofday (&tv2, NULL); + + tv2.tv_sec -= tv1.tv_sec; + tv2.tv_usec -= tv1.tv_usec; + if (tv2.tv_usec < 0) + --tv2.tv_sec; + + if (tv2.tv_sec < 1) + { + puts ("nanosleep didn't sleep long enough"); + return 1; + } + + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/rt/Makefile b/rt/Makefile index 712b1a9..828bdc1 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -38,7 +38,7 @@ librt-routines = $(aio-routines) \ $(clock-routines) $(timer-routines) \ $(shm-routines) -tests := tst-shm tst-clock tst-timer \ +tests := tst-shm tst-clock tst-clock_nanosleep tst-timer \ tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \ tst-aio7 diff --git a/rt/tst-clock_nanosleep.c b/rt/tst-clock_nanosleep.c new file mode 100644 index 0000000..005f00e --- /dev/null +++ b/rt/tst-clock_nanosleep.c @@ -0,0 +1,57 @@ +/* Copyright (C) 2003 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 Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include +#include + + +/* Test that clock_nanosleep() does sleep. */ +static int +do_test (void) +{ + /* Current time. */ + struct timeval tv1; + (void) gettimeofday (&tv1, NULL); + + struct timespec ts; + ts.tv_sec = 1; + ts.tv_nsec = 0; + TEMP_FAILURE_RETRY (clock_nanosleep (CLOCK_REALTIME, 0, &ts, &ts)); + + /* At least one second must have passed. */ + struct timeval tv2; + (void) gettimeofday (&tv2, NULL); + + tv2.tv_sec -= tv1.tv_sec; + tv2.tv_usec -= tv1.tv_usec; + if (tv2.tv_usec < 0) + --tv2.tv_sec; + + if (tv2.tv_sec < 1) + { + puts ("clock_nanosleep didn't sleep long enough"); + return 1; + } + + return 0; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" -- cgit v1.1