From 0568edf3f7bd5d9ced21765c4cbcc3c053eefadd Mon Sep 17 00:00:00 2001
From: didg <didg>
Date: Sun, 18 Oct 2009 19:02:43 +0000
Subject: [PATCH] use pselect and no timeout in cnid_metad

---
 etc/cnid_dbd/cnid_metad.c | 45 +++++++++++++++++++++++++++++++++------
 etc/cnid_dbd/usockfd.c    | 10 ++++-----
 etc/cnid_dbd/usockfd.h    |  4 ++--
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/etc/cnid_dbd/cnid_metad.c b/etc/cnid_dbd/cnid_metad.c
index 51eed6c2..236e00de 100644
--- a/etc/cnid_dbd/cnid_metad.c
+++ b/etc/cnid_dbd/cnid_metad.c
@@ -1,5 +1,5 @@
 /*
- * $Id: cnid_metad.c,v 1.17 2009-10-18 18:25:13 didg Exp $
+ * $Id: cnid_metad.c,v 1.18 2009-10-18 19:02:43 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -108,6 +108,7 @@
 static int srvfd;
 static int rqstfd;
 static volatile sig_atomic_t alarmed = 0;
+static volatile sig_atomic_t sigchild = 0;
 
 #define MAXSPAWN   3                   /* Max times respawned in.. */
 #define TESTTIME   42                  /* this much seconds apfd client tries to  *
@@ -384,6 +385,33 @@ static void catch_alarm(int sig _U_) {
     alarmed = 1;
 }
 
+static void catch_child(int sig _U_) 
+{
+    sigchild = 1;
+}
+
+/* ----------------------- */
+static void set_signal(void)
+{
+    struct sigaction sv;
+    sigset_t set;
+
+    signal(SIGPIPE, SIG_IGN);
+    signal(SIGALRM, catch_alarm);
+
+    sv.sa_handler = catch_child;
+    sv.sa_flags = SA_NOCLDSTOP;
+    sigemptyset(&sv.sa_mask);
+    if (sigaction(SIGCHLD, &sv, NULL) < 0) {
+        LOG(log_error, logtype_cnid, "cnid_metad: sigaction: %s", strerror(errno));
+        exit(1);
+    }
+    /* block everywhere but in pselect */
+    sigemptyset(&set);
+    sigaddset(&set, SIGCHLD);
+    sigprocmask(SIG_BLOCK, &set, NULL);
+}
+
 /* ------------------ */
 int main(int argc, char *argv[])
 {
@@ -404,6 +432,7 @@ int main(int argc, char *argv[])
     int    ret;
     char   *loglevel = NULL;
     char   *logfile  = NULL;
+    sigset_t set;
 
     set_processname("cnid_metad");
 
@@ -512,13 +541,16 @@ int main(int argc, char *argv[])
         }
     }
 
-    signal(SIGPIPE, SIG_IGN);
-    signal(SIGALRM, catch_alarm);
+    set_signal();
+
+    sigemptyset(&set);
+    sigprocmask(SIG_SETMASK, NULL, &set);
+    sigdelset(&set, SIGCHLD);
 
     while (1) {
-        rqstfd = usockfd_check(srvfd, 10000000);
+        rqstfd = usockfd_check(srvfd, &set);
         /* Collect zombie processes and log what happened to them */
-        while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
+        if (sigchild) while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
             for (i = 0; i < MAXVOLS; i++) {
                 if (srv[i].pid == pid) {
                     srv[i].pid = 0;
@@ -534,8 +566,7 @@ int main(int argc, char *argv[])
                 LOG(log_info, logtype_cnid, "cnid_dbd pid %i exited with signal %i",
                     pid, WTERMSIG(status));
             }
-            /* FIXME should */
-
+            sigchild = 0;
         }
         if (rqstfd <= 0)
             continue;
diff --git a/etc/cnid_dbd/usockfd.c b/etc/cnid_dbd/usockfd.c
index 37de33b4..b6bbe6d3 100644
--- a/etc/cnid_dbd/usockfd.c
+++ b/etc/cnid_dbd/usockfd.c
@@ -1,5 +1,5 @@
 /*
- * $Id: usockfd.c,v 1.3 2005-05-03 14:55:11 didg Exp $
+ * $Id: usockfd.c,v 1.4 2009-10-18 19:02:43 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -33,6 +33,7 @@
 #include <atalk/logger.h>
 #include "usockfd.h"
 
+#include <sys/select.h>
 
 int usockfd_create(char *usock_fn, mode_t mode, int backlog)
 {
@@ -138,20 +139,17 @@ int tsockfd_create(char *host, u_int16_t ipport, int backlog)
 }
 
 /* --------------------- */
-int usockfd_check(int sockfd, unsigned long ndelay)
+int usockfd_check(int sockfd, const sigset_t *sigset)
 {
     int fd;
     socklen_t size;
     fd_set readfds;
-    struct timeval tv;
     int ret;
      
     FD_ZERO(&readfds);
     FD_SET(sockfd, &readfds);
 
-    tv.tv_usec = ndelay % 1000000;
-    tv.tv_sec  = ndelay / 1000000;
-    if ((ret = select(sockfd + 1, &readfds, NULL, NULL, &tv)) < 0) {
+    if ((ret = pselect(sockfd + 1, &readfds, NULL, NULL, NULL, sigset)) < 0) {
         if (errno == EINTR)
             return 0;
         LOG(log_error, logtype_cnid, "error in select: %s",
diff --git a/etc/cnid_dbd/usockfd.h b/etc/cnid_dbd/usockfd.h
index dd14aa96..622282e7 100644
--- a/etc/cnid_dbd/usockfd.h
+++ b/etc/cnid_dbd/usockfd.h
@@ -1,5 +1,5 @@
 /*
- * $Id: usockfd.h,v 1.3 2009-10-13 22:55:37 didg Exp $
+ * $Id: usockfd.h,v 1.4 2009-10-18 19:02:43 didg Exp $
  *
  * Copyright (C) Joerg Lenneis 2003
  * All Rights Reserved.  See COPYING.
@@ -15,7 +15,7 @@
 
 extern int      usockfd_create  (char *, mode_t, int);
 extern int      tsockfd_create  (char *, u_int16_t, int);
-extern int      usockfd_check   (int, unsigned long);
+extern int      usockfd_check   (int, const sigset_t *);
 
 #ifndef OSSH_ALIGNBYTES
 #define OSSH_ALIGNBYTES (sizeof(int) - 1)
-- 
2.39.2