X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Feventl.c;h=f2608cd290edfd20df89a1fdf5f0e77c4007ad03;hb=3d99aecedf9d6e6ebeadcedbee081049b03dbbf8;hp=cc8a6b98c452f35ba5c5f142c8ff925dbcd2fd1a;hpb=235995289021a11b33312c91a55ccfbca605348b;p=pazpar2-moved-to-github.git

diff --git a/src/eventl.c b/src/eventl.c
index cc8a6b9..f2608cd 100644
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -1,22 +1,48 @@
+/* This file is part of Pazpar2.
+   Copyright (C) 2006-2009 Index Data
+
+Pazpar2 is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Pazpar2 is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
 /*
- * ParaZ - a simple tool for harvesting performance data for parallel
- * operations using Z39.50.
- * Copyright (c) 2000-2004 Index Data ApS
+ * Based on  ParaZ - a simple tool for harvesting performance data for
+ * parallel operations using Z39.50.
+ * Copyright (C) 2006-2009 Index Data ApS
  * See LICENSE file for details.
  */
 
 /*
- * $Id: eventl.c,v 1.3 2007-03-28 12:05:18 marc Exp $
  * Based on revision YAZ' server/eventl.c 1.29.
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <stdio.h>
 #include <assert.h>
 
-#if HAVE_CONFIG_H
-#include <cconfig.h>
+#ifdef WIN32
+#include <winsock.h>
+#else
+#include <unistd.h>
+#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
 #endif
-
 
 #include <stdlib.h>
 #include <errno.h>
@@ -26,13 +52,10 @@
 #include <yaz/log.h>
 #include <yaz/comstack.h>
 #include <yaz/xmalloc.h>
-#include <yaz/statserv.h>
-
 #include "eventl.h"
+#include <yaz/statserv.h>
 
-
-IOCHAN iochan_create(int fd,  struct sockaddr_in *addr_in, 
-                     IOC_CALLBACK cb, int flags)
+IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags)
 {
     IOCHAN new_iochan;
 
@@ -40,16 +63,10 @@ IOCHAN iochan_create(int fd,  struct sockaddr_in *addr_in,
     	return 0;
     new_iochan->destroyed = 0;
     new_iochan->fd = fd;
-
-    if(addr_in){
-        new_iochan->addr_in.sin_family = addr_in->sin_family;
-        new_iochan->addr_in.sin_port = addr_in->sin_port;
-        new_iochan->addr_in.sin_addr = addr_in->sin_addr;
-        strncpy(new_iochan->addr_str, inet_ntoa(addr_in->sin_addr), 64);
-    }
-
     new_iochan->flags = flags;
     new_iochan->fun = cb;
+    new_iochan->socketfun = NULL;
+    new_iochan->maskfun = NULL;
     new_iochan->force_event = 0;
     new_iochan->last_event = new_iochan->max_idle = 0;
     new_iochan->next = NULL;
@@ -70,11 +87,15 @@ int event_loop(IOCHAN *iochans)
 	FD_ZERO(&out);
 	FD_ZERO(&except);
 	timeout = &to; /* hang on select */
-	to.tv_sec = 30;
+	to.tv_sec = 15;
 	to.tv_usec = 0;
 	max = 0;
     	for (p = *iochans; p; p = p->next)
     	{
+            if (p->maskfun)
+                p->flags = (*p->maskfun)(p);
+            if (p->socketfun)
+                p->fd = (*p->socketfun)(p);
             if (p->fd < 0)
                 continue;
 	    if (p->force_event)
@@ -87,13 +108,19 @@ int event_loop(IOCHAN *iochans)
 	        FD_SET(p->fd, &except);
 	    if (p->fd > max)
 	        max = p->fd;
+            if (p->max_idle && p->max_idle < to.tv_sec)
+                to.tv_sec = p->max_idle;
 	}
-	if ((res = select(max + 1, &in, &out, &except, timeout)) < 0)
+        res = select(max + 1, &in, &out, &except, timeout);        
+        if (res < 0)
 	{
 	    if (errno == EINTR)
     		continue;
             else
-	 	abort();
+            {
+                yaz_log(YLOG_ERRNO|YLOG_WARN, "select");
+                return 0;
+            }
 	}
     	for (p = *iochans; p; p = p->next)
     	{
@@ -113,12 +140,14 @@ int event_loop(IOCHAN *iochans)
 		force_event == EVENT_INPUT))
 	    {
     		p->last_event = now;
+                yaz_log(YLOG_DEBUG, "Eventl input event");
 		(*p->fun)(p, EVENT_INPUT);
 	    }
 	    if (!p->destroyed && (FD_ISSET(p->fd, &out) ||
 	        force_event == EVENT_OUTPUT))
 	    {
 	  	p->last_event = now;
+                yaz_log(YLOG_DEBUG, "Eventl output event");
 	    	(*p->fun)(p, EVENT_OUTPUT);
 	    }
 	    if (!p->destroyed && (FD_ISSET(p->fd, &except) ||
@@ -160,7 +189,9 @@ int 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
  */
+