X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Feventl.c;h=5e219ca6fab1164e386a70fdbbfd2459254d45d9;hp=8c7d3abbbc76f576b68d4850f5ed7fab615efeed;hb=e4c68bbbfdfbfb44c4dbb62c3f528106ab65ffcf;hpb=d16f37add45152d0d3b786a4676577a57e4f4139 diff --git a/src/eventl.c b/src/eventl.c index 8c7d3ab..5e219ca 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2009 Index Data + * Copyright (C) 1995-2010 Index Data * See the file LICENSE for details. */ @@ -117,8 +117,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; @@ -138,15 +139,9 @@ int iochan_event_loop(IOCHAN *iochans) } 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);