From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-8496-listarch-libc-hacker=sources.redhat.com@sources.redhat.com>
Received: (qmail 12005 invoked by alias); 12 Jul 2005 21:28:30 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 11989 invoked by uid 22791); 12 Jul 2005 21:28:30 -0000
Received: from sunsite.ms.mff.cuni.cz (HELO sunsite.mff.cuni.cz) (195.113.15.26)
    by sourceware.org (qpsmtpd/0.30-dev) with ESMTP; Tue, 12 Jul 2005 21:28:30 +0000
Received: from sunsite.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.mff.cuni.cz (8.13.1/8.13.1) with ESMTP id j6CLSQnL001561;
	Tue, 12 Jul 2005 23:28:26 +0200
Received: (from jakub@localhost)
	by sunsite.mff.cuni.cz (8.13.1/8.13.1/Submit) id j6CLSQYe001560;
	Tue, 12 Jul 2005 23:28:26 +0200
Date: Tue, 12 Jul 2005 21:28:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Kill 3 PLT slots on ia64
Message-ID: <20050712212826.GR4740@sunsite.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
X-SW-Source: 2005-07/txt/msg00014.txt.bz2

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