New setting setting: pz:max_connections

[pazpar2-moved-to-github.git] / src / session.c

diff --git a/src/session.c b/src/session.c
index aad56ea..14b9a2c 100644 (file)
--- a/src/session.c
+++ b/src/session.c
@@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <config.h>
 #endif
 
+#include <time.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -106,12 +107,12 @@ static void log_xml_doc(xmlDoc *doc)
 
 static void session_enter(struct session *s)
 {
-    yaz_mutex_enter(s->mutex);
+    yaz_mutex_enter(s->session_mutex);
 }
 
 static void session_leave(struct session *s)
 {
-    yaz_mutex_leave(s->mutex);
+    yaz_mutex_leave(s->session_mutex);
 }
 
 // Recursively traverse query structure to extract terms.
@@ -359,7 +360,7 @@ static int prepare_map(struct session *se, struct session_database *sdb)
             }
         }
         sdb->map = normalize_cache_get(se->normalize_cache,
-                                       se->service, s);
+                                       se->service->server->config, s);
         if (!sdb->map)
             return -1;
     }
@@ -462,16 +463,24 @@ static void select_targets_callback(void *context, struct session_database *db)
 
 static void session_remove_clients(struct session *se)
 {
-    struct client_list *l = se->clients;
+    struct client_list *l;
+
+    session_enter(se);
+    l = se->clients;
+    se->clients = 0;
+    session_leave(se);
+
     while (l)
     {
         struct client_list *l_next = l->next;
+        client_lock(l->client);
         client_set_session(l->client, 0);
+        client_set_database(l->client, 0);
+        client_unlock(l->client);
         client_destroy(l->client);
         xfree(l);
         l = l_next;
     }
-    se->clients = 0;
 }
 
 // Associates a set of clients with a session;
@@ -479,7 +488,6 @@ static void session_remove_clients(struct session *se)
 // setting overrides
 static int select_targets(struct session *se, const char *filter)
 {
-    session_remove_clients(se);
     return session_grep_databases(se, filter, select_targets_callback);
 }
 
@@ -506,16 +514,20 @@ enum pazpar2_error_code search(struct session *se,
     int no_working = 0;
     int no_failed = 0;
     struct client_list *l;
+    struct timespec abstime;
+    struct timeval tval;
 
     yaz_log(YLOG_DEBUG, "Search");
 
     *addinfo = 0;
+
+    session_remove_clients(se);
     
     session_enter(se);
     reclist_destroy(se->reclist);
     se->reclist = 0;
-    nmem_reset(se->nmem);
     relevance_destroy(&se->relevance);
+    nmem_reset(se->nmem);
     se->total_records = se->total_hits = se->total_merged = 0;
     se->num_termlists = 0;
     live_channels = select_targets(se, filter);
@@ -526,24 +538,30 @@ enum pazpar2_error_code search(struct session *se,
     }
     se->reclist = reclist_create(se->nmem);
 
+    gettimeofday(&tval, 0);
+    
+    abstime.tv_sec = tval.tv_sec + 5;
+    abstime.tv_nsec = tval.tv_usec * 1000;
+
     for (l = se->clients; l; l = l->next)
     {
         struct client *cl = l->client;
+
         if (maxrecs)
             client_set_maxrecs(cl, atoi(maxrecs));
         if (startrecs)
             client_set_startrecs(cl, atoi(startrecs));
         if (prepare_session_database(se, client_get_database(cl)) < 0)
-            continue;
-        // Parse query for target
-        if (client_parse_query(cl, query) < 0)
+            ;
+        else if (client_parse_query(cl, query) < 0)
             no_failed++;
         else
         {
             no_working++;
             if (client_prep_connection(cl, se->service->z3950_operation_timeout,
                                        se->service->z3950_session_timeout,
-                                       se->service->server->iochan_man))
+                                       se->service->server->iochan_man,
+                                       &abstime))
                 client_start_search(cl);
         }
     }
@@ -669,7 +687,7 @@ void destroy_session(struct session *s)
     reclist_destroy(s->reclist);
     nmem_destroy(s->nmem);
     service_destroy(s->service);
-    yaz_mutex_destroy(&s->mutex);
+    yaz_mutex_destroy(&s->session_mutex);
     wrbuf_destroy(s->wrbuf);
 }
 
@@ -700,9 +718,8 @@ struct session *new_session(NMEM nmem, struct conf_service *service,
         session->watchlist[i].fun = 0;
     }
     session->normalize_cache = normalize_cache_create();
-    session->mutex = 0;
-
-    pazpar2_mutex_create(&session->mutex, name);
+    session->session_mutex = 0;
+    pazpar2_mutex_create(&session->session_mutex, name);
 
     return session;
 }
@@ -1128,7 +1145,7 @@ int ingest_record(struct client *cl, const char *rec,
                   int record_no, NMEM nmem)
 {
     struct session *se = client_get_session(cl);
-    int ret;
+    int ret = 0;
     struct session_database *sdb = client_get_database(cl);
     struct conf_service *service = se->service;
     xmlDoc *xdoc = normalize_record(sdb, service, rec, nmem);
@@ -1155,9 +1172,14 @@ int ingest_record(struct client *cl, const char *rec,
         xmlFreeDoc(xdoc);
         return -1;
     }
+    client_unlock(cl);
     session_enter(se);
-    ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
+    client_lock(cl);
+    if (client_get_session(cl) == se)
+        ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm);
+    client_unlock(cl);
     session_leave(se);
+    client_lock(cl);
     
     xmlFreeDoc(xdoc);
     return ret;