X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=src%2Fpoll.c;h=25075ed8dbf061850801f346e220a83f7b4e8bf9;hp=03f153a0b3849612a0b427ee7d5b1063c794f3c7;hb=0ea82d760348fe9153dfd2adc10335a50f59628b;hpb=620c146da30a20c2d9a6c572fdd0540558039d0e

diff --git a/src/poll.c b/src/poll.c
index 03f153a..25075ed 100644
--- a/src/poll.c
+++ b/src/poll.c
@@ -3,7 +3,11 @@
  * - wrappers for poll(2)
  */
 /*
- *  This file is part of adns, which is Copyright (C) 1997-1999 Ian Jackson
+ *  This file is part of adns, which is
+ *    Copyright (C) 1997-2000,2003,2006  Ian Jackson
+ *    Copyright (C) 1999-2000,2003,2006  Tony Finch
+ *    Copyright (C) 1991 Massachusetts Institute of Technology
+ *  (See the file INSTALL for full details.)
  *  
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -21,40 +25,45 @@
  */
 
 #include <limits.h>
+#include <string.h>
 
 #include "internal.h"
 
 #ifdef HAVE_POLL
 
-int adns_beforepoll(adns_state ads, struct pollfd *fds, int *nfds_io, int *timeout_io,
-		    const struct timeval *now) {
+int adns_beforepoll(adns_state ads, struct pollfd *fds, int *nfds_io,
+		    int *timeout_io, const struct timeval *now) {
   struct timeval tv_nowbuf, tv_tobuf, *tv_to;
-  int space, found, timeout_ms;
+  int space, found, timeout_ms, r;
   struct pollfd fds_tmp[MAX_POLLFDS];
 
-  adns__must_gettimeofday(ads,&now,&tv_nowbuf);
-  if (!now) { *nfds_io= 0; return 0; }
+  adns__consistency(ads,0,cc_entex);
 
-  timeout_ms= *timeout_io;
-  if (timeout_ms == -1) {
-    tv_to= 0;
-  } else {
-    tv_tobuf.tv_sec= timeout_ms / 1000;
-    tv_tobuf.tv_usec= (timeout_ms % 1000)*1000;
-    tv_to= &tv_tobuf;
-  }
+  if (timeout_io) {
+    adns__must_gettimeofday(ads,&now,&tv_nowbuf);
+    if (!now) { *nfds_io= 0; r= 0; goto xit; }
 
-  adns__timeouts(ads, 1, &tv_to,&tv_tobuf, *now);
+    timeout_ms= *timeout_io;
+    if (timeout_ms == -1) {
+      tv_to= 0;
+    } else {
+      tv_tobuf.tv_sec= timeout_ms / 1000;
+      tv_tobuf.tv_usec= (timeout_ms % 1000)*1000;
+      tv_to= &tv_tobuf;
+    }
 
-  if (tv_to) {
-    assert(tv_to == &tv_tobuf);
-    timeout_ms= (tv_tobuf.tv_usec+999)/1000;
-    assert(tv_tobuf.tv_sec < (INT_MAX-timeout_ms)/1000);
-    timeout_ms += tv_tobuf.tv_sec*1000;
-  } else {
-    timeout_ms= -1;
+    adns__timeouts(ads, 0, &tv_to,&tv_tobuf, *now);
+
+    if (tv_to) {
+      assert(tv_to == &tv_tobuf);
+      timeout_ms= (tv_tobuf.tv_usec+999)/1000;
+      assert(tv_tobuf.tv_sec < (INT_MAX-timeout_ms)/1000);
+      timeout_ms += tv_tobuf.tv_sec*1000;
+    } else {
+      timeout_ms= -1;
+    }
+    *timeout_io= timeout_ms;
   }
-  *timeout_io= timeout_ms;
   
   space= *nfds_io;
   if (space >= MAX_POLLFDS) {
@@ -63,21 +72,59 @@ int adns_beforepoll(adns_state ads, struct pollfd *fds, int *nfds_io, int *timeo
   } else {
     found= adns__pollfds(ads,fds_tmp);
     *nfds_io= found;
-    if (found < space) return space ? ERANGE : 0;
+    if (space < found) { r= ERANGE; goto xit; }
     memcpy(fds,fds_tmp,sizeof(struct pollfd)*found);
   }
-  return 0;
+  r= 0;
+xit:
+  adns__consistency(ads,0,cc_entex);
+  return r;
 }
 
 void adns_afterpoll(adns_state ads, const struct pollfd *fds, int nfds,
 		    const struct timeval *now) {
   struct timeval tv_buf;
 
+  adns__consistency(ads,0,cc_entex);
   adns__must_gettimeofday(ads,&now,&tv_buf);
-  if (!now) return;
+  if (now) {
+    adns__timeouts(ads, 1, 0,0, *now);
+    adns__fdevents(ads, fds,nfds, 0,0,0,0, *now,0);
+  }
+  adns__consistency(ads,0,cc_entex);
+}
+
+int adns_wait_poll(adns_state ads,
+		   adns_query *query_io,
+		   adns_answer **answer_r,
+		   void **context_r) {
+  int r, nfds, to;
+  struct pollfd fds[MAX_POLLFDS];
+  
+  adns__consistency(ads,0,cc_entex);
+
+  for (;;) {
+    r= adns__internal_check(ads,query_io,answer_r,context_r);
+    if (r != EAGAIN) goto xit;
+    nfds= MAX_POLLFDS; to= -1;
+    adns_beforepoll(ads,fds,&nfds,&to,0);
+    r= poll(fds,nfds,to);
+    if (r == -1) {
+      if (errno == EINTR) {
+	if (ads->iflags & adns_if_eintr) { r= EINTR; goto xit; }
+      } else {
+	adns__diag(ads,-1,0,"poll failed in wait: %s",strerror(errno));
+	adns_globalsystemfailure(ads);
+      }
+    } else {
+      assert(r >= 0);
+      adns_afterpoll(ads,fds,nfds,0);
+    }
+  }
 
-  adns__timeouts(ads,1, 0,0, *now);
-  adns__fdevents(ads, fds,nfds, 0,0,0,0, *now,0);
+ xit:
+  adns__consistency(ads,0,cc_entex);
+  return r;
 }
 
 #endif