summary refs log tree commit diff
path: root/resolv/getaddrinfo_a.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-03 08:17:20 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-03 08:17:20 +0000
commitf1762c0c4b3ba91073f82da02a16d8ee29ed7444 (patch)
treedd3ed0e40f1cb6a2560dfba1fd300cfe98be28ba /resolv/getaddrinfo_a.c
parent6eab4ee54b5ae38e6243a7bb419061d8d0fa216e (diff)
downloadglibc-f1762c0c4b3ba91073f82da02a16d8ee29ed7444.tar.gz
glibc-f1762c0c4b3ba91073f82da02a16d8ee29ed7444.tar.xz
glibc-f1762c0c4b3ba91073f82da02a16d8ee29ed7444.zip
[BZ #2978]
2006-08-03  Ulrich Drepper  <drepper@redhat.com>
	* rt/Makefile (tests): Add tst-clock2.
	* rt/tst-clock2.c: New file.

	[BZ #2978]
	* resolv/gai_notify.c (__gai_notify_only): Copy memory for thread
	function and its parameters and pass it to new thread.
	(__gai_notify): Add support for alternative waiting for completion.
	* resolv/gai_suspend.c (gai_suspend): Add support for alternative
	waiting for completion.
	* resolv/getaddrinfo_a.c: Likewise.
	* resolv/gai_misc.h (struct waitlist): Don't add cond if alternative
	waiting for completion is used.
	* resolv/gai_misc.c: Allow overwriting code to start helper thread.
	* resolv/gai_cancel.c: Include <gai_misc.h> not "gai_misc.h".
	* resolv/gai_error.c: Likewise.
	* resolv/gai_sigqueue.c: Likewise.

	* hurd/getdport.c (__detdport): Don't return EBADF; instead set
	errno to EBADF and return MACH_PORT_NULL.
	* posix/Makefile (CFLAGS-waitid.c): Add -fasynchronous-unwind-tables.
Diffstat (limited to 'resolv/getaddrinfo_a.c')
-rw-r--r--resolv/getaddrinfo_a.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/resolv/getaddrinfo_a.c b/resolv/getaddrinfo_a.c
index abac27d361..f6af3aa45a 100644
--- a/resolv/getaddrinfo_a.c
+++ b/resolv/getaddrinfo_a.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2006 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@redhat.com>, 2001.
 
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#include "gai_misc.h"
+#include <gai_misc.h>
 
 
 /* We need this special structure to handle asynchronous I/O.  */
@@ -96,7 +96,9 @@ getaddrinfo_a (int mode, struct gaicb *list[], int ent, struct sigevent *sig)
     }
   else if (mode == GAI_WAIT)
     {
+#ifndef DONT_NEED_GAI_MISC_COND
       pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+#endif
       struct waitlist waitlist[ent];
       int oldstate;
 
@@ -104,7 +106,9 @@ getaddrinfo_a (int mode, struct gaicb *list[], int ent, struct sigevent *sig)
       for (cnt = 0; cnt < ent; ++cnt)
 	if (requests[cnt] != NULL)
 	  {
+#ifndef DONT_NEED_GAI_MISC_COND
 	    waitlist[cnt].cond = &cond;
+#endif
 	    waitlist[cnt].next = requests[cnt]->waiting;
 	    waitlist[cnt].counterp = &total;
 	    waitlist[cnt].sigevp = NULL;
@@ -119,15 +123,24 @@ getaddrinfo_a (int mode, struct gaicb *list[], int ent, struct sigevent *sig)
       pthread_setcancelstate (PTHREAD_CANCEL_DISABLE, &oldstate);
 
       while (total > 0)
-	pthread_cond_wait (&cond, &__gai_requests_mutex);
+	{
+#ifdef DONT_NEED_GAI_MISC_COND
+	  int result;
+	  GAI_MISC_WAIT (result, total, NULL, 1);
+#else
+	  pthread_cond_wait (&cond, &__gai_requests_mutex);
+#endif
+	}
 
       /* Now it's time to restore the cancelation state.  */
       pthread_setcancelstate (oldstate, NULL);
 
+#ifndef DONT_NEED_GAI_MISC_COND
       /* Release the conditional variable.  */
       if (pthread_cond_destroy (&cond) != 0)
 	/* This must never happen.  */
 	abort ();
+#endif
     }
   else
     {
@@ -147,7 +160,9 @@ getaddrinfo_a (int mode, struct gaicb *list[], int ent, struct sigevent *sig)
 	  for (cnt = 0; cnt < ent; ++cnt)
 	    if (requests[cnt] != NULL)
 	      {
+#ifndef DONT_NEED_GAI_MISC_COND
 		waitlist->list[cnt].cond = NULL;
+#endif
 		waitlist->list[cnt].next = requests[cnt]->waiting;
 		waitlist->list[cnt].counterp = &waitlist->counter;
 		waitlist->list[cnt].sigevp = &waitlist->sigev;