X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=c5a8ab579e8aae0ad470cf7f093e2e5528c503bd;hb=275d917ce676df4f41fa9fe097154fc5528615a2;hp=44c1fb94f74cc67b2c8ff4226fde003ec90acafc;hpb=70c3e1d89edf803ac273ef2079dd5de1157c7eb4;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index 44c1fb9..c5a8ab5 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 @@ -76,7 +93,7 @@ struct connection { struct client *client; char *zproxy; enum { - Conn_Resolving, + Conn_Closed, Conn_Connecting, Conn_Open } state; @@ -133,7 +150,7 @@ 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) { @@ -148,12 +165,12 @@ static void connection_destroy(struct connection *co) // Creates a new connection for client, associated with the host of // client's database static struct connection *connection_create(struct client *cl, + struct host *host, int operation_timeout, int session_timeout, iochan_man_t iochan_man) { struct connection *co; - struct host *host = client_get_host(cl); co = xmalloc(sizeof(*co)); co->host = host; @@ -162,11 +179,11 @@ static struct connection *connection_create(struct client *cl, co->zproxy = 0; client_set_connection(cl, co); co->link = 0; - co->state = Conn_Resolving; + co->state = Conn_Closed; co->operation_timeout = operation_timeout; co->session_timeout = session_timeout; - if (host->ipport) - connection_connect(co, iochan_man); + + connection_connect(co, iochan_man); yaz_mutex_enter(host->mutex); co->next = co->host->connections; @@ -205,7 +222,7 @@ static void non_block_events(struct connection *co) if ((err = ZOOM_connection_error(link, &error, &addinfo))) { yaz_log(YLOG_LOG, "Error %s from %s", - error, client_get_url(cl)); + error, client_get_id(cl)); client_set_diagnostic(cl, err); client_set_state(cl, Client_Error); } @@ -230,7 +247,7 @@ static void non_block_events(struct connection *co) case ZOOM_EVENT_RECV_APDU: break; case ZOOM_EVENT_CONNECT: - yaz_log(YLOG_LOG, "Connected to %s", client_get_url(cl)); + yaz_log(YLOG_LOG, "Connected to %s", client_get_id(cl)); co->state = Conn_Open; break; case ZOOM_EVENT_RECV_SEARCH: @@ -242,7 +259,7 @@ static void non_block_events(struct connection *co) break; default: yaz_log(YLOG_LOG, "Unhandled event (%d) from %s", - ev, client_get_url(cl)); + ev, client_get_id(cl)); } } if (got_records) @@ -260,9 +277,25 @@ 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)); + { + const char *error, *addinfo; + int err; + if ((err = ZOOM_connection_error(co->link, &error, &addinfo))) + { + if (co->client) + { + yaz_log(YLOG_LOG, "Error %s from %s", + error, client_get_id(co->client)); + client_set_diagnostic(co->client, err); + client_set_state_nb(co->client, Client_Error); + } + } + } + else + { + 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) @@ -287,17 +320,20 @@ static void connection_handler(IOCHAN iochan, int event) { 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_id(cl)); client_set_state(cl, Client_Error); + remove_connection_from_host(co); + yaz_mutex_leave(host->mutex); connection_destroy(co); } else { - yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl)); + yaz_log(YLOG_LOG, "%p Connection idle timeout %s", co, client_get_id(cl)); + remove_connection_from_host(co); + yaz_mutex_leave(host->mutex); connection_destroy(co); } - yaz_mutex_leave(host->mutex); } else { @@ -331,50 +367,6 @@ static void connection_release(struct connection *co) co->client = 0; } -void connect_resolver_host(struct host *host, iochan_man_t iochan_man) -{ - struct connection *con; - -start: - yaz_mutex_enter(host->mutex); - con = host->connections; - while (con) - { - if (con->state == Conn_Resolving) - { - if (!host->ipport) /* unresolved */ - { - remove_connection_from_host(con); - yaz_mutex_leave(host->mutex); - connection_destroy(con); - goto start; - /* start all over .. at some point it will be NULL */ - } - 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 */ - goto start; - } - else - { - yaz_mutex_leave(host->mutex); - connection_connect(con, iochan_man); - client_start_search(con->client); - goto start; - } - } - else - { - yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state); - con = con->next; - } - } - yaz_mutex_leave(host->mutex); -} - static struct host *connection_get_host(struct connection *con) { return con->host; @@ -382,7 +374,6 @@ static struct host *connection_get_host(struct connection *con) static int connection_connect(struct connection *con, iochan_man_t iochan_man) { - ZOOM_connection link = 0; struct host *host = connection_get_host(con); ZOOM_options zoptions = ZOOM_options_create(); const char *auth; @@ -394,7 +385,6 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG); - assert(host->ipport); assert(con); ZOOM_options_set(zoptions, "async", "1"); @@ -419,8 +409,7 @@ 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))) + if (!(con->link = ZOOM_connection_create(zoptions))) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection"); ZOOM_options_destroy(zoptions); @@ -432,21 +421,19 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) char http_hostport[512]; strcpy(http_hostport, "http://"); strcat(http_hostport, host->hostport); - ZOOM_connection_connect(link, http_hostport, 0); + ZOOM_connection_connect(con->link, http_hostport, 0); } - else if (zproxy && *zproxy) - ZOOM_connection_connect(link, host->hostport, 0); else - ZOOM_connection_connect(link, host->ipport, 0); + { + ZOOM_connection_connect(con->link, host->hostport, 0); + } - con->link = link; 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_add(iochan_man, con->iochan); - /* this fragment is bad DRY: from client_prep_connection */ client_set_state(con->client, Client_Connecting); ZOOM_options_destroy(zoptions); return 0; @@ -459,20 +446,37 @@ int client_prep_connection(struct client *cl, const struct timeval *abstime) { struct connection *co; - struct host *host = client_get_host(cl); struct session_database *sdb = client_get_database(cl); const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); + const char *url = session_setting_oneval(sdb, PZ_URL); + struct host *host = 0; if (zproxy && zproxy[0] == '\0') zproxy = 0; - if (!host) - return 0; + if (!url || !*url) + url = sdb->database->id; - co = client_get_connection(cl); + host = find_host(client_get_session(cl)->service->server->database_hosts, + url); - yaz_log(YLOG_DEBUG, "Client prep %s", client_get_url(cl)); + yaz_log(YLOG_DEBUG, "client_prep_connection: target=%s url=%s", + client_get_id(cl), url); + co = client_get_connection(cl); + + if (co) + { + assert(co->host); + if (co->host == host) + ; /* reusing connection. It's ours! */ + else + { + client_incref(cl); + connection_release(co); + co = 0; + } + } if (!co) { int max_connections = 0; @@ -481,7 +485,7 @@ int client_prep_connection(struct client *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) @@ -495,7 +499,8 @@ int client_prep_connection(struct client *cl, int num_connections = 0; for (co = host->connections; co; co = co->next) num_connections++; - if (reuse_connections) { + if (reuse_connections) + { for (co = host->connections; co; co = co->next) { if (connection_is_idle(co) && @@ -526,7 +531,7 @@ int client_prep_connection(struct client *cl, 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)); + yaz_log(YLOG_LOG, "out of connections %s", client_get_id(cl)); client_set_state(cl, Client_Error); yaz_mutex_leave(host->mutex); return 0; @@ -534,6 +539,7 @@ int client_prep_connection(struct client *cl, } 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; @@ -550,9 +556,10 @@ int client_prep_connection(struct client *cl, else { yaz_mutex_leave(host->mutex); - co = connection_create(cl, operation_timeout, session_timeout, + co = connection_create(cl, host, operation_timeout, session_timeout, iochan_man); } + assert(co->host); } if (co && co->link)