X-Git-Url: http://git.indexdata.com/?p=pazpar2-moved-to-github.git;a=blobdiff_plain;f=src%2Fconnection.c;h=80d6ec0a8f20d71cc674acf4aa4707990e92b7e5;hp=cfa114613f64b798372d6a0c070b8c728bc0429c;hb=HEAD;hpb=70d61c514058eb5e6da0c8b2f436e89ea7d20b1d

diff --git a/src/connection.c b/src/connection.c
index cfa1146..80d6ec0 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
@@ -43,21 +43,56 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/tcpip.h>
 #include "connection.h"
 #include "session.h"
-#include "host.h"
 #include "client.h"
 #include "settings.h"
 
+/* connection counting (1) , disable connection counting (0) */
+#if 1
+static YAZ_MUTEX g_mutex = 0;
+static int no_connections = 0;
+static int total_no_connections = 0;
+
+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
+
 
 /** \brief Represents a physical, reusable  connection to a remote Z39.50 host
  */
 struct connection {
     IOCHAN iochan;
     ZOOM_connection link;
-    struct host *host;
     struct client *client;
     char *zproxy;
+    char *url;
     enum {
-        Conn_Resolving,
+        Conn_Closed,
         Conn_Connecting,
         Conn_Open
     } state;
@@ -68,93 +103,71 @@ struct connection {
 
 static int connection_connect(struct connection *con, iochan_man_t iochan_man);
 
-static int connection_is_idle(struct connection *co)
-{
-    ZOOM_connection link = co->link;
-    int event;
-
-    if (co->state != Conn_Open || !link)
-        return 0;
-
-    if (!ZOOM_connection_is_idle(link))
-        return 0;
-    event = ZOOM_connection_peek_event(link);
-    if (event == ZOOM_EVENT_NONE)
-        return 1;
-    else
-        return 0;
-}
-
 ZOOM_connection connection_get_link(struct connection *co)
 {
     return co->link;
 }
 
-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;
-            break;
-        }
-        conp = &(*conp)->next;
-    }
-    yaz_mutex_leave(con->host->mutex);
+void connection_mark_dead(struct connection *co)
+{ 
+    iochan_settimeout(co->iochan, 1);
 }
 
 // Close connection and recycle structure
-void connection_destroy(struct connection *co)
+static void connection_destroy(struct connection *co)
 {
     if (co->link)
     {
         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,
+                                            const char *zproxy,
                                             int operation_timeout,
                                             int session_timeout,
                                             iochan_man_t iochan_man)
 {
-    struct connection *new;
-    struct host *host = client_get_host(cl);
-
-    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, iochan_man);
-    return new;
+    struct connection *co;
+    int ret;
+
+    co = xmalloc(sizeof(*co));
+
+    co->client = cl;
+    co->url = xstrdup(url);
+    co->zproxy = 0;
+    if (zproxy)
+        co->zproxy = xstrdup(zproxy);
+
+    client_set_connection(cl, co);
+    co->link = 0;
+    co->state = Conn_Closed;
+    co->operation_timeout = operation_timeout;
+    co->session_timeout = session_timeout;
+
+    ret = connection_connect(co, iochan_man);
+    connection_use(1);
+    if (ret)
+    {   /* error */
+        connection_destroy(co);
+        co = 0;
+    }
+    return co;
 }
 
 static void non_block_events(struct connection *co)
@@ -172,25 +185,32 @@ static void non_block_events(struct connection *co)
         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));
+
+#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;
-		int err;
+                int err;
                 if ((err = ZOOM_connection_error(link, &error, &addinfo)))
                 {
-                    yaz_log(YLOG_LOG, "Error %s from %s",
-                            error, client_get_url(cl));
+                    struct session *se = client_get_session(cl);
+
+                    session_log(se, YLOG_WARN, "%s: Error %s (%s)",
+                                client_get_id(cl), error, addinfo);
+                    client_set_diagnostic(cl, err, error, addinfo);
+                    client_set_state(cl, Client_Error);
+                }
+                else
+                {
+                    iochan_settimeout(iochan, co->session_timeout);
+                    client_set_state(cl, Client_Idle);
                 }
-                iochan_settimeout(iochan, co->session_timeout);
-		client_set_diagnostic(cl, err);
-                client_set_state(cl, Client_Idle);
             }
             break;
         case ZOOM_EVENT_SEND_DATA:
@@ -206,288 +226,253 @@ 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));
             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;
+        case ZOOM_EVENT_NONE:
             break;
         default:
             yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
-                    ev, client_get_url(cl));
+                    ev, client_get_id(cl));
+            break;
         }
-        client_destroy(cl);
     }
     if (got_records)
     {
         struct client *cl = co->client;
         if (cl)
-        {
-            client_incref(cl); 
             client_got_records(cl);
-            client_destroy(cl);
-        }
+    }
+}
+
+static void iochan_update(struct connection *co)
+{
+    if (co->link)
+    {
+        int m = ZOOM_connection_get_mask(co->link);
+
+        if (m == 0)
+            m = ZOOM_SELECT_READ;
+        iochan_setflags(co->iochan, m);
+        iochan_setfd(co->iochan, ZOOM_connection_get_socket(co->link));
     }
 }
 
 void connection_continue(struct connection *co)
 {
-    non_block_events(co);
+    int r = ZOOM_connection_exec_task(co->link);
+    if (!r)
+    {
+        struct client *cl = co->client;
+
+        client_lock(cl);
+        non_block_events(co);
+        client_unlock(cl);
+    }
+    else
+        iochan_update(co);
 }
 
 static void connection_handler(IOCHAN iochan, int event)
 {
     struct connection *co = iochan_getdata(iochan);
-    struct client *cl = co->client;
+    struct client *cl;
 
-    if (!cl) 
+    cl = co->client;
+    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);
-        return;
     }
