X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=41e693c52403406ada3dee92c9a4fd05c4aca833;hb=8c24d1e84b45566c30a05008bedf71cce42d3d05;hp=0d77a9099b4ce657ab6f3a62ce4398faa3431245;hpb=84a59bac11f3eece56bb0f4cf107dcd462798cea;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index 0d77a90..41e693c 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) 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 @@ -75,8 +92,9 @@ struct connection { struct host *host; struct client *client; char *zproxy; + char *url; enum { - Conn_Resolving, + Conn_Closed, Conn_Connecting, Conn_Open } state; @@ -133,39 +151,42 @@ 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->url); if (co->client) { client_disconnect(co->client); } - remove_connection_from_host(co); xfree(co->zproxy); + xfree(co->url); xfree(co); connection_use(-1); } -// Creates a new connection for client, associated with the host of +// Creates a new connection for client, associated with the host of // client's database static struct connection *connection_create(struct client *cl, + const char *url, + 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; co->client = cl; + co->url = xstrdup(url); 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); @@ -193,12 +214,14 @@ static void non_block_events(struct connection *co) if (!cl) continue; ev = ZOOM_connection_last_event(link); - -#if 0 - yaz_log(YLOG_LOG, "%p Connection ZOOM_EVENT_%s", co, 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) + switch (ev) { + case ZOOM_EVENT_TIMEOUT: + break; case ZOOM_EVENT_END: { const char *error, *addinfo; @@ -206,8 +229,8 @@ 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)); - client_set_diagnostic(cl, err); + error, client_get_id(cl)); + client_set_diagnostic(cl, err, error, addinfo); client_set_state(cl, Client_Error); } else @@ -231,19 +254,19 @@ 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: client_search_response(cl); break; case ZOOM_EVENT_RECV_RECORD: - client_record_response(cl); - got_records = 1; + client_record_response(cl, &got_records); break; default: yaz_log(YLOG_LOG, "Unhandled event (%d) from %s", - ev, client_get_url(cl)); + ev, client_get_id(cl)); + break; } } if (got_records) @@ -251,6 +274,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); } } @@ -260,9 +284,18 @@ 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)); + { + struct client *cl = co->client; + + client_lock(cl); + non_block_events(co); + client_unlock(cl); + } + 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) @@ -273,30 +306,26 @@ static void connection_handler(IOCHAN iochan, int event) yaz_mutex_enter(host->mutex); cl = co->client; - if (!cl) + if (!cl) { /* no client associated with it.. We are probably getting 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)); + ZOOM_connection_fire_event_timeout(co->link); + client_lock(cl); + non_block_events(co); + client_unlock(cl); - client_set_state(cl, Client_Error); - connection_destroy(co); - } - else - { - yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl)); - connection_destroy(co); - } + remove_connection_from_host(co); yaz_mutex_leave(host->mutex); + connection_destroy(co); } else { @@ -306,7 +335,7 @@ static void connection_handler(IOCHAN iochan, int event) non_block_events(co); ZOOM_connection_fire_event_socket(co->link, event); - + non_block_events(co); client_unlock(cl); @@ -334,38 +363,39 @@ 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 (con->state == Conn_Closed) { - if (!host->ipport) /* unresolved */ + if (!host->ipport || !con->client) /* unresolved or no client */ { + 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) - { - 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; + struct session_database *sdb = client_get_database(con->client); + if (sdb) + { + yaz_mutex_leave(host->mutex); + client_start_search(con->client); + } + else + { + remove_connection_from_host(con); + yaz_mutex_leave(host->mutex); + connection_destroy(con); + } } + /* start all over .. at some point it will be NULL */ + yaz_mutex_enter(host->mutex); + con = host->connections; } else { - yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state); con = con->next; } } @@ -379,71 +409,113 @@ 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; const char *charset; const char *sru; const char *sru_version = 0; + const char *value; + WRBUF w; struct session_database *sdb = client_get_database(con->client); - const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG); + const char *memcached = session_setting_oneval(sdb, PZ_MEMCACHED); - assert(host->ipport); assert(con); ZOOM_options_set(zoptions, "async", "1"); 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) + if (memcached && *memcached) + ZOOM_options_set(zoptions, "memcached", memcached); + + assert(host->ipport); + if (host->proxy) + { + yaz_log(YLOG_LOG, "proxy=%s", host->ipport); + ZOOM_options_set(zoptions, "proxy", host->ipport); + } + else { - con->zproxy = xstrdup(zproxy); - ZOOM_options_set(zoptions, "proxy", zproxy); + assert(host->tproxy); + yaz_log(YLOG_LOG, "tproxy=%s", host->ipport); + ZOOM_options_set(zoptions, "tproxy", host->ipport); } + if (apdulog && *apdulog) ZOOM_options_set(zoptions, "apdulog", apdulog); - if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION))) - ZOOM_options_set(zoptions, "user", auth); + if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru) ZOOM_options_set(zoptions, "sru", sru); - if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION)) + 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 ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION))) + { + /* allow splitting user and reset with a blank always */ + const char *cp1 = strchr(auth, ' '); + if (!cp1 && sru && *sru) + cp1 = strchr(auth, '/'); + if (!cp1) + { + /* Z39.50 user/password style, or no password for SRU */ + ZOOM_options_set(zoptions, "user", auth); + } + else + { + /* now consider group as well */ + const char *cp2 = strchr(cp1 + 1, ' '); + + ZOOM_options_setl(zoptions, "user", auth, cp1 - auth); + if (!cp2) + ZOOM_options_set(zoptions, "password", cp1 + 1); + else + { + ZOOM_options_setl(zoptions, "group", cp1 + 1, cp2 - cp1 - 1); + ZOOM_options_set(zoptions, "password", cp2 + 1); + } + } + } + + value = session_setting_oneval(sdb, PZ_AUTHENTICATION_MODE); + if (value && *value) + ZOOM_options_set(zoptions, "authenticationMode", value); + + if (!(con->link = ZOOM_connection_create(zoptions))) { yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection"); ZOOM_options_destroy(zoptions); return -1; } - if (sru && *sru) + w = wrbuf_alloc(); + if (sru && *sru && !strstr(con->url, "://")) + wrbuf_puts(w, "http://"); + if (strchr(con->url, '#')) { - char http_hostport[512]; - strcpy(http_hostport, "http://"); - strcat(http_hostport, host->hostport); - ZOOM_connection_connect(link, http_hostport, 0); + const char *cp = strchr(con->url, '#'); + wrbuf_write(w, con->url, cp - con->url); } else - ZOOM_connection_connect(link, host->ipport, 0); - - con->link = link; + wrbuf_puts(w, con->url); + + ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0); + 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); + wrbuf_destroy(w); return 0; } @@ -454,24 +526,42 @@ 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); + const char *sru = session_setting_oneval(sdb, PZ_SRU); + struct host *host = 0; + int default_port = *sru ? 80 : 210; if (zproxy && zproxy[0] == '\0') zproxy = 0; + if (!url || !*url) + url = sdb->database->id; + + host = find_host(client_get_session(cl)->service->server->database_hosts, + url, zproxy, default_port, iochan_man); + + yaz_log(YLOG_DEBUG, "client_prep_connection: target=%s url=%s", + client_get_id(cl), url); if (!host) return 0; co = client_get_connection(cl); - - yaz_log(YLOG_DEBUG, "Client prep %s", client_get_url(cl)); - + if (co) + { + assert(co->host); + if (co->host == host && client_get_state(cl) == Client_Idle) + { + return 2; + } + connection_release(co); + co = 0; + } if (!co) { int max_connections = 0; - int reuse_connection = 0; + int reuse_connections = 1; const char *v = session_setting_oneval(client_get_database(cl), PZ_MAX_CONNECTIONS); if (v && *v) @@ -490,10 +580,12 @@ int client_prep_connection(struct client *cl, int num_connections = 0; for (co = host->connections; co; co = co->next) num_connections++; - if (reuse_connection) { - for (co = host->connections; reuse_connection && co; co = co->next) + if (reuse_connections) + { + for (co = host->connections; co; co = co->next) { if (connection_is_idle(co) && + !strcmp(url, co->url) && (!co->client || client_get_state(co->client) == Client_Idle) && !strcmp(ZOOM_connection_option_get(co->link, "user"), session_setting_oneval(client_get_database(cl), @@ -521,7 +613,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; @@ -529,6 +621,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; @@ -545,9 +638,11 @@ 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, url, host, + operation_timeout, session_timeout, iochan_man); } + assert(co->host); } if (co && co->link)