Update.

2003-08-13  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/i386/syscalls.list: Add time syscall.

	* elf/Makefile: Use LC_ALL=C in a few cases where we call external
	text processing tools.

	* sysdeps/pthread/aio_misc.h (struct waitlist): Don't add caller_pid
	element unless BROKEN_THREAD_SIGNALS is defined.
	(struct requestlist): Likewise.
	* sysdeps/pthread/aio_misc.c (__aio_enqueue_request): Don't fill in
	caller_pid of new request unless BROKEN_THREAD_SIGNALS is defined.
	* sysdeps/pthread/aio_suspend.c (aio_suspend): Likewise.
	* sysdeps/pthread/aio_notify.c (__aio_notify_only): Remove caller_pid
	parameter unless BROKEN_THREAD_SIGNALS is defined.  Adjust callers.
	Pass current PID to __aio_sigqueue.
	* sysdeps/pthread/lio_listio.c (lio_listio): Adjust __aio_notify_only
	call.  Don't initialize caller_pid field of waitlist element.

5 files changed, 46 insertions, 3 deletions

diff --git a/sysdeps/pthread/aio_misc.c b/sysdeps/pthread/aio_misc.c
index 78cf764837..c2eb674212 100644
--- a/sysdeps/pthread/aio_misc.c
+++ b/sysdeps/pthread/aio_misc.c
@@ -1,5 +1,5 @@
 /* Handle general operations.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1997,1998,1999,2000,2001,2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -328,8 +328,10 @@ __aio_enqueue_request (aiocb_union *aiocbp, int operation)
       return NULL;
     }
   newp->aiocbp = aiocbp;
+#ifdef BROKEN_THREAD_SIGNALS
   newp->caller_pid = (aiocbp->aiocb.aio_sigevent.sigev_notify == SIGEV_SIGNAL
 		      ? getpid () : 0);
+#endif
   newp->waiting = NULL;
 
   aiocbp->aiocb.__abs_prio = prio;
diff --git a/sysdeps/pthread/aio_misc.h b/sysdeps/pthread/aio_misc.h
index 05e60e7d1e..44d53b078f 100644
--- a/sysdeps/pthread/aio_misc.h
+++ b/sysdeps/pthread/aio_misc.h
@@ -50,9 +50,11 @@ struct waitlist
     volatile int *counterp;
     /* The next field is used in asynchronous `lio_listio' operations.  */
     struct sigevent *sigevp;
+#ifdef BROKEN_THREAD_SIGNALS
     /* XXX See requestlist, it's used to work around the broken signal
        handling in Linux.  */
     pid_t caller_pid;
+#endif
   };
 
 
@@ -80,9 +82,11 @@ struct requestlist
     /* Pointer to the actual data.  */
     aiocb_union *aiocbp;
 
+#ifdef BROKEN_THREAD_SIGNALS
     /* PID of the initiator thread.
        XXX This is only necessary for the broken signal handling on Linux.  */
     pid_t caller_pid;
+#endif
 
     /* List of waiting processes.  */
     struct waitlist *waiting;
@@ -120,8 +124,13 @@ extern void __aio_notify (struct requestlist *req)
      attribute_hidden internal_function;
 
 /* Notify initiator of request.  */
+#ifdef BROKEN_THREAD_SIGNALS
 extern int __aio_notify_only (struct sigevent *sigev, pid_t caller_pid)
      attribute_hidden internal_function;
+#else
+extern int __aio_notify_only (struct sigevent *sigev)
+     attribute_hidden internal_function;
+#endif
 
 /* Send the signal.  */
 extern int __aio_sigqueue (int sig, const union sigval val, pid_t caller_pid)
diff --git a/sysdeps/pthread/aio_notify.c b/sysdeps/pthread/aio_notify.c
index 047b6314a0..d1c0a63fbf 100644
--- a/sysdeps/pthread/aio_notify.c
+++ b/sysdeps/pthread/aio_notify.c
@@ -1,5 +1,5 @@
 /* Notify initiator of AIO request.
-   Copyright (C) 1997,98,99,2000,01 Free Software Foundation, Inc.
+   Copyright (C) 1997,98,99,2000,2001,2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -45,12 +45,16 @@ notify_func_wrapper (void *arg)
 
 int
 internal_function
+#ifdef BROKEN_THREAD_SIGNALS
 __aio_notify_only (struct sigevent *sigev, pid_t caller_pid)
+#else
+__aio_notify_only (struct sigevent *sigev)
+#endif
 {
   int result = 0;
 
   /* Send the signal to notify about finished processing of the request.  */