-    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);
-        }
-        else
-        {
-            yaz_log(YLOG_LOG,  "idle timeout %s", client_get_url(cl));
-            connection_destroy(co);
-        }
+        ZOOM_connection_fire_event_timeout(co->link);
+        client_lock(cl);
+        non_block_events(co);
+        client_unlock(cl);
+
+        connection_destroy(co);
     }
     else
     {
+        if (ZOOM_connection_is_idle(co->link))
+        {
+            connection_destroy(co);
+            return;
+        }
+        client_lock(cl);
         non_block_events(co);
 
         ZOOM_connection_fire_event_socket(co->link, event);
-        
-        non_block_events(co);
-    }
-}
-
-
-// Disassociate connection from client
-void connection_release(struct connection *co)
-{
-    struct client *cl = co->client;
 
-    if (!cl)
-        return;
-    client_set_connection(cl, 0);
-    co->client = 0;
-}
-
-void connect_resolver_host(struct host *host, iochan_man_t iochan_man)
-{
-    struct connection *con;
+        non_block_events(co);
+        client_unlock(cl);
 
-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 */
-            }
-            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;
-            }
-        }
-        else
-        {
-            yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
-            con = con->next;
-        }
+        iochan_update(co);
     }
-    yaz_mutex_leave(host->mutex);
 }
 
-static struct host *connection_get_host(struct connection *con)
+void connection_release2(struct connection *co)
 {
-    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);
+    co->client = 0;
 }
 
 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;
+    int r = 0;
+    WRBUF w;
 
-    struct session_database *sdb = client_get_database(con->client);
-    const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
+    struct client *cl = con->client;
+    struct session_database *sdb = client_get_database(cl);
     const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
+    struct session *se = client_get_session(cl);
+    const char *memcached = session_setting_oneval(sdb, PZ_MEMCACHED);
+    const char *redis = session_setting_oneval(sdb, PZ_REDIS);
 
-    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);
+    if (redis && *redis)
+        ZOOM_options_set(zoptions, "redis", redis);
+
+    if (con->zproxy)
     {
-        con->zproxy = xstrdup(zproxy);
-        ZOOM_options_set(zoptions, "proxy", zproxy);
+        yaz_log(YLOG_LOG, "proxy=%s", con->zproxy);
+        ZOOM_options_set(zoptions, "proxy", con->zproxy);
     }
     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)))
     {
-        yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");
+        /* 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)))
+    {
+        session_log(se, YLOG_WARN, "%s: ZOOM_connection_create failed",
+                    client_get_id(cl));
         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;
-    con->iochan = iochan_create(0, connection_handler, 0);
+        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_setsocketfun(con->iochan, socketfun);
-    iochan_setmaskfun(con->iochan, maskfun);
-    iochan_add(iochan_man, con->iochan);
-
-    /* this fragment is bad DRY: from client_prep_connection */
-    client_set_state(con->client, Client_Connecting);
+    if (iochan_add(iochan_man, con->iochan, 20))
+    {
+        session_log(se, YLOG_WARN, "%s: out of connections", client_get_id(cl));
+        iochan_destroy(con->iochan);
+        con->iochan = 0;
+        ZOOM_connection_destroy(con->link);
+        con->link = 0;
+        r = -1;
+    }
+    else
+    {
+        client_set_state(cl, Client_Connecting);
+    }
     ZOOM_options_destroy(zoptions);
-    return 0;
-}
-
-const char *connection_get_url(struct connection *co)
-{
-    return client_get_url(co->client);
+    wrbuf_destroy(w);
+    return r;
 }
 
 // Ensure that client has a connection associated
 int client_prep_connection(struct client *cl,
                            int operation_timeout, int session_timeout,
-                           iochan_man_t iochan_man)
+                           iochan_man_t iochan_man,
+                           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);
 
     if (zproxy && zproxy[0] == '\0')
         zproxy = 0;
 
-    if (!host)
-        return 0;
-
-    co = client_get_connection(cl);
+    if (!url || !*url)
+        url = sdb->database->id;
 
-    yaz_log(YLOG_DEBUG, "Client prep %s", client_get_url(cl));
+    yaz_log(YLOG_DEBUG, "client_prep_connection: target=%s url=%s",
+            client_get_id(cl), url);
 
+    co = client_get_connection(cl);
+    if (co)
+        return 2;
     if (!co)
     {
-        // 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_state(co->client) == Client_Idle) &&
-                !strcmp(ZOOM_connection_option_get(co->link, "user"),
-                        session_setting_oneval(client_get_database(cl),
-                                               PZ_AUTHENTICATION)))
-            {
-                if (zproxy == 0 && co->zproxy == 0)
-                    break;
-                if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy))
-                    break;
-            }
-        if (co)
-        {
-            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
-        {
-            yaz_mutex_leave(host->mutex);
-            co = connection_create(cl, operation_timeout, session_timeout,
-                                   iochan_man);
-        }
+        co = connection_create(cl, url, zproxy,
+                               operation_timeout, session_timeout,
+                               iochan_man);
     }
 
     if (co && co->link)