X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fconnection.c;h=fecf51b9fd7f4a04278ae7f5e32f64cdfb1704d9;hb=55d2a488196632a7c297795a173e85d5cbf7989a;hp=dd61f1c1fb9845f99858a45da7c2e03c00066a63;hpb=d24d65a3a42bbb6e8c8d0f919bf33510dd356a45;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index dd61f1c..fecf51b 100644 --- a/src/connection.c +++ b/src/connection.c @@ -42,7 +42,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #include "connection.h" -#include "pazpar2.h" +#include "session.h" #include "host.h" #include "client.h" #include "settings.h" @@ -55,8 +55,6 @@ struct connection { ZOOM_connection link; struct host *host; struct client *client; - char *ibuf; - int ibufsize; char *zproxy; enum { Conn_Resolving, @@ -68,8 +66,6 @@ struct connection { struct connection *next; // next for same host or next in free list }; -static struct connection *connection_freelist = 0; /* thread pr */ - static int connection_connect(struct connection *con, iochan_man_t iochan_man); static int connection_is_idle(struct connection *co) @@ -83,7 +79,7 @@ static int connection_is_idle(struct connection *co) if (!ZOOM_connection_is_idle(link)) return 0; event = ZOOM_connection_peek_event(link); - if (event == ZOOM_EVENT_NONE || event == ZOOM_EVENT_END) + if (event == ZOOM_EVENT_NONE) return 1; else return 0; @@ -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 @@ -120,15 +117,14 @@ void connection_destroy(struct connection *co) } yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport); - remove_connection_from_host(co); if (co->client) { client_disconnect(co->client); } + + remove_connection_from_host(co); 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 @@ -141,17 +137,14 @@ static struct connection *connection_create(struct client *cl, 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); @@ -166,16 +159,21 @@ static struct connection *connection_create(struct client *cl, static void non_block_events(struct connection *co) { - struct client *cl = co->client; + int got_records = 0; IOCHAN iochan = co->iochan; ZOOM_connection link = co->link; while (1) { + struct client *cl = co->client; int ev; int r = ZOOM_event_nonblock(1, &link); if (!r) break; + if (!cl) + continue; ev = ZOOM_connection_last_event(link); + + client_incref(cl); #if 0 yaz_log(YLOG_LOG, "ZOOM_EVENT_%s", ZOOM_get_event_str(ev)); #endif @@ -216,11 +214,23 @@ static void non_block_events(struct connection *co) break; case ZOOM_EVENT_RECV_RECORD: client_record_response(cl); + got_records = 1; break; default: yaz_log(YLOG_LOG, "Unhandled event (%d) from %s", ev, client_get_url(cl)); } + client_destroy(cl); + } + if (got_records) + { + struct client *cl = co->client; + if (cl) + { + client_incref(cl); + client_got_records(cl); + client_destroy(cl); + } } } @@ -233,16 +243,15 @@ static void connection_handler(IOCHAN iochan, int event) { struct connection *co = iochan_getdata(iochan); struct client *cl = co->client; - struct session *se = 0; - if (cl) - se = client_get_session(cl); - else + 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 */ connection_destroy(co); return; } - if (event & EVENT_TIMEOUT) { if (co->state == Conn_Connecting) @@ -272,7 +281,6 @@ 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); @@ -281,37 +289,44 @@ void connection_release(struct connection *co) 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 { + 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) @@ -399,7 +414,7 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) ZOOM_connection_connect(link, host->ipport, 0); con->link = link; - con->iochan = iochan_create(0, connection_handler, 0); + con->iochan = iochan_create(0, connection_handler, 0, "connection_socket"); con->state = Conn_Connecting; iochan_settimeout(con->iochan, con->operation_timeout); iochan_setdata(con->iochan, con); @@ -424,7 +439,6 @@ int client_prep_connection(struct client *cl, iochan_man_t iochan_man) { struct connection *co; - struct session *se = client_get_session(cl); struct host *host = client_get_host(cl); struct session_database *sdb = client_get_database(cl); const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); @@ -443,9 +457,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))) @@ -460,6 +475,7 @@ 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 @@ -468,6 +484,7 @@ int client_prep_connection(struct client *cl, } else { + yaz_mutex_leave(host->mutex); co = connection_create(cl, operation_timeout, session_timeout, iochan_man); }