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

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.
This file is part of the GNU C Library.
@ -22,6 +22,8 @@
#include <sys/time.h>
#include <sys/timex.h>
#include <kernel-features.h>
#define MAX_SEC (INT_MAX / 1000000L - 2)
#define MIN_SEC (INT_MIN / 1000000L + 2)
@ -69,13 +71,29 @@ ADJTIME (const struct TIMEVAL *itv, struct TIMEVAL *otv)
return -1;
}
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;
#endif
}
else
tntx.modes = 0;
if (ADJTIMEX (&tntx) < 0)
return -1;
#if defined ADJ_OFFSET_SS_READ && !defined __ASSUME_ADJ_OFFSET_SS_READ
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)
{