/* This file is part of Pazpar2.
- Copyright (C) 2006-2011 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-2011 Index Data ApS
+ * Copyright (C) Index Data ApS
* See LICENSE file for details.
*/
no_iochans += delta;
if (delta > 0)
no_iochans_total += delta;
- iochans = no_clients;
+ iochans = no_iochans;
yaz_mutex_leave(g_mutex);
yaz_log(YLOG_DEBUG, "%s iochans=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), iochans);
return iochans;
IOCHAN next = chan->next;
if (chan->name)
xfree(chan->name);
- xfree(free);
+ xfree(chan);
iochan_use(-1);
return next;
}
}
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);
- }
+ 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) {
struct timeval *timeout;
// struct yaz_poll_fd *fds;
- int no_fds = 0;
+ int i, no_fds = 0;
FD_ZERO(&in);
FD_ZERO(&out);
FD_ZERO(&except);
}
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 = iochan_destroy_real(iochan);
+ *nextp = iochan_destroy_real(p);
} else
nextp = &p->next;
}