projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Check for unistd.h presense
[pazpar2-moved-to-github.git]
/
src
/
eventl.c
diff --git
a/src/eventl.c
b/src/eventl.c
index
e200e03
..
148ddd7
100644
(file)
--- a/
src/eventl.c
+++ b/
src/eventl.c
@@
-36,14
+36,9
@@
#include <stdio.h>
#include <assert.h>
#include <stdio.h>
#include <assert.h>
-#ifdef WIN32
-#include <winsock.h>
-#else
+#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#include <unistd.h>
#endif
-#if HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
#include <stdlib.h>
#include <errno.h>
#include <stdlib.h>
#include <errno.h>
@@
-229,12
+224,10
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans)
IOCHAN start;
IOCHAN inv_start;
int res;
IOCHAN start;
IOCHAN inv_start;
int res;
- static struct timeval to;
struct yaz_poll_fd *fds;
int i, no_fds = 0;
int connection_fired = 0;
struct yaz_poll_fd *fds;
int i, no_fds = 0;
int connection_fired = 0;
- to.tv_sec = 300;
- to.tv_usec = 0;
+ int tv_sec = 300;
yaz_mutex_enter(man->iochan_mutex);
start = man->channel_list;
yaz_mutex_enter(man->iochan_mutex);
start = man->channel_list;
@@
-265,8
+258,8
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans)
fds[i].input_mask = 0;
if (p->thread_users > 0)
continue;
fds[i].input_mask = 0;
if (p->thread_users > 0)
continue;
- if (p->max_idle && p->max_idle < to.tv_sec)
- to.tv_sec = p->max_idle;
+ if (p->max_idle && p->max_idle < tv_sec)
+ tv_sec = p->max_idle;
if (p->fd < 0)
continue;
if (p->flags & EVENT_INPUT)
if (p->fd < 0)
continue;
if (p->flags & EVENT_INPUT)
@@
-277,7
+270,7
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans)
fds[i].input_mask |= yaz_poll_except;
}
yaz_log(man->log_level, "yaz_poll begin nofds=%d", no_fds);
fds[i].input_mask |= yaz_poll_except;
}
yaz_log(man->log_level, "yaz_poll begin nofds=%d", no_fds);
- res = yaz_poll(fds, no_fds, to.tv_sec, 0);
+ res = yaz_poll(fds, no_fds, tv_sec, 0);
yaz_log(man->log_level, "yaz_poll returned res=%d", res);
if (res < 0)
{
yaz_log(man->log_level, "yaz_poll returned res=%d", res);
if (res < 0)
{
@@
-402,18
+395,6
@@
void iochan_man_events(iochan_man_t man)
event_loop(man, &man->channel_list);
}
event_loop(man, &man->channel_list);
}
-void pazpar2_sleep(double d)
-{
-#ifdef WIN32
- Sleep( (DWORD) (d * 1000));
-#else
- struct timeval tv;
- tv.tv_sec = floor(d);
- tv.tv_usec = (d - floor(d)) * 1000000;
- select(0, 0, 0, 0, &tv);
-#endif
-}
-
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4