X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=0a6f61c4d2e2e6964e2762808febe50c6bea7f2d;hb=5b3c0fa381448c474b59959e0443870f2e6bc7ef;hp=81705901b6863e02b9199ca66eb8f5046c21ff24;hpb=342d4f2a3eb9f281e4e7c20c5daa3432f8a321ef;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index 8170590..0a6f61c 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 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 @@ -48,22 +48,39 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "settings.h" /* connection counting (1) , disable connection counting (0) */ -#if 0 +#if 1 static YAZ_MUTEX g_mutex = 0; static int no_connections = 0; +static int total_no_connections = 0; -static void connection_use(int delta) +static int connection_use(int delta) { + int result; if (!g_mutex) yaz_mutex_create(&g_mutex); yaz_mutex_enter(g_mutex); no_connections += delta; + result = no_connections; + if (delta > 0) + total_no_connections += delta; yaz_mutex_leave(g_mutex); + if (delta == 0) + return result; yaz_log(YLOG_LOG, "%s connections=%d", delta > 0 ? "INC" : "DEC", no_connections); + return result; } + +int connections_count(void) +{ + return connection_use(0); +} + + #else #define connection_use(x) +#define connections_count(x) 0 +#define connections_count_total(x) 0 #endif @@ -78,7 +95,8 @@ struct connection { enum { Conn_Resolving, Conn_Connecting, - Conn_Open + Conn_Open, + Conn_Dead } state; int operation_timeout; int session_timeout; @@ -122,6 +140,7 @@ static void remove_connection_from_host(struct connection *con) } conp = &(*conp)->next; } + yaz_cond_broadcast(con->host->cond_ready); } // Close connection and recycle structure @@ -132,14 +151,13 @@ static void connection_destroy(struct connection *co) ZOOM_connection_destroy(co->link); iochan_destroy(co->iochan); } - yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport); + yaz_log(YLOG_DEBUG, "%p Connection destroy %s", co, co->host->hostport); if (co->client) { client_disconnect(co->client); } - remove_connection_from_host(co); xfree(co->zproxy); xfree(co); connection_use(-1); @@ -193,23 +211,28 @@ static void non_block_events(struct connection *co) continue; ev = ZOOM_connection_last_event(link); -#if 0 - yaz_log(YLOG_LOG, "ZOOM_EVENT_%s", ZOOM_get_event_str(ev)); +#if 1 + yaz_log(YLOG_DEBUG, "%p Connection ZOOM_EVENT_%s", co, ZOOM_get_event_str(ev)); #endif switch (ev) { case ZOOM_EVENT_END: { const char *error, *addinfo; - int err; + int err; if ((err = ZOOM_connection_error(link, &error, &addinfo))) { yaz_log(YLOG_LOG, "Error %s from %s", error, client_get_url(cl)); + client_set_diagnostic(cl, err); + client_set_state(cl, Client_Error); } - iochan_settimeout(iochan, co->session_timeout); - client_set_diagnostic(cl, err); - client_set_state(cl, Client_Idle); + else + { + iochan_settimeout(iochan, co->session_timeout); + client_set_state(cl, Client_Idle); + } + yaz_cond_broadcast(co->host->cond_ready); } break; case ZOOM_EVENT_SEND_DATA: @@ -245,6 +268,7 @@ static void non_block_events(struct connection *co) struct client *cl = co->client; if (cl) { + client_check_preferred_watch(cl); client_got_records(cl); } } @@ -255,6 +279,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) @@ -271,28 +297,28 @@ static void connection_handler(IOCHAN iochan, int event) a closed connection from the target.. Or, perhaps, an unexpected package.. We will just close the connection */ yaz_log(YLOG_LOG, "timeout connection %p event=%d", co, event); - connection_destroy(co); + remove_connection_from_host(co); yaz_mutex_leave(host->mutex); + connection_destroy(co); } else if (event & EVENT_TIMEOUT) { if (co->state == Conn_Connecting) { - yaz_log(YLOG_WARN, "connect timeout %s", client_get_url(cl)); + yaz_log(YLOG_WARN, "%p connect timeout %s", co, client_get_url(cl)); client_set_state(cl, Client_Error); - connection_destroy(co); - } - else if (client_get_state(co->client) == Client_Idle) - { - yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl)); + remove_connection_from_host(co); + yaz_mutex_leave(host->mutex); connection_destroy(co); } else { - yaz_log(YLOG_LOG, "ignore timeout %s", client_get_url(cl)); + yaz_log(YLOG_LOG, "%p Connection idle timeout %s", co, client_get_url(cl)); + remove_connection_from_host(co); + yaz_mutex_leave(host->mutex); + connection_destroy(co); } - yaz_mutex_leave(host->mutex); } else { @@ -305,6 +331,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)); + } } } @@ -333,6 +365,7 @@ start: { if (!host->ipport) /* unresolved */ { + remove_connection_from_host(con); yaz_mutex_leave(host->mutex); connection_destroy(con); goto start; @@ -340,6 +373,7 @@ start: } else if (!con->client) { + remove_connection_from_host(con); yaz_mutex_leave(host->mutex); connection_destroy(con); /* start all over .. at some point it will be NULL */ @@ -367,28 +401,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; @@ -428,7 +440,6 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION)) && *sru_version) ZOOM_options_set(zoptions, "sru_version", sru_version); - if (!(link = ZOOM_connection_create(zoptions))) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection"); @@ -443,16 +454,16 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) strcat(http_hostport, host->hostport); ZOOM_connection_connect(link, http_hostport, 0); } + else if (zproxy && *zproxy) + ZOOM_connection_connect(link, host->hostport, 0); else ZOOM_connection_connect(link, host->ipport, 0); con->link = link; - con->iochan = iochan_create(0, connection_handler, 0, "connection_socket"); + con->iochan = iochan_create(-1, connection_handler, 0, "connection_socket"); 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 */ @@ -464,7 +475,8 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) // Ensure that client has a connection associated int client_prep_connection(struct client *cl, int operation_timeout, int session_timeout, - iochan_man_t iochan_man) + iochan_man_t iochan_man, + const struct timeval *abstime) { struct connection *co; struct host *host = client_get_host(cl); @@ -483,23 +495,66 @@ int client_prep_connection(struct client *cl, if (!co) { + int max_connections = 0; + int reuse_connections = 1; + const char *v = session_setting_oneval(client_get_database(cl), + PZ_MAX_CONNECTIONS); + if (v && *v) + max_connections = atoi(v); + + v = session_setting_oneval(client_get_database(cl), + PZ_REUSE_CONNECTIONS); + if (v && *v) + reuse_connections = atoi(v); + // See if someone else has an idle connection // We should look at timestamps here to select the longest-idle connection yaz_mutex_enter(host->mutex); - for (co = host->connections; co; co = co->next) - if (connection_is_idle(co) && - (!co->client || client_get_state(co->client) == Client_Idle) && - !strcmp(ZOOM_connection_option_get(co->link, "user"), - session_setting_oneval(client_get_database(cl), - PZ_AUTHENTICATION))) - { - if (zproxy == 0 && co->zproxy == 0) - break; - if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy)) + while (1) + { + int num_connections = 0; + for (co = host->connections; co; co = co->next) + num_connections++; + if (reuse_connections) { + for (co = host->connections; co; co = co->next) + { + if (connection_is_idle(co) && + (!co->client || client_get_state(co->client) == Client_Idle) && + !strcmp(ZOOM_connection_option_get(co->link, "user"), + session_setting_oneval(client_get_database(cl), + PZ_AUTHENTICATION))) + { + if (zproxy == 0 && co->zproxy == 0) + break; + if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy)) + break; + } + } + if (co) + { + yaz_log(YLOG_LOG, "num_connections = %d (reusing)", num_connections); break; + } + } + if (max_connections <= 0 || num_connections < max_connections) + { + yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d", + num_connections, max_connections); + break; } + yaz_log(YLOG_LOG, "num_connections = %d (waiting) max = %d", + num_connections, max_connections); + if (yaz_cond_wait(host->cond_ready, host->mutex, abstime)) + { + yaz_log(YLOG_LOG, "out of connections %s", client_get_url(cl)); + client_set_state(cl, Client_Error); + yaz_mutex_leave(host->mutex); + return 0; + } + } if (co) { + yaz_log(YLOG_LOG, "%p Connection reuse. state: %d", co, co->state); connection_release(co); client_set_connection(cl, co); co->client = cl;