This is the mail archive of the
libc-alpha@sourceware.cygnus.com
mailing list for the glibc project.
Re: __builtin_expect in catgets
- To: libc-alpha at sourceware dot cygnus dot com
- Subject: Re: __builtin_expect in catgets
- From: Bruno Haible <haible at ilog dot fr>
- Date: Tue, 2 May 2000 16:13:35 +0200 (MET DST)
- References: <200005021347.PAA28351@oberkampf.ilog.fr>
> We don't need to add checks against NULL.
OK, here is a revised patch.
2000-04-30 Bruno Haible <clisp.cons.org>
* catgets/open_catalog.c (__open_catalog): Use __builtin_expect where
appropriate. Handle possible __read error.
*** catgets/open_catalog.c.bak Mon Jan 31 15:50:44 2000
--- catgets/open_catalog.c Sun Apr 30 13:17:00 2000
***************
*** 50,56 ****
__libc_lock_lock (catalog->lock);
/* Check whether there was no other thread faster. */
! if (catalog->status != closed)
/* While we waited some other thread tried to open the catalog. */
goto unlock_return;
--- 50,56 ----
__libc_lock_lock (catalog->lock);
/* Check whether there was no other thread faster. */
! if (__builtin_expect (catalog->status != closed, 0))
/* While we waited some other thread tried to open the catalog. */
goto unlock_return;
***************
*** 60,66 ****
{
const char *run_nlspath = catalog->nlspath;
#define ENOUGH(n) \
! if (bufact + (n) >=bufmax) \
{ \
char *old_buf = buf; \
bufmax += 256 + (n); \
--- 60,66 ----
{
const char *run_nlspath = catalog->nlspath;
#define ENOUGH(n) \
! if (__builtin_expect (bufact + (n) >= bufmax, 0)) \
{ \
char *old_buf = buf; \
bufmax += 256 + (n); \
***************
*** 251,258 ****
{
size_t now = __read (fd, (((char *) &catalog->file_ptr)
+ (st.st_size - todo)), todo);
! if (now == 0)
{
free ((void *) catalog->file_ptr);
catalog->status = nonexisting;
goto close_unlock_return;
--- 251,262 ----
{
size_t now = __read (fd, (((char *) &catalog->file_ptr)
+ (st.st_size - todo)), todo);
! if (now == 0 || now == (size_t) -1)
{
+ #ifdef EINTR
+ if (now == (size_t) -1 && errno == EINTR)
+ continue;
+ #endif
free ((void *) catalog->file_ptr);
catalog->status = nonexisting;
goto close_unlock_return;