lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

* sysdeps/unix/sysv/linux/adjtime.c: Use ADJ_OFFSET_SS_READ if

Browse Source 
possible.
	* sysdeps/unix/sysv/linux/kernel-features.h
	(__ASSUME_ADJ_OFFSET_SS_READ): Define for 2.6.24.
	* sysdeps/unix/sysv/linux/sys/timex.h (ADJ_OFFSET_SS_READ): Define.
This commit is contained in:
Ulrich Drepper
2007-12-10 23:51:42 +00:00
parent b4354cf420
commit ae18718f58
4 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-12-10 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/adjtime.c: Use ADJ_OFFSET_SS_READ if
possible.
* sysdeps/unix/sysv/linux/kernel-features.h
(__ASSUME_ADJ_OFFSET_SS_READ): Define for 2.6.24.
* sysdeps/unix/sysv/linux/sys/timex.h (ADJ_OFFSET_SS_READ): Define.
2007-12-08 Ulrich Drepper <drepper@redhat.com> 2007-12-08 Ulrich Drepper <drepper@redhat.com>
[BZ #5424] [BZ #5424]

24
sysdeps/unix/sysv/linux/adjtime.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004 /* Copyright (C) 1995, 1996, 1997, 1998, 2002, 2004, 2007
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -22,6 +22,8 @@
#include <sys/time.h> #include <sys/time.h>
#include <sys/timex.h> #include <sys/timex.h>
#include <kernel-features.h>
#define MAX_SEC (INT_MAX / 1000000L - 2) #define MAX_SEC (INT_MAX / 1000000L - 2)
#define MIN_SEC (INT_MIN / 1000000L + 2) #define MIN_SEC (INT_MIN / 1000000L + 2)
@ -69,13 +71,29 @@ ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv)
return -1; return -1;
} }
tntx.offset = tmp.tv_usec + tmp.tv_sec * 1000000L; tntx.offset = tmp.tv_usec + tmp.tv_sec * 1000000L;
#ifdef ADJ_OFFSET_SS_READ
tntx.modes = ADJ_OFFSET_SS_READ;
#else
tntx.modes = ADJ_OFFSET_SINGLESHOT; tntx.modes = ADJ_OFFSET_SINGLESHOT;
#endif
} }
else else
tntx.modes = 0; tntx.modes = 0;
if (ADJTIMEX (&tntx) < 0) #if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ
return -1; again:
#endif
if (__builtin_expect (ADJTIMEX (&tntx) < 0, 0))
{
#if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ
if (itv && errno == EINVAL && tntx.modes == ADJ_OFFSET_SS_READ)
{
tntx.modes = ADJ_OFFSET_SINGLESHOT;
goto again;
}
#endif
return -1;
}
if (otv) if (otv)
{ {

5
sysdeps/unix/sysv/linux/kernel-features.h
View File

@ -487,3 +487,8 @@
|| (__LINUX_KERNEL_VERSION >= 0x020618 && defined __s390__)) || (__LINUX_KERNEL_VERSION >= 0x020618 && defined __s390__))
# define __ASSUME_FALLOCATE 1 # define __ASSUME_FALLOCATE 1
#endif #endif
/* Support for ADJ_OFFSET_SS_READ was added in 2.6.24. */
#if __LINUX_KERNEL_VERSION >= 0x020618
# define __ASSUME_ADJ_OFFSET_SS_READ 1
#endif

3
sysdeps/unix/sysv/linux/sys/timex.h
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1995, 1996, 1997, 1999 Free Software Foundation, Inc. /* Copyright (C) 1995, 1996, 1997, 1999, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -69,6 +69,7 @@ struct timex
#define ADJ_TIMECONST 0x0020 /* pll time constant */ #define ADJ_TIMECONST 0x0020 /* pll time constant */
#define ADJ_TICK 0x4000 /* tick value */ #define ADJ_TICK 0x4000 /* tick value */
#define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */ #define ADJ_OFFSET_SINGLESHOT 0x8001 /* old-fashioned adjtime */
#define ADJ_OFFSET_SS_READ 0xa001 /* read-only adjtime */
/* xntp 3.4 compatibility names */ /* xntp 3.4 compatibility names */
#define MOD_OFFSET ADJ_OFFSET #define MOD_OFFSET ADJ_OFFSET