* [PATCH] Kill 3 PLT slots on ia64
@ 2005-07-12 21:28 Jakub Jelinek
0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2005-07-12 21:28 UTC (permalink / raw)
To: Ulrich Drepper; +Cc: Glibc hackers
Hi!
Kills unnecessary
0000000000263aa0 0000059900000081 R_IA64_IPLTLSB 000000000017c840 read + 0
0000000000263af0 000008b000000081 R_IA64_IPLTLSB 000000000017c460 open + 0
0000000000263b00 0000093700000081 R_IA64_IPLTLSB 000000000017c740 close + 0
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.
--- libc/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c.jj 2004-10-04 21:20:51.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/ia64/has_cpuclock.c 2005-07-12 23:25:37.000000000 +0200
@@ -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.
The GNU C Library is free software; you can redistribute it and/or
@@ -21,7 +21,7 @@
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
-
+#include <not-cancel.h>
static int itc_usable;
@@ -31,18 +31,18 @@ has_cpuclock (void)
if (__builtin_expect (itc_usable == 0, 0))
{
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))
{
char buf[16];
/* We expect the file to contain a single digit followed by
a newline. If the format changes we better not rely on
the file content. */
- if (read (fd, buf, sizeof buf) != 2 || buf[0] != '0'
- || buf[1] != '\n')
+ if (read_not_cancel (fd, buf, sizeof buf) != 2
+ || buf[0] != '0' || buf[1] != '\n')
newval = -1;
- close (fd);
+ close_not_cancel_no_status (fd);
}
itc_usable = newval;
Jakub
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-07-12 21:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-07-12 21:28 [PATCH] Kill 3 PLT slots on ia64 Jakub Jelinek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).