From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Nov 2016 17:54:02 +0000 (+0000)
Subject: regress: fuzzraw: Handle select and poll return value specially
X-Git-Tag: adns-1.6.0~58
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=817bb41e2d62e85c36e490c615466a276fc17d22;p=adns.git

regress: fuzzraw: Handle select and poll return value specially

Don't read or write it to the fuzzraw stream.  Instead, in hfuzzraw,
calculate it from the returned fd set (and check it's consistent with
the timeout).

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/regress/hfuzzraw.c.m4 b/regress/hfuzzraw.c.m4
index 6984c8b..3dad087 100644
--- a/regress/hfuzzraw.c.m4
+++ b/regress/hfuzzraw.c.m4
@@ -137,7 +137,7 @@ static int Pbytes(byte *buf, int maxlen) {
   return l;
 }
 
-static void Pfdset(fd_set *set, int max) {
+static void Pfdset(fd_set *set, int max, int *r_io) {
   uint16_t got;
   int fd, ngot=0;
 
@@ -148,7 +148,9 @@ static void Pfdset(fd_set *set, int max) {
       P_READ(got);
       ngot= 16;
     }
-    if (!(got & 1u)) {
+    if (got & 1u) {
+      (*r_io)++;
+    } else {
       FD_CLR(fd,set);
     }
     got >>= 1;
@@ -157,12 +159,14 @@ static void Pfdset(fd_set *set, int max) {
 }
 
 #ifdef HAVE_POLL
-static void Ppollfds(struct pollfd *fds, int nfds) {
-int fd;
+static void Ppollfds(struct pollfd *fds, int nfds, int *r_io) {
+  int fd;
   for (fd=0; fd<nfds; fd++) {
     if (!fds[fd].events) continue;
     P_fdf(fd);
     P_READ(fds[fd].revents);
+    if (fds[fd].revents)
+      (*r_io)++;
   }
 }
 #endif
@@ -221,6 +225,8 @@ int H$1(hm_args_massage($3,void)) {
  m4_define(`hm_rv_must',`
   r= 0;
  ')
+ m4_define(`hm_rv_select',`hm_rv_succfail')
+ m4_define(`hm_rv_poll',`hm_rv_succfail')
  m4_define(`hm_rv_fcntl',`
   unsigned flg = P_fdf(fd);
   if (cmd == F_GETFL) {
@@ -254,8 +260,8 @@ int H$1(hm_args_massage($3,void)) {
  $2
 
  hm_create_nothing
- m4_define(`hm_arg_fdset_io',`Pfdset($'`1,$'`2);')
- m4_define(`hm_arg_pollfds_io',`Ppollfds($'`1,$'`2);')
+ m4_define(`hm_arg_fdset_io',`Pfdset($'`1,$'`2,&r);')
+ m4_define(`hm_arg_pollfds_io',`Ppollfds($'`1,$'`2,&r);')
  m4_define(`hm_arg_addr_out',`Paddr($'`1,$'`2);')
  $3
 
@@ -263,6 +269,14 @@ int H$1(hm_args_massage($3,void)) {
  m4_define(`hm_arg_bytes_out',`r= Pbytes($'`2,$'`4);')
  $3
 
+ hm_create_nothing
+ m4_define(`hm_rv_selectpoll',`
+  if (($'`1) && !r) Pformat("select/poll returning 0 but infinite timeout");
+ ')
+ m4_define(`hm_rv_select',`hm_rv_selectpoll(!to)')
+ m4_define(`hm_rv_poll',`hm_rv_selectpoll(timeout<0)')
+ $2
+
  return r;
 }
 ')
diff --git a/regress/hplayback.c.m4 b/regress/hplayback.c.m4
index db50e4d..f6034cb 100644
--- a/regress/hplayback.c.m4
+++ b/regress/hplayback.c.m4
@@ -409,6 +409,8 @@ int H$1(hm_args_massage($3,void)) {
   FR_WRITE(r);
  ')
  m4_define(`hm_rv_fd',`hm_rv_any')
+ m4_define(`hm_rv_select',`hm_rv_any_nowrite')
+ m4_define(`hm_rv_poll',`hm_rv_any_nowrite')
  m4_define(`hm_rv_fcntl',`
   r= 0;
   if (cmd == F_GETFL) {