From 5e2aa9a421cd429e9ef7d169eda7c18a119e9b8c Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 20 May 2015 14:18:21 -0700 Subject: Move usleep.c using nanosleep to sysdeps/posix. --- ChangeLog | 5 +++++ sysdeps/posix/usleep.c | 33 +++++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/usleep.c | 33 --------------------------------- 3 files changed, 38 insertions(+), 33 deletions(-) create mode 100644 sysdeps/posix/usleep.c delete mode 100644 sysdeps/unix/sysv/linux/usleep.c diff --git a/ChangeLog b/ChangeLog index 0889f44dfc..180c5047e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-05-20 Roland McGrath + + * sysdeps/unix/sysv/linux/usleep.c: Moved to ... + * sysdeps/posix/usleep.c: ... here. + 2015-05-20 Adhemerval Zanella * sysdeps/unix/sysv/linux/i386/Makefile [$(subdir) = misc)]: Remove diff --git a/sysdeps/posix/usleep.c b/sysdeps/posix/usleep.c new file mode 100644 index 0000000000..841f1fa1b1 --- /dev/null +++ b/sysdeps/posix/usleep.c @@ -0,0 +1,33 @@ +/* Implementation of the BSD usleep function using nanosleep. + Copyright (C) 1996-2015 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 1996. + + 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, see + . */ + +#include +#include + +int +usleep (useconds_t useconds) +{ + struct timespec ts = { .tv_sec = (long int) (useconds / 1000000), + .tv_nsec = (long int) (useconds % 1000000) * 1000ul }; + + /* Note the usleep() is a cancellation point. But since we call + nanosleep() which itself is a cancellation point we do not have + to do anything here. */ + return __nanosleep (&ts, NULL); +} diff --git a/sysdeps/unix/sysv/linux/usleep.c b/sysdeps/unix/sysv/linux/usleep.c deleted file mode 100644 index 841f1fa1b1..0000000000 --- a/sysdeps/unix/sysv/linux/usleep.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Implementation of the BSD usleep function using nanosleep. - Copyright (C) 1996-2015 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1996. - - 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, see - . */ - -#include -#include - -int -usleep (useconds_t useconds) -{ - struct timespec ts = { .tv_sec = (long int) (useconds / 1000000), - .tv_nsec = (long int) (useconds % 1000000) * 1000ul }; - - /* Note the usleep() is a cancellation point. But since we call - nanosleep() which itself is a cancellation point we do not have - to do anything here. */ - return __nanosleep (&ts, NULL); -} -- cgit 1.4.1