X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=f95beb1d92c97626a746c10295a4b4209b95cfc0;hb=ce617dd90a2dc6632e7475ab73a887e0fb472c5c;hp=81705901b6863e02b9199ca66eb8f5046c21ff24;hpb=342d4f2a3eb9f281e4e7c20c5daa3432f8a321ef;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 8170590..f95beb1 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -122,6 +122,7 @@ static void remove_connection_from_host(struct connection *con)
         }
         conp = &(*conp)->next;
     }
+    yaz_cond_broadcast(con->host->cond_ready);
 }
 
 // Close connection and recycle structure
@@ -210,6 +211,7 @@ static void non_block_events(struct connection *co)
                 iochan_settimeout(iochan, co->session_timeout);
 		client_set_diagnostic(cl, err);
                 client_set_state(cl, Client_Idle);
+                yaz_cond_broadcast(co->host->cond_ready);
             }
             break;
         case ZOOM_EVENT_SEND_DATA:
@@ -255,6 +257,8 @@ 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)
@@ -305,6 +309,12 @@ static void connection_handler(IOCHAN iochan, int 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));
+        }
     }
 }
 
@@ -367,28 +377,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;
@@ -451,8 +439,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 */
@@ -464,7 +450,8 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
 // 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 timespec *abstime)
 {
     struct connection *co;
     struct host *host = client_get_host(cl);
@@ -483,21 +470,56 @@ int client_prep_connection(struct client *cl,
 
     if (!co)
     {
+        int max_connections = 30;
+        const char *v = session_setting_oneval(client_get_database(cl),
+                                               PZ_MAX_CONNECTIONS);
+        if (v && *v)
+            max_connections = atoi(v);
+        
         // 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)))
+        while (1)
+        {
+            int num_connections = 0;
+            for (co = host->connections; co; co = co->next)
+                num_connections++;
+            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)
             {
-                if (zproxy == 0 && co->zproxy == 0)
-                    break;
-                if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy))
-                    break;
+                yaz_log(YLOG_LOG, "num_connections = %d (reusing)",
+                        num_connections);
+                break;
             }
+            if (num_connections < max_connections)
+            {
+                yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d",
+                        num_connections, max_connections);
+                break;
+            }
+            yaz_log(YLOG_LOG, "num_connections = %d (waiting) max = %d",
+                    num_connections, max_connections);
+            if (yaz_cond_wait(host->cond_ready, host->mutex, abstime))
+            {
+                yaz_log(YLOG_LOG, "out of connections %s", client_get_url(cl));
+                client_set_state(cl, Client_Error);
+                yaz_mutex_leave(host->mutex);
+                return 0;
+            }
+        }
         if (co)
         {
             connection_release(co);