AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-01-03 00:10:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
2000-06-26  Ulrich Drepper  <drepper@redhat.com>

	* rt/Makefile (librt-routines): Add clock_nanosleep.
	* rt/Versions [GLIBC_2.2] (librt): Add clock_nanosleep.
	* sysdeps/generic/clock_nanosleep.c: New file.
	* sysdeps/unix/clock_nanosleep.c: New file.
	* sysdeps/unix/i386/i586/clock_nanosleep.c: New file.
	* time/time.h: Declare clock_nanosleep.
This commit is contained in:
Ulrich Drepper 2000-06-26 18:12:12 +00:00
parent 5839de1d37
commit c000cdad1a
7 changed files with 162 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2000-06-26 Ulrich Drepper <drepper@redhat.com>
* rt/Makefile (librt-routines): Add clock_nanosleep.
* rt/Versions [GLIBC_2.2] (librt): Add clock_nanosleep.
* sysdeps/generic/clock_nanosleep.c: New file.
* sysdeps/unix/clock_nanosleep.c: New file.
* sysdeps/unix/i386/i586/clock_nanosleep.c: New file.
* time/time.h: Declare clock_nanosleep.
2000-06-26 Greg McGary <greg@mcgary.org>
* sysdeps/i386/asm-syntax.h (R, MEM, MEM_DISP, MEM_INDEX,

2
localedata/ChangeLog
View File

@ -28,7 +28,7 @@
* tst-fmon-locales/tstfmon_y40y00: Likewise.
* tst-fmon-locales/tstfmon_y42n21: Likewise.
* tst-rpmatch.c: Avoid warning with borken compiler.
* tst-rpmatch.c: Avoid warning with broken compiler.
* locales/i18n: Take CJK ideographs and Hangul out of `alpha' table.

1
rt/Versions
View File

@ -8,6 +8,7 @@ librt {
GLIBC_2.2 {
# c*
clock_getres; clock_gettime; clock_settime; clock_getcpuclockid;
clock_nanosleep;
# s*
shm_open; shm_unlink;

39
sysdeps/generic/clock_nanosleep.c Normal file
View File

@ -0,0 +1,39 @@
/* High-resolution sleep with the specified clock. Stub version.
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 <errno.h>
#include <sys/time.h>
int
clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
struct timespec *rem)
{
if (__builtin_expect (req->tv_nsec, 0) < 0
|| __builtin_expect (req->tv_nsec, 0) >= 1000000000)
return EINVAL;
if (flags != TIMER_ABSTIME && flags != 0)
return EINVAL;
/* Not implemented. */
return ENOSYS;
}
stub_warning (clock_nanosleep)
#include <stub-tag.h>

81
sysdeps/unix/clock_nanosleep.c Normal file
View File

@ -0,0 +1,81 @@
/* High-resolution sleep with the specified clock.
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 <assert.h>
#include <errno.h>
#include <sys/time.h>
#ifndef CLOCK_P
# define CLOCK_P(clock) 0
#endif
/* This implementation assumes that these is only a `nanosleep' system
call. So we have to remap all other activities. */
int
clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,
struct timespec *rem)
{
struct timespec now;
if (__builtin_expect (req->tv_nsec, 0) < 0
|| __builtin_expect (req->tv_nsec, 0) >= 1000000000)
return EINVAL;
/* If we got an absolute time, remap it. */
if (flags == TIMER_ABSTIME)
{
long int nsec;
long int sec;
/* Make sure we use safe data types. */
assert (sizeof (sec) >= sizeof (now.tv_sec));
/* Get the current time for this clock. */
if (clock_gettime (clock_id, &now) != 0)
return errno;
/* Compute the difference. */
nsec = req->tv_nsec - now.tv_nsec;
sec = req->tv_sec - now.tv_sec - (nsec < 0);
if (sec < 0)
/* The time has already elapsed. */
return 0;
now.tv_sec = sec;
now.tv_nsec = nsec + (nsec < 0 ? 1000000000 : 0);
/* From now on this is our time. */
req = &now;
/* Make sure we are not modifying the struct pointed to by REM. */
rem = NULL;
}
else if (__builtin_expect (flags, 0) != 0)
return EINVAL;
else if (clock_id != CLOCK_REALTIME)
{
/* Make sure the clock ID is correct. */
if (__builtin_expect (! CLOCK_P (clock_id), 0))
return EINVAL;
}
return __builtin_expect (nanosleep (req, rem), 0) ? errno : 0;
}

26
sysdeps/unix/i386/i586/clock_nanosleep.c Normal file
View File

@ -0,0 +1,26 @@
/* High-resolution sleep with the specified clock.
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. */
/* Additional definitions for the x86 version. */
#define CLOCK_P(clock) \
(clock) != CLOCK_PROCESS_CPUTIME_ID \
&& (clock) != CLOCK_THREAD_CPUTIME_ID \
&& (clock) != CLOCK_MONOTONIC
#include <sysdeps/unix/clock_nanosleep.c>

5
time/time.h
View File

@ -277,6 +277,11 @@ extern int clock_settime (clockid_t __clock_id, __const struct timespec *__tp)
__THROW;
# ifdef __USE_XOPEN2K
/* High-resolution sleep with the specified clock. */
extern int clock_nanosleep (clockid_t __clock_id, int __flags,
__const struct timespec *__req,
struct timespec *__rem) __THROW;
/* Return clock ID for CPU-time clock. */
extern int clock_getcpuclockid (pid_t __pid, clockid_t *__clock_id) __THROW;
# endif