-  if (sigev->sigev_notify == SIGEV_THREAD)
+  if (__builtin_expect (sigev->sigev_notify == SIGEV_THREAD, 0))
     {
       /* We have to start a thread.  */
       pthread_t tid;
@@ -91,9 +95,15 @@ __aio_notify_only (struct sigevent *sigev, pid_t caller_pid)
 #if _POSIX_REALTIME_SIGNALS
       /* Note that the standard gives us the option of using a plain
 	 non-queuing signal here when SA_SIGINFO is not set for the signal.  */
+# ifdef BROKEN_THREAD_SIGNALS
       if (__aio_sigqueue (sigev->sigev_signo, sigev->sigev_value, caller_pid)
 	  < 0)
 	result = -1;
+# else
+      if (__aio_sigqueue (sigev->sigev_signo, sigev->sigev_value, getpid ())
+	  < 0)
+	result = -1;
+# endif
 #else
       /* There are no queued signals on this system at all.  */
       result = raise (sigev->sigev_signo);
@@ -111,7 +121,11 @@ __aio_notify (struct requestlist *req)
   struct waitlist *waitlist;
   struct aiocb *aiocbp = &req->aiocbp->aiocb;
 
+#ifdef BROKEN_THREAD_SIGNALS
   if (__aio_notify_only (&aiocbp->aio_sigevent, req->caller_pid) != 0)
+#else
+  if (__aio_notify_only (&aiocbp->aio_sigevent) != 0)
+#endif
     {
       /* XXX What shall we do if already an error is set by
 	 read/write/fsync?  */
@@ -135,7 +149,11 @@ __aio_notify (struct requestlist *req)
 	   this request is the last one, send the signal.  */
 	if (*waitlist->counterp == 0)
 	  {
+#ifdef BROKEN_THREAD_SIGNALS
 	    __aio_notify_only (waitlist->sigevp, waitlist->caller_pid);
+#else
+	    __aio_notify_only (waitlist->sigevp);
+#endif
 	    /* This is tricky.  See lio_listio.c for the reason why
 	       this works.  */
 	    free ((void *) waitlist->counterp);
diff --git a/sysdeps/pthread/aio_suspend.c b/sysdeps/pthread/aio_suspend.c
index 8bc8f0e9a1..207dad964e 100644
--- a/sysdeps/pthread/aio_suspend.c
+++ b/sysdeps/pthread/aio_suspend.c
@@ -115,7 +115,9 @@ aio_suspend (list, nent, timeout)
 		waitlist[cnt].next = requestlist[cnt]->waiting;
 		waitlist[cnt].counterp = &dummy;
 		waitlist[cnt].sigevp = NULL;
+#ifdef BROKEN_THREAD_SIGNALS
 		waitlist[cnt].caller_pid = 0;	/* Not needed.  */
+#endif
 		requestlist[cnt]->waiting = &waitlist[cnt];
 		any = true;
 	      }
diff --git a/sysdeps/pthread/lio_listio.c b/sysdeps/pthread/lio_listio.c
index 0ea3d92414..5b98837b0d 100644
--- a/sysdeps/pthread/lio_listio.c
+++ b/sysdeps/pthread/lio_listio.c
@@ -100,8 +100,14 @@ lio_listio (mode, list, nent, sig)
       pthread_mutex_unlock (&__aio_requests_mutex);
 
       if (mode == LIO_NOWAIT)
+	{
+#ifdef BROKEN_THREAD_SIGNALS
 	__aio_notify_only (sig,
 			   sig->sigev_notify == SIGEV_SIGNAL ? getpid () : 0);
+#else
+	__aio_notify_only (sig);
+#endif
+	}
 
       return result;
     }
@@ -122,7 +128,9 @@ lio_listio (mode, list, nent, sig)
 	      waitlist[cnt].next = requests[cnt]->waiting;
 	      waitlist[cnt].counterp = &total;
 	      waitlist[cnt].sigevp = NULL;
+#ifdef BROKEN_THREAD_SIGNALS
 	      waitlist[cnt].caller_pid = 0;	/* Not needed.  */
+#endif
 	      requests[cnt]->waiting = &waitlist[cnt];
 	      ++total;
 	    }
@@ -159,7 +167,9 @@ lio_listio (mode, list, nent, sig)
 	}
       else
 	{
+#ifdef BROKEN_THREAD_SIGNALS
 	  pid_t caller_pid = sig->sigev_notify == SIGEV_SIGNAL ? getpid () : 0;
+#endif
 	  total = 0;
 
 	  for (cnt = 0; cnt < nent; ++cnt)
@@ -173,7 +183,9 @@ lio_listio (mode, list, nent, sig)
 		  waitlist->list[cnt].next = requests[cnt]->waiting;
 		  waitlist->list[cnt].counterp = &waitlist->counter;
 		  waitlist->list[cnt].sigevp = &waitlist->sigev;
+#ifdef BROKEN_THREAD_SIGNALS
 		  waitlist->list[cnt].caller_pid = caller_pid;
+#endif
 		  requests[cnt]->waiting = &waitlist->list[cnt];
 		  ++total;
 		}