X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=f9b0e0b8fcd8ecb80bccf8fab3c3513a149a244b;hb=d84f89a5d8d75ea311c12a1ef89b7eea28c560fb;hp=18be84b3e24940758a4bebce99d0d6ca985f5268;hpb=75b739a3a4548b5c4c1875f23e765c101bf3aed2;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index 18be84b..f9b0e0b 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 Index Data + Copyright (C) 2006-2010 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 @@ -42,12 +42,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include "connection.h" -#include "eventl.h" -#include "pazpar2.h" +#include "session.h" #include "host.h" #include "client.h" #include "settings.h" -#include "parameters.h" /** \brief Represents a physical, reusable connection to a remote Z39.50 host @@ -57,20 +55,18 @@ struct connection { ZOOM_connection link; struct host *host; struct client *client; - char *ibuf; - int ibufsize; char *zproxy; enum { Conn_Resolving, Conn_Connecting, Conn_Open } state; + int operation_timeout; + int session_timeout; struct connection *next; // next for same host or next in free list }; -static struct connection *connection_freelist = 0; - -static int connection_connect(struct connection *con); +static int connection_connect(struct connection *con, iochan_man_t iochan_man); static int connection_is_idle(struct connection *co) { @@ -98,16 +94,17 @@ static void remove_connection_from_host(struct connection *con) { struct connection **conp = &con->host->connections; assert(con); + yaz_mutex_enter(con->host->mutex); while (*conp) { if (*conp == con) { *conp = (*conp)->next; - return; + break; } conp = &(*conp)->next; } - assert(*conp == 0); + yaz_mutex_leave(con->host->mutex); } // Close connection and recycle structure @@ -126,36 +123,36 @@ void connection_destroy(struct connection *co) client_disconnect(co->client); } xfree(co->zproxy); - co->zproxy = 0; - co->next = connection_freelist; - connection_freelist = co; + xfree(co); } // Creates a new connection for client, associated with the host of // client's database -static struct connection *connection_create(struct client *cl) +static struct connection *connection_create(struct client *cl, + int operation_timeout, + int session_timeout, + iochan_man_t iochan_man) { struct connection *new; struct host *host = client_get_host(cl); - if ((new = connection_freelist)) - connection_freelist = new->next; - else - { - new = xmalloc(sizeof (struct connection)); - new->ibuf = 0; - new->ibufsize = 0; - } + new = xmalloc(sizeof(*new)); new->host = host; + + yaz_mutex_enter(host->mutex); new->next = new->host->connections; new->host->connections = new; + yaz_mutex_leave(host->mutex); + new->client = cl; new->zproxy = 0; client_set_connection(cl, new); new->link = 0; new->state = Conn_Resolving; + new->operation_timeout = operation_timeout; + new->session_timeout = session_timeout; if (host->ipport) - connection_connect(new); + connection_connect(new, iochan_man); return new; } @@ -179,11 +176,14 @@ static void non_block_events(struct connection *co) case ZOOM_EVENT_END: { const char *error, *addinfo; - if (ZOOM_connection_error(link, &error, &addinfo)) + int err; + if ((err = ZOOM_connection_error(link, &error, &addinfo))) { yaz_log(YLOG_LOG, "Error %s from %s", error, client_get_url(cl)); } + iochan_settimeout(iochan, co->session_timeout); + client_set_diagnostic(cl, err); client_set_state(cl, Client_Idle); } break; @@ -195,13 +195,13 @@ static void non_block_events(struct connection *co) break; case ZOOM_EVENT_SEND_APDU: client_set_state(co->client, Client_Working); + iochan_settimeout(iochan, co->operation_timeout); break; case ZOOM_EVENT_RECV_APDU: break; case ZOOM_EVENT_CONNECT: yaz_log(YLOG_LOG, "Connected to %s", client_get_url(cl)); co->state = Conn_Open; - iochan_settimeout(iochan, global_parameters.z3950_session_timeout); break; case ZOOM_EVENT_RECV_SEARCH: client_search_response(cl); @@ -264,46 +264,52 @@ void connection_release(struct connection *co) { struct client *cl = co->client; - yaz_log(YLOG_DEBUG, "Connection release %s", co->host->hostport); if (!cl) return; client_set_connection(cl, 0); co->client = 0; } -void connect_resolver_host(struct host *host) +void connect_resolver_host(struct host *host, iochan_man_t iochan_man) { - struct connection *con = host->connections; + struct connection *con; + +start: + yaz_mutex_enter(host->mutex); + con = host->connections; while (con) { if (con->state == Conn_Resolving) { if (!host->ipport) /* unresolved */ { + yaz_mutex_leave(host->mutex); connection_destroy(con); + goto start; /* start all over .. at some point it will be NULL */ - con = host->connections; - continue; } else if (!con->client) { + yaz_mutex_leave(host->mutex); connection_destroy(con); /* start all over .. at some point it will be NULL */ - con = host->connections; - continue; + goto start; } else { - connection_connect(con); + 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; } - con = con->next; } + yaz_mutex_leave(host->mutex); } static struct host *connection_get_host(struct connection *con) @@ -333,15 +339,15 @@ static int maskfun(IOCHAN c) return ZOOM_connection_get_mask(co->link); } -static int connection_connect(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; + const char *charset; const char *sru; const char *sru_version = 0; - char ipport[512] = ""; struct session_database *sdb = client_get_database(con->client); const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); @@ -351,10 +357,12 @@ static int connection_connect(struct connection *con) assert(con); ZOOM_options_set(zoptions, "async", "1"); - ZOOM_options_set(zoptions, "implementationName", - global_parameters.implementationName); - ZOOM_options_set(zoptions, "implementationVersion", - global_parameters.implementationVersion); + ZOOM_options_set(zoptions, "implementationName", PACKAGE_NAME); + ZOOM_options_set(zoptions, "implementationVersion", VERSION); + + if ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET))) + ZOOM_options_set(zoptions, "charset", charset); + if (zproxy && *zproxy) { con->zproxy = xstrdup(zproxy); @@ -379,25 +387,27 @@ static int connection_connect(struct connection *con) } if (sru && *sru) - strcpy(ipport, "http://"); - strcat(ipport, host->ipport); - - ZOOM_connection_connect(link, ipport, 0); + { + char http_hostport[512]; + strcpy(http_hostport, "http://"); + strcat(http_hostport, host->hostport); + ZOOM_connection_connect(link, http_hostport, 0); + } + else + ZOOM_connection_connect(link, host->ipport, 0); con->link = link; con->iochan = iochan_create(0, connection_handler, 0); con->state = Conn_Connecting; - iochan_settimeout(con->iochan, global_parameters.z3950_connect_timeout); + iochan_settimeout(con->iochan, con->operation_timeout); iochan_setdata(con->iochan, con); iochan_setsocketfun(con->iochan, socketfun); iochan_setmaskfun(con->iochan, maskfun); - pazpar2_add_channel(con->iochan); + 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); - // This creates the connection - ZOOM_connection_process(link); return 0; } @@ -407,7 +417,9 @@ const char *connection_get_url(struct connection *co) } // Ensure that client has a connection associated -int client_prep_connection(struct client *cl) +int client_prep_connection(struct client *cl, + int operation_timeout, int session_timeout, + iochan_man_t iochan_man) { struct connection *co; struct session *se = client_get_session(cl); @@ -418,6 +430,9 @@ int client_prep_connection(struct client *cl) if (zproxy && zproxy[0] == '\0') zproxy = 0; + if (!host) + return 0; + co = client_get_connection(cl); yaz_log(YLOG_DEBUG, "Client prep %s", client_get_url(cl)); @@ -426,9 +441,10 @@ int client_prep_connection(struct client *cl) { // 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_session(co->client) != se) && + (!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))) @@ -443,13 +459,18 @@ int client_prep_connection(struct client *cl) connection_release(co); client_set_connection(cl, co); co->client = cl; + yaz_mutex_leave(host->mutex); + co->operation_timeout = operation_timeout; + co->session_timeout = session_timeout; /* tells ZOOM to reconnect if necessary. Disabled becuase the ZOOM_connection_connect flushes the task queue */ ZOOM_connection_connect(co->link, 0, 0); } else { - co = connection_create(cl); + yaz_mutex_leave(host->mutex); + co = connection_create(cl, operation_timeout, session_timeout, + iochan_man); } }