/* This file is part of Pazpar2.
- Copyright (C) 2006-2010 Index Data
+ Copyright (C) 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
/*
* Based on ParaZ - a simple tool for harvesting performance data for
* parallel operations using Z39.50.
- * Copyright (C) 2006-2010 Index Data ApS
+ * Copyright (C) Index Data ApS
* See LICENSE file for details.
*/
#include "eventl.h"
#include "sel_thread.h"
+#if 1
+static YAZ_MUTEX g_mutex = 0;
+static int no_iochans = 0;
+static int no_iochans_total = 0;
+
+static int iochan_use(int delta)
+{
+ int iochans;
+ if (!g_mutex)
+ yaz_mutex_create(&g_mutex);
+ yaz_mutex_enter(g_mutex);
+ no_iochans += delta;
+ if (delta > 0)
+ 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);
+ return iochans;
+}
+
+int iochans_count(void) {
+ return iochan_use(0);
+}
+
+int iochans_count_total(void) {
+ int total = 0;
+ if (!g_mutex)
+ return 0;
+ yaz_mutex_enter(g_mutex);
+ total = no_iochans_total;
+ yaz_mutex_leave(g_mutex);
+ return total;
+}
+#else
+#define iochan_use(x)
+#define iochans_count(x) 0
+#define iochans_count_total(x) 0
+#endif
+
struct iochan_man_s {
IOCHAN channel_list;
sel_thread_t sel_thread;
YAZ_MUTEX iochan_mutex;
};
-struct iochan_man_iter {
- iochan_man_t man;
- IOCHAN current;
- int first;
-};
-
iochan_man_t iochan_man_create(int no_threads) {
iochan_man_t man = xmalloc(sizeof(*man));
man->channel_list = 0;
return man;
}
+IOCHAN iochan_destroy_real(IOCHAN chan)
+{
+ IOCHAN next = chan->next;
+ if (chan->name)
+ xfree(chan->name);
+ xfree(chan);
+ iochan_use(-1);
+ return next;
+}
+
void iochan_man_destroy(iochan_man_t *mp) {
if (*mp) {
IOCHAN c;
if ((*mp)->sel_thread)
sel_thread_destroy((*mp)->sel_thread);
+ yaz_mutex_enter((*mp)->iochan_mutex);
c = (*mp)->channel_list;
+ (*mp)->channel_list = NULL;
+ yaz_mutex_leave((*mp)->iochan_mutex);
while (c) {
- IOCHAN c_next = c->next;
- xfree(c->name);
- xfree(c);
- c = c_next;
+ c = iochan_destroy_real(c);
}
+ yaz_mutex_destroy(&(*mp)->iochan_mutex);
xfree(*mp);
*mp = 0;
}
if (!(new_iochan = (IOCHAN) xmalloc(sizeof(*new_iochan))))
return 0;
+ iochan_use(1);
new_iochan->destroyed = 0;
new_iochan->fd = fd;
new_iochan->flags = flags;
}
static void run_fun(iochan_man_t man, IOCHAN p) {
- if (p->this_event) {
- 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);
- } else
- work_handler(p);
- }
-}
-
-static IOCHAN iochan_man_get_first(struct iochan_man_iter *iter,
- iochan_man_t man) {
- iter->man = man;
- iter->first = 1;
- yaz_mutex_enter(man->iochan_mutex);
- iter->current = man->channel_list;
- yaz_log(man->log_level, "iochan_man_get_first : chan=%p ", iter->current);
- if (!iter->current)
- yaz_mutex_leave(man->iochan_mutex);
- return iter->current;
-}
-
-static IOCHAN iochan_man_get_next(struct iochan_man_iter *iter) {
- IOCHAN current = NULL, next = NULL;
- current = iter->current;
- assert(current);
- if (current) {
- next = current->next;
- iter->current = iter->current->next;
- if (iter->first) {
- yaz_log(iter->man->log_level,
- "iochan_man_get_next : chan=%p next=%p", current, next);
- iter->first = 0;
- yaz_mutex_leave(iter->man->iochan_mutex);
- }
- }
- return iter->current;
+ 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);
+ } else
+ work_handler(p);
}
static int event_loop(iochan_man_t man, IOCHAN *iochans) {
{
IOCHAN p, *nextp;
IOCHAN start;
+ IOCHAN inv_start;
fd_set in, out, except;
int res, max;
static struct timeval to;
struct timeval *timeout;
- static struct iochan_man_iter iter;
// struct yaz_poll_fd *fds;
- int no_fds = 0;
+ int i, no_fds = 0;
FD_ZERO(&in);
FD_ZERO(&out);
FD_ZERO(&except);
to.tv_sec = 300;
to.tv_usec = 0;
- // INV: Start must no change through the loop
+ // INV: start must no change through the loop
- start = iochan_man_get_first(&iter, man);
- IOCHAN inv_start = start;
- for (p = start; p; p = iochan_man_get_next(&iter)) {
+ yaz_mutex_enter(man->iochan_mutex);
+ start = man->channel_list;
+ yaz_mutex_leave(man->iochan_mutex);
+ inv_start = start;
+ for (p = start; p; p = p->next) {
no_fds++;
}
// fds = (struct yaz_poll_fd *) xmalloc(no_fds * sizeof(*fds));
if (p->fd > max)
max = p->fd;
}
- yaz_log(man->log_level, "max=%d nofds=%d", max, man->sel_fd);
+ yaz_log(man->log_level, "max=%d sel_fd=%d", max, man->sel_fd);
if (man->sel_fd != -1) {
if (man->sel_fd > max)
}
if (man->log_level) {
int no = 0;
- for (p = iochan_man_get_first(&iter, man); p; p
- = iochan_man_get_next(&iter)) {
+ for (p = start; p; p = p->next) {
no++;
}
yaz_log(man->log_level, "%d channels", no);
}
+ i = 0;
for (p = start; p; p = p->next) {
time_t now = time(0);
p->this_event |= EVENT_EXCEPT;
}
}
- run_fun(man, p);
+ /* only fire one Z39.50/SRU socket event.. except for timeout */
+ if (p->this_event) {
+ if (!(p->this_event & EVENT_TIMEOUT) &&
+ !strcmp(p->name, "connection_socket")) {
+ /* not a timeout and we have a Z39.50/SRU socket */
+ if (i == 0)
+ run_fun(man, p);
+ i++;
+ } else
+ run_fun(man, p);
+ }
}
assert(inv_start == start);
yaz_mutex_enter(man->iochan_mutex);
for (nextp = iochans; *nextp;) {
IOCHAN p = *nextp;
if (p->destroyed && p->thread_users == 0) {
- *nextp = p->next;
- xfree(p->name);
- xfree(p);
+ *nextp = iochan_destroy_real(p);
} else
nextp = &p->next;
}
projects / pazpar2-moved-to-github.git / blobdiff