X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=5a5f2075b9674d3cc6c30c32f8ea6830c8e5c98f;hb=refs%2Fheads%2Fsession_lock;hp=e441514578bcdb9245c8a381c2cc1a8df0e2728b;hpb=c7ce18b91b4b542af4f02ad9fa3f86f12b92f3d1;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index e441514..5a5f207 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2012 Index Data + Copyright (C) 2006-2013 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 @@ -92,6 +92,7 @@ struct connection { struct host *host; struct client *client; char *zproxy; + char *url; enum { Conn_Closed, Conn_Connecting, @@ -150,7 +151,7 @@ static void connection_destroy(struct connection *co) ZOOM_connection_destroy(co->link); iochan_destroy(co->iochan); } - yaz_log(YLOG_DEBUG, "%p Connection destroy %s", co, co->host->url); + yaz_log(YLOG_DEBUG, "%p Connection destroy %s", co, co->url); if (co->client) { @@ -158,13 +159,15 @@ static void connection_destroy(struct connection *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, @@ -176,13 +179,14 @@ static struct connection *connection_create(struct client *cl, co->host = host; co->client = cl; + co->url = xstrdup(url); co->zproxy = 0; client_set_connection(cl, co); co->link = 0; co->state = Conn_Closed; co->operation_timeout = operation_timeout; co->session_timeout = session_timeout; - + if (host->ipport) connection_connect(co, iochan_man); @@ -195,7 +199,7 @@ static struct connection *connection_create(struct client *cl, return co; } -static void non_block_events(struct connection *co) +static void non_block_events_unlocked(struct connection *co) { int got_records = 0; IOCHAN iochan = co->iochan; @@ -210,12 +214,14 @@ static void non_block_events(struct connection *co) if (!cl) continue; ev = ZOOM_connection_last_event(link); - + #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; @@ -224,7 +230,7 @@ static void non_block_events(struct connection *co) { yaz_log(YLOG_LOG, "Error %s from %s", error, client_get_id(cl)); - client_set_diagnostic(cl, err, addinfo); + client_set_diagnostic(cl, err, error, addinfo); client_set_state(cl, Client_Error); } else @@ -255,8 +261,7 @@ static void non_block_events(struct connection *co) 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", @@ -275,23 +280,19 @@ static void non_block_events(struct connection *co) } } +static void non_block_events(struct client *cl, struct connection *co) +{ + session_enter_rw(client_get_session(cl), "non_block_events"); + non_block_events_unlocked(co); + session_leave_rw(client_get_session(cl), "non_block_events"); +} + void connection_continue(struct connection *co) { int r = ZOOM_connection_exec_task(co->link); if (!r) { - 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, addinfo); - client_set_state_nb(co->client, Client_Error); - } - } + non_block_events_unlocked(co); } else { @@ -308,7 +309,7 @@ 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 @@ -320,34 +321,21 @@ static void connection_handler(IOCHAN iochan, int event) } else if (event & EVENT_TIMEOUT) { - if (co->state == Conn_Connecting) - { - yaz_log(YLOG_WARN, "%p connect timeout %s", co, client_get_id(cl)); + ZOOM_connection_fire_event_timeout(co->link); - client_set_state(cl, Client_Error); - remove_connection_from_host(co); - yaz_mutex_leave(host->mutex); - connection_destroy(co); - } - else - { - 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); - } + remove_connection_from_host(co); + yaz_mutex_leave(host->mutex); + connection_destroy(co); } else { yaz_mutex_leave(host->mutex); - client_lock(cl); - non_block_events(co); + non_block_events(cl, co); ZOOM_connection_fire_event_socket(co->link, event); - - non_block_events(co); - client_unlock(cl); + + non_block_events(cl, co); if (co->link) { @@ -373,36 +361,37 @@ 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_Closed) { - 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) + if (!host->ipport || !con->client) /* unresolved or no 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; + struct session_database *sdb = client_get_database(con->client); + if (sdb) + { + yaz_mutex_leave(host->mutex); + connection_connect(con, iochan_man); + 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 { @@ -435,10 +424,10 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) 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); - + assert(host->ipport); if (host->proxy) { @@ -450,7 +439,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) 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); @@ -459,7 +448,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) 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 (!(con->link = ZOOM_connection_create(zoptions))) @@ -469,17 +458,25 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) return -1; } - if (sru && *sru) + if (sru && *sru && !strstr(con->url, "://")) + { + WRBUF w = wrbuf_alloc(); + wrbuf_puts(w, "http://"); + wrbuf_puts(w, con->url); + ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0); + wrbuf_destroy(w); + } + else if (strchr(con->url, '#')) { - char http_hostport[512]; - strcpy(http_hostport, "http://"); - strcat(http_hostport, host->url); - yaz_log(YLOG_LOG, "SRU connect to : %s", http_hostport); - ZOOM_connection_connect(con->link, http_hostport, 0); + const char *cp = strchr(con->url, '#'); + WRBUF w = wrbuf_alloc(); + wrbuf_write(w, con->url, cp - con->url); + ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0); + wrbuf_destroy(w); } else { - ZOOM_connection_connect(con->link, host->url, 0); + ZOOM_connection_connect(con->link, con->url, 0); } con->iochan = iochan_create(-1, connection_handler, 0, "connection_socket"); con->state = Conn_Connecting; @@ -521,7 +518,6 @@ int client_prep_connection(struct client *cl, return 0; co = client_get_connection(cl); - if (co) { assert(co->host); @@ -529,7 +525,6 @@ int client_prep_connection(struct client *cl, { return 2; } - client_incref(cl); connection_release(co); co = 0; } @@ -541,7 +536,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) @@ -560,6 +555,7 @@ int client_prep_connection(struct client *cl, 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), @@ -612,7 +608,8 @@ int client_prep_connection(struct client *cl, else { yaz_mutex_leave(host->mutex); - co = connection_create(cl, host, operation_timeout, session_timeout, + co = connection_create(cl, url, host, + operation_timeout, session_timeout, iochan_man); } assert(co->host);