X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fdatabase.c;h=6f1599a8f404fdd1d53ae5e9a662b797d58c5fef;hb=ebf24e785974c368809d73394a24eb80506598fd;hp=b121e95b1ba654d1bf7e09eec8bdfff4d761e55c;hpb=03b971ecc3f02f7ac261f31db434176c6237abfb;p=pazpar2-moved-to-github.git

diff --git a/src/database.c b/src/database.c
index b121e95..6f1599a 100644
--- a/src/database.c
+++ b/src/database.c
@@ -63,7 +63,11 @@ struct database_criterion {
     struct database_criterion *next;
 };
 
-static struct host *hosts = 0;  /* thread pr */
+
+struct database_hosts {
+    struct host *hosts;
+    YAZ_MUTEX mutex;
+};
 
 static xmlDoc *get_explain_xml(struct conf_targetprofiles *targetprofiles,
                                const char *id)
@@ -105,18 +109,28 @@ static struct host *create_host(const char *hostport, iochan_man_t iochan_man)
     }
     yaz_mutex_create(&host->mutex);
 
-    host->next = hosts;
-    hosts = host;
     return host;
 }
 
-static struct host *find_host(const char *hostport, iochan_man_t iochan_man)
+static struct host *find_host(database_hosts_t hosts,
+                              const char *hostport, iochan_man_t iochan_man)
 {
     struct host *p;
-    for (p = hosts; p; p = p->next)
+    yaz_mutex_enter(hosts->mutex);
+    for (p = hosts->hosts; p; p = p->next)
         if (!strcmp(p->hostport, hostport))
-            return p;
-    return create_host(hostport, iochan_man);
+            break;
+    if (!p)
+    {
+        p = create_host(hostport, iochan_man);
+        if (p)
+        {
+            p->next = hosts->hosts;
+            hosts->hosts = p;
+        }
+    }
+    yaz_mutex_leave(hosts->mutex);
+    return p;
 }
 
 int resolve_database(struct conf_service *service, struct database *db)
@@ -129,7 +143,8 @@ int resolve_database(struct conf_service *service, struct database *db)
         strcpy(hostport, db->url);
         if ((p = strchr(hostport, '/')))
             *p = '\0';
-        if (!(host = find_host(hostport, service->server->iochan_man)))
+        if (!(host = find_host(service->server->database_hosts,
+                               hostport, service->server->iochan_man)))
             return -1;
         db->host = host;
     }
@@ -388,6 +403,15 @@ int predef_grep_databases(void *context, struct conf_service *service,
     return i;
 }
 
+database_hosts_t database_hosts_create(void)
+{
+    database_hosts_t p = xmalloc(sizeof(*p));
+    p->hosts = 0;
+    p->mutex = 0;
+    yaz_mutex_create(&p->mutex);
+    return p;
+}
+
 /*
  * Local variables:
  * c-basic-offset: 4