X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fconnection.c;h=f205252931db0b86585f9a16a96a1e785f7e32f0;hb=69d77699072d43a5292ac4b8af55e7d401e21f80;hp=1e3717110ca12b9e9632b936da6ff2f26eed2b83;hpb=549be30350c8fdc06467a7633938b975be23f14f;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 1e37171..f205252 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 <yaz/comstack.h>
 #include <yaz/tcpip.h>
 #include "connection.h"
-#include "pazpar2.h"
+#include "session.h"
 #include "host.h"
 #include "client.h"
 #include "settings.h"
@@ -66,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)
@@ -96,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
@@ -124,9 +123,7 @@ void connection_destroy(struct connection *co)
         client_disconnect(co->client);
     }
     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 
@@ -139,15 +136,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 = 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);
@@ -268,7 +264,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);
@@ -277,37 +272,43 @@ 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;
+
+    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);
                 /* 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;
             }
             else
             {
+                yaz_mutex_leave(host->mutex);
                 connection_connect(con, iochan_man);
                 client_start_search(con->client);
+                con = host->connections;
             }
         }
         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)
@@ -439,9 +440,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)))
@@ -456,6 +458,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
@@ -464,6 +467,7 @@ int client_prep_connection(struct client *cl,
         }
         else
         {
+            yaz_mutex_leave(host->mutex);
             co = connection_create(cl, operation_timeout, session_timeout,
                                    iochan_man);
         }