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
Document command=stop
[pazpar2-moved-to-github.git]
/
src
/
eventl.c
diff --git
a/src/eventl.c
b/src/eventl.c
index
1446da5
..
2e39b3a
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>
@@
-74,15
+69,18
@@
static int iochan_use(int delta)
no_iochans_total += delta;
iochans = no_iochans;
yaz_mutex_leave(g_mutex);
no_iochans_total += delta;
iochans = no_iochans;
yaz_mutex_leave(g_mutex);
- yaz_log(YLOG_DEBUG, "%s iochans=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), iochans);
+ yaz_log(YLOG_DEBUG, "%s iochans=%d",
+ delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), iochans);
return iochans;
}
return iochans;
}
-int iochans_count(void) {
+int iochans_count(void)
+{
return iochan_use(0);
}
return iochan_use(0);
}
-int iochans_count_total(void) {
+int iochans_count_total(void)
+{
int total = 0;
if (!g_mutex)
return 0;
int total = 0;
if (!g_mutex)
return 0;
@@
-108,7
+106,8
@@
struct iochan_man_s {
struct yaz_poll_fd *fds;
};
struct yaz_poll_fd *fds;
};
-iochan_man_t iochan_man_create(int no_threads) {
+iochan_man_t iochan_man_create(int no_threads)
+{
iochan_man_t man = xmalloc(sizeof(*man));
man->channel_list = 0;
man->sel_thread = 0; /* can't create sel_thread yet because we may fork */
iochan_man_t man = xmalloc(sizeof(*man));
man->channel_list = 0;
man->sel_thread = 0; /* can't create sel_thread yet because we may fork */
@@
-132,8
+131,10
@@
IOCHAN iochan_destroy_real(IOCHAN chan)
return next;
}
return next;
}
-void iochan_man_destroy(iochan_man_t *mp) {
- if (*mp) {
+void iochan_man_destroy(iochan_man_t *mp)
+{
+ if (*mp)
+ {
IOCHAN c;
if ((*mp)->sel_thread)
sel_thread_destroy((*mp)->sel_thread);
IOCHAN c;
if ((*mp)->sel_thread)
sel_thread_destroy((*mp)->sel_thread);
@@
-142,9
+143,8
@@
void iochan_man_destroy(iochan_man_t *mp) {
c = (*mp)->channel_list;
(*mp)->channel_list = NULL;
yaz_mutex_leave((*mp)->iochan_mutex);
c = (*mp)->channel_list;
(*mp)->channel_list = NULL;
yaz_mutex_leave((*mp)->iochan_mutex);
- while (c) {
+ while (c)
c = iochan_destroy_real(c);
c = iochan_destroy_real(c);
- }
yaz_mutex_destroy(&(*mp)->iochan_mutex);
xfree((*mp)->fds);
xfree(*mp);
yaz_mutex_destroy(&(*mp)->iochan_mutex);
xfree((*mp)->fds);
xfree(*mp);
@@
-152,7
+152,8
@@
void iochan_man_destroy(iochan_man_t *mp) {
}
}
}
}
-void iochan_add(iochan_man_t man, IOCHAN chan) {
+void iochan_add(iochan_man_t man, IOCHAN chan)
+{
chan->man = man;
yaz_mutex_enter(man->iochan_mutex);
yaz_log(man->log_level, "iochan_add : chan=%p channel list=%p", chan,
chan->man = man;
yaz_mutex_enter(man->iochan_mutex);
yaz_log(man->log_level, "iochan_add : chan=%p channel list=%p", chan,
@@
-162,7
+163,8
@@
void iochan_add(iochan_man_t man, IOCHAN chan) {
yaz_mutex_leave(man->iochan_mutex);
}
yaz_mutex_leave(man->iochan_mutex);
}
-IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name) {
+IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name)
+{
IOCHAN new_iochan;
if (!(new_iochan = (IOCHAN) xmalloc(sizeof(*new_iochan))))
IOCHAN new_iochan;
if (!(new_iochan = (IOCHAN) xmalloc(sizeof(*new_iochan))))
@@
-180,7
+182,8
@@
IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name) {
return new_iochan;
}
return new_iochan;
}
-static void work_handler(void *work_data) {
+static void work_handler(void *work_data)
+{
IOCHAN p = work_data;
yaz_log(p->man->log_level, "eventl: work begin chan=%p name=%s event=%d",
IOCHAN p = work_data;
yaz_log(p->man->log_level, "eventl: work begin chan=%p name=%s event=%d",
@@
-199,32
+202,32
@@
static void work_handler(void *work_data) {
p->name ? p->name : "", p->this_event);
}
p->name ? p->name : "", p->this_event);
}
-static void run_fun(iochan_man_t man, IOCHAN p) {
- if (man->sel_thread) {
+static void run_fun(iochan_man_t man, IOCHAN p)
+{
+ if (man->sel_thread)
+ {
yaz_log(man->log_level,
"eventl: work add chan=%p name=%s event=%d", p,
p->name ? p->name : "", p->this_event);
p->thread_users++;
sel_thread_add(man->sel_thread, p);
yaz_log(man->log_level,
"eventl: work add chan=%p name=%s event=%d", p,
p->name ? p->name : "", p->this_event);
p->thread_users++;
sel_thread_add(man->sel_thread, p);
- } else
+ }
+ else
work_handler(p);
}
work_handler(p);
}
-static int event_loop(iochan_man_t man, IOCHAN *iochans) {
+static int event_loop(iochan_man_t man, IOCHAN *iochans)
+{
do /* loop as long as there are active associations to process */
{
IOCHAN p, *nextp;
IOCHAN start;
IOCHAN inv_start;
int res;
do /* loop as long as there are active associations to process */
{
IOCHAN p, *nextp;
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;
-
- // INV: start must no change through the loop
+ int tv_sec = 300;
yaz_mutex_enter(man->iochan_mutex);
start = man->channel_list;
yaz_mutex_enter(man->iochan_mutex);
start = man->channel_list;
@@
-250,13
+253,14
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans) {
}
for (p = start; p; p = p->next, i++)
{
}
for (p = start; p; p = p->next, i++)
{
+ p->poll_offset = i;
fds[i].client_data = p;
fds[i].client_data = p;
- fds[i].fd = p->fd;
+ fds[i].fd = -1;
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)
@@
-265,22
+269,26
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans) {
fds[i].input_mask |= yaz_poll_write;
if (p->flags & EVENT_EXCEPT)
fds[i].input_mask |= yaz_poll_except;
fds[i].input_mask |= yaz_poll_write;
if (p->flags & EVENT_EXCEPT)
fds[i].input_mask |= yaz_poll_except;
+ if (fds[i].input_mask)
+ fds[i].fd = p->fd;
}
}
+ assert(i == no_fds);
yaz_log(man->log_level, "yaz_poll begin nofds=%d", no_fds);
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)
{
if (errno == EINTR)
continue;
yaz_log(man->log_level, "yaz_poll returned res=%d", res);
if (res < 0)
{
if (errno == EINTR)
continue;
- else {
+ else
+ {
yaz_log(YLOG_ERRNO | YLOG_WARN, "poll");
yaz_log(YLOG_ERRNO | YLOG_WARN, "poll");
- return 0;
+ abort();
}
}
}
}
- i = 0;
if (man->sel_fd != -1)
{
if (man->sel_fd != -1)
{
+ i = 0;
assert(fds[i].fd == man->sel_fd);
if (fds[i].output_mask)
{
assert(fds[i].fd == man->sel_fd);
if (fds[i].output_mask)
{
@@
-288,14
+296,14
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans) {
yaz_log(man->log_level, "eventl: sel input on sel_fd=%d",
man->sel_fd);
yaz_log(man->log_level, "eventl: sel input on sel_fd=%d",
man->sel_fd);
- while ((chan = sel_thread_result(man->sel_thread))) {
+ while ((chan = sel_thread_result(man->sel_thread)))
+ {
yaz_log(man->log_level,
"eventl: got thread result chan=%p name=%s", chan,
chan->name ? chan->name : "");
chan->thread_users--;
}
}
yaz_log(man->log_level,
"eventl: got thread result chan=%p name=%s", chan,
chan->name ? chan->name : "");
chan->thread_users--;
}
}
- i++;
}
if (man->log_level)
{
}
if (man->log_level)
{
@@
-304,10
+312,10
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans) {
no++;
yaz_log(man->log_level, "%d channels", no);
}
no++;
yaz_log(man->log_level, "%d channels", no);
}
- for (; i < no_fds; i++)
+ for (p = start; p; p = p->next)
{
time_t now = time(0);
{
time_t now = time(0);
- p = fds[i].client_data;
+ i = p->poll_offset;
if (p->destroyed)
{
if (p->destroyed)
{
@@
-329,7
+337,7
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans) {
p->last_event = now;
p->this_event |= EVENT_TIMEOUT;
}
p->last_event = now;
p->this_event |= EVENT_TIMEOUT;
}
- if (fds[i].fd >= 0)
+ if (fds[i].fd >= 0 && p->fd == fds[i].fd)
{
if (fds[i].output_mask & yaz_poll_read)
{
{
if (fds[i].output_mask & yaz_poll_read)
{
@@
-348,7
+356,8
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans) {
}
}
/* only fire one Z39.50/SRU socket event.. except for timeout */
}
}
/* only fire one Z39.50/SRU socket event.. except for timeout */
- if (p->this_event) {
+ if (p->this_event)
+ {
if (!(p->this_event & EVENT_TIMEOUT) &&
!strcmp(p->name, "connection_socket"))
{
if (!(p->this_event & EVENT_TIMEOUT) &&
!strcmp(p->name, "connection_socket"))
{
@@
-364,11
+373,12
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans) {
assert(inv_start == start);
yaz_mutex_enter(man->iochan_mutex);
assert(inv_start == start);
yaz_mutex_enter(man->iochan_mutex);
- for (nextp = iochans; *nextp;) {
+ for (nextp = iochans; *nextp; )
+ {
IOCHAN p = *nextp;
IOCHAN p = *nextp;
- if (p->destroyed && p->thread_users == 0) {
+ if (p->destroyed && p->thread_users == 0)
*nextp = iochan_destroy_real(p);
*nextp = iochan_destroy_real(p);
- } else
+ else
nextp = &p->next;
}
yaz_mutex_leave(man->iochan_mutex);
nextp = &p->next;
}
yaz_mutex_leave(man->iochan_mutex);
@@
-376,8
+386,10
@@
static int event_loop(iochan_man_t man, IOCHAN *iochans) {
return 0;
}
return 0;
}
-void iochan_man_events(iochan_man_t man) {
- if (man->no_threads > 0 && !man->sel_thread) {
+void iochan_man_events(iochan_man_t man)
+{
+ if (man->no_threads > 0 && !man->sel_thread)
+ {
man->sel_thread = sel_thread_create(work_handler, 0 /*work_destroy */,
&man->sel_fd, man->no_threads);
yaz_log(man->log_level, "iochan_man_events. Using %d threads",
man->sel_thread = sel_thread_create(work_handler, 0 /*work_destroy */,
&man->sel_fd, man->no_threads);
yaz_log(man->log_level, "iochan_man_events. Using %d threads",
@@
-386,17
+398,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