projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 5.4.1
[yaz-moved-to-github.git]
/
src
/
eventl.c
diff --git
a/src/eventl.c
b/src/eventl.c
index
e8f6324
..
be79cf3
100644
(file)
--- a/
src/eventl.c
+++ b/
src/eventl.c
@@
-1,8
+1,7
@@
/* This file is part of the YAZ toolkit.
/* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) Index Data
* See the file LICENSE for details.
*/
* See the file LICENSE for details.
*/
-
/**
* \file eventl.c
* \brief Implements event loop handling for GFS.
/**
* \file eventl.c
* \brief Implements event loop handling for GFS.
@@
-10,6
+9,9
@@
* This source implements the main event loop for the Generic Frontend
* Server.
*/
* 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>
#include <assert.h>
#include <errno.h>
@@
-76,7
+78,7
@@
int iochan_is_alive(IOCHAN chan)
return 1;
}
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 */
{
{
do /* loop as long as there are active associations to process */
{
@@
-88,11
+90,6
@@
int iochan_event_loop(IOCHAN *iochans)
int res;
time_t now = time(0);
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 = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds));
for (p = *iochans; p; p = p->next)
no_fds++;
fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds));
@@
-117,8
+114,9
@@
int iochan_event_loop(IOCHAN *iochans)
w = p->max_idle;
else
w = ftime - now;
w = p->max_idle;
else
w = ftime - now;
+ /* tv_sec will be minimum wait.. */
if (w < tv_sec)
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;
}
fds[i].fd = p->fd;
fds[i].input_mask = input_mask;
@@
-128,12
+126,9
@@
int iochan_event_loop(IOCHAN *iochans)
{
if (yaz_errno() == EINTR)
{
{
if (yaz_errno() == EINTR)
{
- if (statserv_must_terminate())
- {
- for (p = *iochans; p; p = p->next)
- p->force_event = EVENT_TIMEOUT;
- }
xfree(fds);
xfree(fds);
+ if (watch_sig && *watch_sig)
+ break;
continue;
}
else
continue;
}
else