From: Dennis Schafroth Date: Tue, 27 Apr 2010 09:01:49 +0000 (+0200) Subject: Merge branch 'master' into channel_list_mutex X-Git-Tag: v1.4.0~3^2~14 X-Git-Url: http://lists.indexdata.com/cgi-bin?a=commitdiff_plain;h=e6d6362b750ae25591ee5a40e135878fd590e13e;hp=96b4b8fbb0367d48cd9453d4580d8ba19bdc7455;p=pazpar2-moved-to-github.git Merge branch 'master' into channel_list_mutex --- diff --git a/src/connection.c b/src/connection.c index 4ca648e..da7c1a5 100644 --- a/src/connection.c +++ b/src/connection.c @@ -47,6 +47,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "client.h" #include "settings.h" +/* connection counting (1) , disable connection counting (0) */ +#if 0 +static YAZ_MUTEX g_mutex = 0; +static int no_connections = 0; + +static void connection_use(int delta) +{ + if (!g_mutex) + yaz_mutex_create(&g_mutex); + yaz_mutex_enter(g_mutex); + no_connections += delta; + yaz_mutex_leave(g_mutex); + yaz_log(YLOG_LOG, "%s connections=%d", delta > 0 ? "INC" : "DEC", + no_connections); +} +#else +#define connection_use(x) +#endif + /** \brief Represents a physical, reusable connection to a remote Z39.50 host */ @@ -123,6 +142,7 @@ static void connection_destroy(struct connection *co) remove_connection_from_host(co); xfree(co->zproxy); xfree(co); + connection_use(-1); } // Creates a new connection for client, associated with the host of @@ -153,6 +173,7 @@ static struct connection *connection_create(struct client *cl, co->host->connections = co; yaz_mutex_leave(host->mutex); + connection_use(1); return co; } @@ -234,6 +255,8 @@ void connection_continue(struct connection *co) int r = ZOOM_connection_exec_task(co->link); if (!r) yaz_log(YLOG_WARN, "No task was executed for connection"); + iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link)); + iochan_setfd(co->iochan, ZOOM_connection_get_socket(co->link)); } static void connection_handler(IOCHAN iochan, int event) @@ -284,6 +307,12 @@ static void connection_handler(IOCHAN iochan, int event) non_block_events(co); client_unlock(cl); + + if (co->link) + { + iochan_setflags(iochan, ZOOM_connection_get_mask(co->link)); + iochan_setfd(iochan, ZOOM_connection_get_socket(co->link)); + } } } @@ -346,28 +375,6 @@ static struct host *connection_get_host(struct connection *con) return con->host; } -// Callback for use by event loop -// We do this because ZOOM connections don't always have (the same) sockets -static int socketfun(IOCHAN c) -{ - struct connection *co = iochan_getdata(c); - if (!co->link) - return -1; - return ZOOM_connection_get_socket(co->link); -} - -// Because ZOOM always knows what events it is interested in; we may not -static int maskfun(IOCHAN c) -{ - struct connection *co = iochan_getdata(c); - if (!co->link) - return 0; - - // This is cheating a little, and assuming that eventl mask IDs are always - // the same as ZOOM-C's. - return ZOOM_connection_get_mask(co->link); -} - static int connection_connect(struct connection *con, iochan_man_t iochan_man) { ZOOM_connection link = 0; @@ -430,8 +437,6 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) con->state = Conn_Connecting; iochan_settimeout(con->iochan, con->operation_timeout); iochan_setdata(con->iochan, con); - iochan_setsocketfun(con->iochan, socketfun); - iochan_setmaskfun(con->iochan, maskfun); iochan_add(iochan_man, con->iochan); /* this fragment is bad DRY: from client_prep_connection */ diff --git a/src/eventl.c b/src/eventl.c index f178015..990dbfe 100644 --- a/src/eventl.c +++ b/src/eventl.c @@ -127,8 +127,6 @@ IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, new_iochan->fd = fd; new_iochan->flags = flags; new_iochan->fun = cb; - new_iochan->socketfun = NULL; - new_iochan->maskfun = NULL; new_iochan->last_event = new_iochan->max_idle = 0; new_iochan->next = NULL; new_iochan->man = 0; @@ -222,10 +220,6 @@ static int event_loop(iochan_man_t man, IOCHAN *iochans) { if (p->thread_users > 0) continue; - if (p->maskfun) - p->flags = (*p->maskfun)(p); - if (p->socketfun) - p->fd = (*p->socketfun)(p); if (p->max_idle && p->max_idle < to.tv_sec) to.tv_sec = p->max_idle; if (p->fd < 0) diff --git a/src/eventl.h b/src/eventl.h index e22b90e..785ba9d 100644 --- a/src/eventl.h +++ b/src/eventl.h @@ -25,8 +25,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA struct iochan; typedef void (*IOC_CALLBACK)(struct iochan *i, int event); -typedef int (*IOC_SOCKETFUN)(struct iochan *i); -typedef int (*IOC_MASKFUN)(struct iochan *i); typedef struct iochan_man_s *iochan_man_t; @@ -39,8 +37,6 @@ typedef struct iochan #define EVENT_EXCEPT 0x04 #define EVENT_TIMEOUT 0x08 IOC_CALLBACK fun; - IOC_SOCKETFUN socketfun; - IOC_MASKFUN maskfun; void *data; int destroyed; time_t last_event; @@ -61,6 +57,7 @@ void iochan_man_destroy(iochan_man_t *mp); #define iochan_destroy(i) (void)((i)->destroyed = 1) #define iochan_getfd(i) ((i)->fd) +#define iochan_setfd(i, d) ((i)->fd = d) #define iochan_getdata(i) ((i)->data) #define iochan_setdata(i, d) ((i)->data = d) #define iochan_setflags(i, d) ((i)->flags = d) @@ -69,10 +66,6 @@ void iochan_man_destroy(iochan_man_t *mp); #define iochan_getflag(i, d) ((i)->flags & d ? 1 : 0) #define iochan_settimeout(i, t) ((i)->max_idle = (t), (i)->last_event = time(0)) #define iochan_activity(i) ((i)->last_event = time(0)) -#define iochan_setsocketfun(i, f) ((i)->socketfun = (f)) -#define iochan_getsocketfun(i) ((i)->socketfun) -#define iochan_setmaskfun(i, f) ((i)->maskfun = (f)) -#define iochan_getmaskfun(i) ((i)->maskfun) IOCHAN iochan_create(int fd, IOC_CALLBACK cb, int flags, const char *name);