qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/unix/sysv/linux/ia64/has_cpuclock.c: Include not-cancel.h. 

(has_cpuclock): Use open_not_cancel_2 instead of open, read_not_cancel
	instead of read and close_not_cancel_no_status instead of close.
This commit is contained in:
Ulrich Drepper 2005-07-12 21:38:07 +00:00
parent d1abd625de
commit 9d653cd189
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2005-07-12 Jakub Jelinek <jakub@redhat.com> 2005-07-12 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/ia64/has_cpuclock.c: Include not-cancel.h.
(has_cpuclock): Use open_not_cancel_2 instead of open, read_not_cancel
instead of read and close_not_cancel_no_status instead of close.
* sysdeps/s390/s390-64/bcopy.S (__bcopy): Use * sysdeps/s390/s390-64/bcopy.S (__bcopy): Use
HIDDEN_BUILTIN_JUMPTARGET to jump to memmove. HIDDEN_BUILTIN_JUMPTARGET to jump to memmove.

12
sysdeps/unix/sysv/linux/ia64/has_cpuclock.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000, 2001, 2003, 2004 Free Software Foundation, Inc. /* Copyright (C) 2000, 2001, 2003, 2004, 2005 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
@ -21,7 +21,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <not-cancel.h>
static int itc_usable; static int itc_usable;
@ -31,18 +31,18 @@ has_cpuclock (void)
if (__builtin_expect (itc_usable == 0, 0)) if (__builtin_expect (itc_usable == 0, 0))
{ {
int newval = 1; int newval = 1;
int fd = open ("/proc/sal/itc_drift", O_RDONLY); int fd = open_not_cancel_2 ("/proc/sal/itc_drift", O_RDONLY);
if (__builtin_expect (fd != -1, 1)) if (__builtin_expect (fd != -1, 1))
{ {
char buf[16]; char buf[16];
/* We expect the file to contain a single digit followed by /* We expect the file to contain a single digit followed by
a newline. If the format changes we better not rely on a newline. If the format changes we better not rely on
the file content. */ the file content. */
if (read (fd, buf, sizeof buf) != 2 || buf[0] != '0' if (read_not_cancel (fd, buf, sizeof buf) != 2
|| buf[1] != '\n') || buf[0] != '0' || buf[1] != '\n')
newval = -1; newval = -1;
close (fd); close_not_cancel_no_status (fd);
} }
itc_usable = newval; itc_usable = newval;