Fix yaz-marcdump segfault YAZ-801

[yaz-moved-to-github.git] / src / eventl.c

diff --git a/src/eventl.c b/src/eventl.c
index 6146138..be79cf3 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -1,10 +1,7 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
- *
- * $Id: eventl.c,v 1.16 2007-11-12 08:41:56 adam Exp $
  */
-
 /**
  * \file eventl.c
  * \brief Implements event loop handling for GFS.
@@ -12,6 +9,9 @@
  * This source implements the main event loop for the Generic Frontend
  * Server.
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <assert.h>
 #include <errno.h>
@@ -31,6 +31,7 @@
 #include <yaz/log.h>
 #include <yaz/comstack.h>
 #include <yaz/xmalloc.h>
+#include <yaz/errno.h>
 #include "eventl.h"
 #include "session.h"
 #include <yaz/statserv.h>
@@ -77,7 +78,7 @@ int iochan_is_alive(IOCHAN chan)
     return 1;
 }
 
-int iochan_event_loop(IOCHAN *iochans)
+int iochan_event_loop(IOCHAN *iochans, int *watch_sig)
 {
     do /* loop as long as there are active associations to process */
     {
@@ -89,28 +90,23 @@ int iochan_event_loop(IOCHAN *iochans)
         int res;
         time_t now = time(0);
 
-        if (statserv_must_terminate())
-        {
-            for (p = *iochans; p; p = p->next)
-                p->force_event = EVENT_TIMEOUT;
-        }
         for (p = *iochans; p; p = p->next)
             no_fds++;
-        fds = xmalloc(no_fds * sizeof(*fds));
+        fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds));
         for (i = 0, p = *iochans; p; p = p->next, i++)
         {
             time_t w, ftime;
-            enum yaz_poll_mask input_mask = 0;
+            enum yaz_poll_mask input_mask = yaz_poll_none;
             yaz_log(log_level, "fd=%d flags=%d force_event=%d",
                     p->fd, p->flags, p->force_event);
             if (p->force_event)
                 tv_sec = 0;          /* polling select */
             if (p->flags & EVENT_INPUT)
-                input_mask += yaz_poll_read;
+                yaz_poll_add(input_mask, yaz_poll_read);
             if (p->flags & EVENT_OUTPUT)
-                input_mask += yaz_poll_write;
+                yaz_poll_add(input_mask, yaz_poll_write);
             if (p->flags & EVENT_EXCEPT)
-                input_mask += yaz_poll_except;
+                yaz_poll_add(input_mask, yaz_poll_except);
             if (p->max_idle && p->last_event)
             {
                 ftime = p->last_event + p->max_idle;
@@ -118,8 +114,9 @@ int iochan_event_loop(IOCHAN *iochans)
                     w = p->max_idle;
                 else
                     w = ftime - now;
+                /* tv_sec will be minimum wait.. */
                 if (w < tv_sec)
-                    tv_sec = w;
+                    tv_sec = (int) w; /* can hold it because w < tv_sec */
             }
             fds[i].fd = p->fd;
             fds[i].input_mask = input_mask;
@@ -129,25 +126,16 @@ int iochan_event_loop(IOCHAN *iochans)
         {
             if (yaz_errno() == EINTR)
             {
-                if (statserv_must_terminate())
-                {
-                    for (p = *iochans; p; p = p->next)
-                        p->force_event = EVENT_TIMEOUT;
-                }
                 xfree(fds);
+                if (watch_sig && *watch_sig)
+                    break;
                 continue;
             }
             else
             {
-                /* Destroy the first member in the chain, and try again */
-                association *assoc = (association *)iochan_getdata(*iochans);
-                COMSTACK conn = assoc->client_link;
-
-                cs_close(conn);
-                destroy_association(assoc);
-                iochan_destroy(*iochans);
-                yaz_log(log_level, "error select, destroying iochan %p",
-                        *iochans);
+                yaz_log(YLOG_WARN|YLOG_ERRNO, "yaz_poll");
+                xfree(fds);
+                continue;
             }
         }
         now = time(0);
@@ -217,6 +205,7 @@ int iochan_event_loop(IOCHAN *iochans)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab