X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=da7c1a5cdbb9df047cd647cc978b156c76b9abdb;hb=d47362af8b5fa9d6298e783a662fa68ece809040;hp=260196c8396817fcab80253f0fb5442ba0338c8d;hpb=c9622100910b5393ed9169887f73a663e0bb40b9;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index 260196c..da7c1a5 100644 --- a/src/connection.c +++ b/src/connection.c @@ -47,6 +47,25 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "client.h" #include "settings.h" +/* connection counting (1) , disable connection counting (0) */ +#if 0 +static YAZ_MUTEX g_mutex = 0; +static int no_connections = 0; + +static void connection_use(int delta) +{ + if (!g_mutex) + yaz_mutex_create(&g_mutex); + yaz_mutex_enter(g_mutex); + no_connections += delta; + yaz_mutex_leave(g_mutex); + yaz_log(YLOG_LOG, "%s connections=%d", delta > 0 ? "INC" : "DEC", + no_connections); +} +#else +#define connection_use(x) +#endif + /** \brief Represents a physical, reusable connection to a remote Z39.50 host */ @@ -94,7 +113,6 @@ 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) @@ -104,11 +122,10 @@ static void remove_connection_from_host(struct connection *con) } conp = &(*conp)->next; } - yaz_mutex_leave(con->host->mutex); } // Close connection and recycle structure -void connection_destroy(struct connection *co) +static void connection_destroy(struct connection *co) { if (co->link) { @@ -125,6 +142,7 @@ void connection_destroy(struct connection *co) remove_connection_from_host(co); xfree(co->zproxy); xfree(co); + connection_use(-1); } // Creates a new connection for client, associated with the host of @@ -134,27 +152,29 @@ static struct connection *connection_create(struct client *cl, int session_timeout, iochan_man_t iochan_man) { - struct connection *new; + struct connection *co; struct host *host = client_get_host(cl); - new = xmalloc(sizeof(*new)); - new->host = host; + co = xmalloc(sizeof(*co)); + co->host = host; + + co->client = cl; + co->zproxy = 0; + client_set_connection(cl, co); + co->link = 0; + co->state = Conn_Resolving; + co->operation_timeout = operation_timeout; + co->session_timeout = session_timeout; + if (host->ipport) + connection_connect(co, iochan_man); yaz_mutex_enter(host->mutex); - new->next = new->host->connections; - new->host->connections = new; + co->next = co->host->connections; + co->host->connections = co; 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, iochan_man); - return new; + connection_use(1); + return co; } static void non_block_events(struct connection *co) @@ -173,7 +193,6 @@ static void non_block_events(struct connection *co) 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 @@ -220,16 +239,13 @@ static void non_block_events(struct connection *co) 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); } } } @@ -239,13 +255,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)); } static void connection_handler(IOCHAN iochan, int event) { struct connection *co = iochan_getdata(iochan); - struct client *cl = co->client; + struct client *cl; + struct host *host = co->host; + yaz_mutex_enter(host->mutex); + cl = co->client; if (!cl) { /* no client associated with it.. We are probably getting @@ -253,34 +274,51 @@ static void connection_handler(IOCHAN iochan, int event) package.. We will just close the connection */ yaz_log(YLOG_LOG, "timeout connection %p event=%d", co, event); connection_destroy(co); - return; + yaz_mutex_leave(host->mutex); } - if (event & EVENT_TIMEOUT) + else if (event & EVENT_TIMEOUT) { if (co->state == Conn_Connecting) { yaz_log(YLOG_WARN, "connect timeout %s", client_get_url(cl)); - client_fatal(cl); + + client_set_state(cl, Client_Error); + connection_destroy(co); } - else + else if (client_get_state(co->client) == Client_Idle) { yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl)); connection_destroy(co); } + else + { + yaz_log(YLOG_LOG, "ignore timeout %s", client_get_url(cl)); + } + yaz_mutex_leave(host->mutex); } else { + yaz_mutex_leave(host->mutex); + + client_lock(cl); non_block_events(co); ZOOM_connection_fire_event_socket(co->link, event); non_block_events(co); + client_unlock(cl); + + if (co->link) + { + iochan_setflags(iochan, ZOOM_connection_get_mask(co->link)); + iochan_setfd(iochan, ZOOM_connection_get_socket(co->link)); + } } } // Disassociate connection from client -void connection_release(struct connection *co) +static void connection_release(struct connection *co) { struct client *cl = co->client; @@ -337,28 +375,6 @@ static struct host *connection_get_host(struct connection *con) return con->host; } -// Callback for use by event loop -// We do this because ZOOM connections don't always have (the same) sockets -static int socketfun(IOCHAN c) -{ - struct connection *co = iochan_getdata(c); - if (!co->link) - return -1; - return ZOOM_connection_get_socket(co->link); -} - -// Because ZOOM always knows what events it is interested in; we may not -static int maskfun(IOCHAN c) -{ - struct connection *co = iochan_getdata(c); - if (!co->link) - return 0; - - // This is cheating a little, and assuming that eventl mask IDs are always - // the same as ZOOM-C's. - return ZOOM_connection_get_mask(co->link); -} - static int connection_connect(struct connection *con, iochan_man_t iochan_man) { ZOOM_connection link = 0; @@ -421,8 +437,6 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) con->state = Conn_Connecting; iochan_settimeout(con->iochan, con->operation_timeout); iochan_setdata(con->iochan, con); - iochan_setsocketfun(con->iochan, socketfun); - iochan_setmaskfun(con->iochan, maskfun); iochan_add(iochan_man, con->iochan); /* this fragment is bad DRY: from client_prep_connection */ @@ -431,11 +445,6 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man) return 0; } -const char *connection_get_url(struct connection *co) -{ - return client_get_url(co->client); -} - // Ensure that client has a connection associated int client_prep_connection(struct client *cl, int operation_timeout, int session_timeout,