X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=436d4e160396a42138a16da4980fe2927005d291;hb=1fc1b045b89c4122c305aa0127c06dde4dc4d0a8;hp=e3a290fa9fc7c070434f954df0558e4c4ef60c5d;hpb=1b761ca7a958b482d899a70a8591ffcc1f42026f;p=pazpar2-moved-to-github.git

diff --git a/src/http_command.c b/src/http_command.c
index e3a290f..436d4e1 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2010 Index Data
+   Copyright (C) 2006-2011 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
@@ -33,13 +33,40 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/snprintf.h>
 #include <yaz/yaz-util.h>
 
+#include "ppmutex.h"
 #include "eventl.h"
 #include "parameters.h"
-#include "pazpar2.h"
+#include "session.h"
 #include "http.h"
 #include "settings.h"
 #include "client.h"
 
+#ifdef HAVE_MALLINFO
+#include <malloc.h>
+
+void print_meminfo(WRBUF wrbuf)
+{
+    struct mallinfo minfo;
+    minfo = mallinfo();
+    wrbuf_printf(wrbuf, "  <memory>\n"
+                        "   <arena>%d</arena>\n" 
+                        "   <uordblks>%d</uordblks>\n"
+                        "   <fordblks>%d</fordblks>\n"
+                        "   <ordblks>%d</ordblks>\n"
+                        "   <keepcost>%d</keepcost>\n"
+                        "   <hblks>%d</hblks>\n" 
+                        "   <hblkhd>%d</hblkhd>\n"
+                        "   <virt>%d</virt>\n"
+                        "   <virtuse>%d</virtuse>\n"
+                        "  </memory>\n", 
+                 minfo.arena, minfo.uordblks, minfo.fordblks,minfo.ordblks, minfo.keepcost, minfo.hblks, minfo.hblkhd, minfo.arena + minfo.hblkhd, minfo.uordblks + minfo.hblkhd);
+
+}
+#else
+#define print_meminfo(x)
+#endif
+
+
 // Update this when the protocol changes
 #define PAZPAR2_PROTOCOL_VERSION "1"
 
@@ -50,11 +77,63 @@ struct http_session {
     struct session *psession;
     unsigned int session_id;
     int timestamp;
+    int destroy_counter;
+    int activity_counter;
     NMEM nmem;
+    http_sessions_t http_sessions;
     struct http_session *next;
 };
 
-static struct http_session *session_list = 0; /* thread pr */
+struct http_sessions {
+    struct http_session *session_list;
+    YAZ_MUTEX mutex;
+    int log_level;
+};
+
+static YAZ_MUTEX g_http_session_mutex = 0;
+static int g_http_sessions = 0;
+
+int http_session_use(int delta)
+{
+    int sessions;
+    if (!g_http_session_mutex)
+        yaz_mutex_create(&g_http_session_mutex);
+    yaz_mutex_enter(g_http_session_mutex);
+    g_http_sessions += delta;
+    sessions = g_http_sessions;
+    yaz_mutex_leave(g_http_session_mutex);
+    yaz_log(YLOG_DEBUG, "%s sessions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), sessions);
+    return sessions;
+
+}
+
+http_sessions_t http_sessions_create(void)
+{
+    http_sessions_t hs = xmalloc(sizeof(*hs));
+    hs->session_list = 0;
+    hs->mutex = 0;
+    pazpar2_mutex_create(&hs->mutex, "http_sessions");
+    hs->log_level = yaz_log_module_level("HTTP");
+    return hs;
+}
+
+void http_sessions_destroy(http_sessions_t hs)
+{
+    if (hs)
+    {
+        struct http_session *s = hs->session_list;
+        while (s)
+        {
+            struct http_session *s_next = s->next;
+            iochan_destroy(s->timeout_iochan);
+            destroy_session(s->psession);
+            nmem_destroy(s->nmem);
+            s = s_next;
+        }
+        yaz_mutex_destroy(&hs->mutex);
+        xfree(hs);
+    }
+}
 
 void http_session_destroy(struct http_session *s);
 
@@ -64,39 +143,71 @@ static void session_timeout(IOCHAN i, int event)
     http_session_destroy(s);
 }
 
-struct http_session *http_session_create(struct conf_service *service)
+struct http_session *http_session_create(struct conf_service *service,
+                                         http_sessions_t http_sessions,
+                                         unsigned int sesid)
 {
     NMEM nmem = nmem_create();
     struct http_session *r = nmem_malloc(nmem, sizeof(*r));
+    char tmp_str[50];
 
-    r->psession = new_session(nmem, service);
-    r->session_id = 0;
+    sprintf(tmp_str, "session#%u", sesid);
+    r->psession = new_session(nmem, service, sesid);
+    r->session_id = sesid;
     r->timestamp = 0;
     r->nmem = nmem;
-    r->next = session_list;
-    session_list = r;
-    r->timeout_iochan = iochan_create(-1, session_timeout, 0);
+    r->destroy_counter = r->activity_counter = 0;
+    r->http_sessions = http_sessions;
+
+    yaz_mutex_enter(http_sessions->mutex);
+    r->next = http_sessions->session_list;
+    http_sessions->session_list = r;
+    yaz_mutex_leave(http_sessions->mutex);
+
+    r->timeout_iochan = iochan_create(-1, session_timeout, 0, "http_session_timeout");
     iochan_setdata(r->timeout_iochan, r);
+    yaz_log(http_sessions->log_level, "%p Session %u created. timeout chan=%p timeout=%d", r, sesid, r->timeout_iochan, service->session_timeout);
     iochan_settimeout(r->timeout_iochan, service->session_timeout);
 
-    pazpar2_add_channel(r->timeout_iochan);
+    iochan_add(service->server->iochan_man, r->timeout_iochan);
+    http_session_use(1);
     return r;
 }
 
 void http_session_destroy(struct http_session *s)
 {
-    struct http_session **p;
+    int must_destroy = 0;
+
+    http_sessions_t http_sessions = s->http_sessions;
+
+    yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id);
+    yaz_mutex_enter(http_sessions->mutex);
+    /* only if http_session has no active http sessions on it can be destroyed */
+    if (s->destroy_counter == s->activity_counter)
+    {
+        struct http_session **p = 0;
+        must_destroy = 1;
+        for (p = &http_sessions->session_list; *p; p = &(*p)->next)
+            if (*p == s)
+            {
+                *p = (*p)->next;
+                break;
+            }
+    }
+    yaz_mutex_leave(http_sessions->mutex);
+    if (must_destroy)
+    {   /* destroying for real */
+        yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id);
+        iochan_destroy(s->timeout_iochan);
+        destroy_session(s->psession);
+        http_session_use(-1);
+        nmem_destroy(s->nmem);
+    }
+    else {
+        yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed delayed. Active clients (%d-%d). Waiting for new timeout.",
+                s, s->session_id, s->activity_counter, s->destroy_counter);
+    }
 
-    for (p = &session_list; *p; p = &(*p)->next)
-        if (*p == s)
-        {
-            *p = (*p)->next;
-            break;
-        }
-    yaz_log(YLOG_LOG, "Destroying session %u", s->session_id);
-    iochan_destroy(s->timeout_iochan);
-    destroy_session(s->psession);
-    nmem_destroy(s->nmem);
 }
 
 static const char *get_msg(enum pazpar2_error_code code)
@@ -162,7 +273,7 @@ unsigned int make_sessionid(void)
     unsigned int res;
 
     seq++;
-    if (global_parameters.debug_mode)
+    if (global_parameters.predictable_sessions)
         res = seq;
     else
     {
@@ -185,10 +296,13 @@ unsigned int make_sessionid(void)
     return res;
 }
 
-static struct http_session *locate_session(struct http_request *rq, struct http_response *rs)
+static struct http_session *locate_session(struct http_channel *c)
 {
+    struct http_response *rs = c->response;
+    struct http_request *rq = c->request;
     struct http_session *p;
     const char *session = http_argbyname(rq, "session");
+    http_sessions_t http_sessions = c->http_sessions;
     unsigned int id;
 
     if (!session)
@@ -197,14 +311,29 @@ static struct http_session *locate_session(struct http_request *rq, struct http_
         return 0;
     }
     id = atoi(session);
-    for (p = session_list; p; p = p->next)
+    yaz_mutex_enter(http_sessions->mutex);
+    for (p = http_sessions->session_list; p; p = p->next)
         if (id == p->session_id)
-        {
-            iochan_activity(p->timeout_iochan);
-            return p;
-        }
-    error(rs, PAZPAR2_NO_SESSION, session);
-    return 0;
+            break;
+    if (p)
+        p->activity_counter++;
+    yaz_mutex_leave(http_sessions->mutex);
+    if (p)
+        iochan_activity(p->timeout_iochan);
+    else
+        error(rs, PAZPAR2_NO_SESSION, session);
+    return p;
+}
+
+// Call after use of locate_session, in order to increment the destroy_counter
+static void release_session(struct http_channel *c,
+                            struct http_session *session)
+{
+    http_sessions_t http_sessions = c->http_sessions;
+    yaz_mutex_enter(http_sessions->mutex);
+    if (session)
+        session->destroy_counter++;
+    yaz_mutex_leave(http_sessions->mutex);
 }
 
 // Decode settings parameters and apply to session
@@ -239,7 +368,12 @@ static int process_settings(struct session *se, struct http_request *rq,
 
 static void cmd_exit(struct http_channel *c)
 {
+    char buf[1024];
+    struct http_response *rs = c->response;
     yaz_log(YLOG_WARN, "exit");
+    sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX "<exit><status>OK</status></exit>");
+    rs->payload = nmem_strdup(c->nmem, buf);
+    http_send_response(c);
     http_close_server(c->server);
 }
 
@@ -283,23 +417,21 @@ static void cmd_init(struct http_channel *c)
             error(rs, PAZPAR2_NO_SERVICE, service_name ? service_name : "unnamed");
             return;
         }
-        service_incref(service);
     }
-    s = http_session_create(service);
+    sesid = make_sessionid();
+    s = http_session_create(service, c->http_sessions, sesid);
     
-    yaz_log(YLOG_DEBUG, "HTTP Session init");
+    yaz_log(c->http_sessions->log_level, "%p Session init %u ", s, sesid);
     if (!clear || *clear == '0')
         session_init_databases(s->psession);
     else
-        yaz_log(YLOG_LOG, "No databases preloaded");
+        yaz_log(YLOG_LOG, "HTTP Session %u init: No databases preloaded", sesid);
     
-    sesid = make_sessionid();
-    s->session_id = sesid;
     if (process_settings(s->psession, c->request, c->response) < 0)
         return;
     
     sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX 
-            "<init><status>OK</status><session>%u", sesid);
+            "<init><status>OK</status><session>%d", sesid);
     if (c->server->server_id)
     {
         strcat(buf, ".");
@@ -325,7 +457,7 @@ static void cmd_settings(struct http_channel *c)
 {
     struct http_response *rs = c->response;
     struct http_request *rq = c->request;
-    struct http_session *s = locate_session(rq, rs);
+    struct http_session *s = locate_session(c);
     const char *content_type = http_lookup_header(rq->headers, "Content-Type");
 
     if (!s)
@@ -348,9 +480,13 @@ static void cmd_settings(struct http_channel *c)
         xmlFreeDoc(doc);
     }
     if (process_settings(s->psession, rq, rs) < 0)
+    {
+        release_session(c, s);
         return;
+    }
     rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<settings><status>OK</status></settings>";
     http_send_response(c);
+    release_session(c, s);
 }
 
 // Compares two hitsbytarget nodes by hitcount
@@ -362,7 +498,7 @@ static int cmp_ht(const void *p1, const void *p2)
 }
 
 // This implements functionality somewhat similar to 'bytarget', but in a termlist form
-static void targets_termlist(WRBUF wrbuf, struct session *se, int num,
+static int targets_termlist(WRBUF wrbuf, struct session *se, int num,
                              NMEM nmem)
 {
     struct hitsbytarget *ht;
@@ -399,20 +535,19 @@ static void targets_termlist(WRBUF wrbuf, struct session *se, int num,
                      ht[i].diagnostic);
         wrbuf_puts(wrbuf, "</term>\n");
     }
+    return count;
 }
 
 static void cmd_termlist(struct http_channel *c)
 {
     struct http_response *rs = c->response;
     struct http_request *rq = c->request;
-    struct http_session *s = locate_session(rq, rs);
-    struct termlist_score **p;
-    int len;
-    int i;
+    struct http_session *s = locate_session(c);
     const char *name = http_argbyname(rq, "name");
     const char *nums = http_argbyname(rq, "num");
     int num = 15;
     int status;
+    WRBUF debug_log = 0;
 
     if (!s)
         return;
@@ -426,6 +561,8 @@ static void cmd_termlist(struct http_channel *c)
     if (nums)
         num = atoi(nums);
 
+    debug_log = wrbuf_alloc();
+
     wrbuf_rewind(c->wrbuf);
 
     wrbuf_puts(c->wrbuf, "<termlist>\n");
@@ -439,17 +576,26 @@ static void cmd_termlist(struct http_channel *c)
             tp = name + strlen(name);
         strncpy(tname, name, tp - name);
         tname[tp - name] = '\0';
-
         wrbuf_puts(c->wrbuf, "<list name=\"");
         wrbuf_xmlputs(c->wrbuf, tname);
         wrbuf_puts(c->wrbuf, "\">\n");
         if (!strcmp(tname, "xtargets"))
-            targets_termlist(c->wrbuf, s->psession, num, c->nmem);
+        {
+            int targets = targets_termlist(c->wrbuf, s->psession, num, c->nmem);
+            wrbuf_printf(debug_log, " xtargets: %d", targets);
+        }
         else
         {
-            p = termlist(s->psession, tname, &len);
+            int len;
+            struct termlist_score **p = 
+                get_termlist_score(s->psession, tname, &len);
+            if (p && len)
+                wrbuf_printf(debug_log, " %s: %d", tname, len);
             if (p)
-                for (i = 0; i < len && i < num; i++){
+            {
+                int i;
+                for (i = 0; i < len && i < num; i++)
+                {
                     // prevnt sending empty term elements
                     if (!p[i]->term || !p[i]->term[0])
                         continue;
@@ -458,12 +604,13 @@ static void cmd_termlist(struct http_channel *c)
                     wrbuf_puts(c->wrbuf, "<name>");
                     wrbuf_xmlputs(c->wrbuf, p[i]->term);
                     wrbuf_puts(c->wrbuf, "</name>");
-                        
+                    
                     wrbuf_printf(c->wrbuf, 
                                  "<frequency>%d</frequency>", 
                                  p[i]->frequency);
                     wrbuf_puts(c->wrbuf, "</term>\n");
-               }
+                }
+            }
         }
         wrbuf_puts(c->wrbuf, "</list>\n");
         name = tp;
@@ -471,8 +618,85 @@ static void cmd_termlist(struct http_channel *c)
             name++;
     }
     wrbuf_puts(c->wrbuf, "</termlist>\n");
+    yaz_log(YLOG_DEBUG, "termlist response: %s ", wrbuf_cstr(debug_log));
+    wrbuf_destroy(debug_log);
     rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf));
     http_send_response(c);
+    release_session(c, s);
+}
+
+size_t session_get_memory_status(struct session *session);
+
+static void session_status(struct http_channel *c, struct http_session *s)
+{
+    size_t session_nmem;
+    wrbuf_printf(c->wrbuf, "<http_count>%u</http_count>\n", s->activity_counter);
+    wrbuf_printf(c->wrbuf, "<http_nmem>%zu</http_nmem>\n", nmem_total(s->nmem) );
+    session_nmem = session_get_memory_status(s->psession);
+    wrbuf_printf(c->wrbuf, "<session_nmem>%zu</session_nmem>\n", session_nmem);
+}
+
+static void cmd_session_status(struct http_channel *c)
+{
+    struct http_response *rs = c->response;
+    struct http_session *s = locate_session(c);
+    if (!s)
+        return;
+
+    wrbuf_rewind(c->wrbuf);
+    wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<sessionstatus><status>OK</status>\n");
+    session_status(c, s);
+    wrbuf_puts(c->wrbuf, "</sessionstatus>\n");
+    rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
+    http_send_response(c);
+    release_session(c, s);
+
+}
+
+int sessions_count(void);
+int clients_count(void);
+#ifdef HAVE_RESULTSETS_COUNT
+int resultsets_count(void);
+#else
+#define resultsets_count()      0
+#endif
+
+static void cmd_server_status(struct http_channel *c)
+{
+    struct http_response *rs = c->response;
+    int sessions   = sessions_count();
+    int clients    = clients_count();
+    int resultsets = resultsets_count();
+    wrbuf_rewind(c->wrbuf);
+    wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<server-status>\n");
+    wrbuf_printf(c->wrbuf, "  <sessions>%u</sessions>\n", sessions);
+    wrbuf_printf(c->wrbuf, "  <clients>%u</clients>\n",   clients);
+    /* Only works if yaz has been compiled with enabling of this */
+    wrbuf_printf(c->wrbuf, "  <resultsets>%u</resultsets>\n",resultsets);
+    print_meminfo(c->wrbuf);
+
+/* TODO add all sessions status                         */
+/*    http_sessions_t http_sessions = c->http_sessions; */
+/*    struct http_session *p;                           */
+/*
+    yaz_mutex_enter(http_sessions->mutex);
+    for (p = http_sessions->session_list; p; p = p->next)
+    {
+        p->activity_counter++;
+        wrbuf_puts(c->wrbuf, "<session-status>\n");
+        wrbuf_printf(c->wrbuf, "<id>%s</id>\n", p->session_id);
+        yaz_mutex_leave(http_sessions->mutex);
+        session_status(c, p);
+        wrbuf_puts(c->wrbuf, "</session-status>\n");
+        yaz_mutex_enter(http_sessions->mutex);
+        p->activity_counter--;
+    }
+    yaz_mutex_leave(http_sessions->mutex);
+*/
+    wrbuf_puts(c->wrbuf, "</server-status>\n");
+    rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
+    http_send_response(c);
+    xmalloc_trav(0);
 }
 
 
@@ -480,7 +704,7 @@ static void cmd_bytarget(struct http_channel *c)
 {
     struct http_response *rs = c->response;
     struct http_request *rq = c->request;
-    struct http_session *s = locate_session(rq, rs);
+    struct http_session *s = locate_session(c);
     struct hitsbytarget *ht;
     const char *settings = http_argbyname(rq, "settings");
     int count, i;
@@ -516,16 +740,16 @@ static void cmd_bytarget(struct http_channel *c)
         if (settings && *settings == '1')
         {
             wrbuf_puts(c->wrbuf, "<settings>\n");
-            wrbuf_puts(c->wrbuf, wrbuf_cstr(ht[i].settings_xml));
+            wrbuf_puts(c->wrbuf, ht[i].settings_xml);
             wrbuf_puts(c->wrbuf, "</settings>\n");
         }
         wrbuf_puts(c->wrbuf, "</target>");
-        wrbuf_destroy(ht[i].settings_xml);
     }
 
     wrbuf_puts(c->wrbuf, "</bytarget>");
     rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
     http_send_response(c);
+    release_session(c, s);
 }
 
 static void write_metadata(WRBUF w, struct conf_service *service,
@@ -640,7 +864,7 @@ static void cmd_record(struct http_channel *c)
 {
     struct http_response *rs = c->response;
     struct http_request *rq = c->request;
-    struct http_session *s = locate_session(rq, rs);
+    struct http_session *s = locate_session(c);
     struct record_cluster *rec, *prev_r, *next_r;
     struct record *r;
     struct conf_service *service;
@@ -657,7 +881,7 @@ static void cmd_record(struct http_channel *c)
         return;
     }
     wrbuf_rewind(c->wrbuf);
-    if (!(rec = show_single(s->psession, idstr, &prev_r, &next_r)))
+    if (!(rec = show_single_start(s->psession, idstr, &prev_r, &next_r)))
     {
         if (session_active_clients(s->psession) == 0)
         {
@@ -668,6 +892,7 @@ static void cmd_record(struct http_channel *c)
         {
             error(rs, PAZPAR2_RECORD_MISSING, idstr);
         }
+        release_session(c, s);
         return;
     }
     if (offsetstr)
@@ -687,7 +912,6 @@ static void cmd_record(struct http_channel *c)
         if (!r)
         {
             error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
-            return;
         }
         else
         {
@@ -735,6 +959,8 @@ static void cmd_record(struct http_channel *c)
         rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
         http_send_response(c);
     }
+    show_single_stop(s->psession, rec);
+    release_session(c, s);
 }
 
 static void cmd_record_ready(void *data)
@@ -748,7 +974,7 @@ static void show_records(struct http_channel *c, int active)
 {
     struct http_request *rq = c->request;
     struct http_response *rs = c->response;
-    struct http_session *s = locate_session(rq, rs);
+    struct http_session *s = locate_session(c);
     struct record_cluster **rl;
     struct reclist_sortparms *sp;
     const char *start = http_argbyname(rq, "start");
@@ -776,10 +1002,12 @@ static void show_records(struct http_channel *c, int active)
     if (!(sp = reclist_parse_sortparms(c->nmem, sort, s->psession->service)))
     {
         error(rs, PAZPAR2_MALFORMED_PARAMETER_VALUE, "sort");
+        release_session(c, s);
         return;
     }
 
-    rl = show(s->psession, sp, startn, &numn, &total, &total_hits, c->nmem);
+    
+    rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits);
 
     wrbuf_rewind(c->wrbuf);
     wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<show>\n<status>OK</status>\n");
@@ -803,16 +1031,20 @@ static void show_records(struct http_channel *c, int active)
         if (ccount > 1)
             wrbuf_printf(c->wrbuf, "<count>%d</count>\n", ccount);
 	if (strstr(sort, "relevance"))
-	    wrbuf_printf(c->wrbuf, "<relevance>%d</relevance>\n", rec->relevance);
+	    wrbuf_printf(c->wrbuf, "<relevance>%d</relevance>\n",
+                         rec->relevance_score);
         wrbuf_puts(c->wrbuf, "<recid>");
         wrbuf_xmlputs(c->wrbuf, rec->recid);
         wrbuf_puts(c->wrbuf, "</recid>\n");
         wrbuf_puts(c->wrbuf, "</hit>\n");
     }
 
+    show_range_stop(s->psession, rl);
+
     wrbuf_puts(c->wrbuf, "</show>\n");
     rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
     http_send_response(c);
+    release_session(c, s);
 }
 
 static void show_records_ready(void *data)
@@ -825,8 +1057,7 @@ static void show_records_ready(void *data)
 static void cmd_show(struct http_channel *c)
 {
     struct http_request *rq = c->request;
-    struct http_response *rs = c->response;
-    struct http_session *s = locate_session(rq, rs);
+    struct http_session *s = locate_session(c);
     const char *block = http_argbyname(rq, "block");
     int status;
 
@@ -837,62 +1068,51 @@ static void cmd_show(struct http_channel *c)
 
     if (block)
     {
-        if (status && reclist_get_num_records(s->psession->reclist) == 0)
+        if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession) && reclist_get_num_records(s->psession->reclist) == 0)
+        {
+            // if there is already a watch/block. we do not block this one
+            if (session_set_watch(s->psession, SESSION_WATCH_SHOW_PREF,
+                                  show_records_ready, c, c) != 0)
+            {
+                yaz_log(c->http_sessions->log_level,
+                        "%p Session %u: Blocking on cmd_show. Waiting for preferred targets", s, s->session_id);
+            }
+            release_session(c, s);
+            return;
+
+        }
+        else if (status && reclist_get_num_records(s->psession->reclist) == 0)
         {
             // if there is already a watch/block. we do not block this one
             if (session_set_watch(s->psession, SESSION_WATCH_SHOW,
                                   show_records_ready, c, c) != 0)
             {
-                yaz_log(YLOG_DEBUG, "Blocking on cmd_show");
+                yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on cmd_show", s, s->session_id);
             }
+            release_session(c, s);
             return;
         }
     }
-
     show_records(c, status);
+    release_session(c, s);
 }
 
 static void cmd_ping(struct http_channel *c)
 {
-    struct http_request *rq = c->request;
     struct http_response *rs = c->response;
-    struct http_session *s = locate_session(rq, rs);
+    struct http_session *s = locate_session(c);
     if (!s)
         return;
     rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<ping><status>OK</status></ping>";
     http_send_response(c);
-}
-
-static int utf_8_valid(const char *str)
-{
-    yaz_iconv_t cd = yaz_iconv_open("utf-8", "utf-8");
-    if (cd)
-    {
-        /* check that query is UTF-8 encoded */
-        char *inbuf = (char *) str; /* we know iconv does not alter this */
-        size_t inbytesleft = strlen(inbuf);
-
-        size_t outbytesleft = strlen(inbuf) + 10;
-        char *out = xmalloc(outbytesleft);
-        char *outbuf = out;
-        size_t r = yaz_iconv(cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft);
-
-        /* if OK, try flushing the rest  */
-        if (r != (size_t) (-1))
-            r = yaz_iconv(cd, 0, 0, &outbuf, &outbytesleft);
-        yaz_iconv_close(cd);
-        xfree(out);
-        if (r == (size_t) (-1))
-            return 0;
-    }
-    return 1;
+    release_session(c, s);
 }
 
 static void cmd_search(struct http_channel *c)
 {
     struct http_request *rq = c->request;
     struct http_response *rs = c->response;
-    struct http_session *s = locate_session(rq, rs);
+    struct http_session *s = locate_session(c);
     const char *query = http_argbyname(rq, "query");
     const char *filter = http_argbyname(rq, "filter");
     const char *maxrecs = http_argbyname(rq, "maxrecs");
@@ -905,29 +1125,32 @@ static void cmd_search(struct http_channel *c)
     if (!query)
     {
         error(rs, PAZPAR2_MISSING_PARAMETER, "query");
+        release_session(c, s);
         return;
     }
-    if (!utf_8_valid(query))
+    if (!yaz_utf8_check(query))
     {
         error(rs, PAZPAR2_MALFORMED_PARAMETER_ENCODING, "query");
+        release_session(c, s);
         return;
     }
     code = search(s->psession, query, startrecs, maxrecs, filter, &addinfo);
     if (code)
     {
         error(rs, code, addinfo);
+        release_session(c, s);
         return;
     }
     rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "<search><status>OK</status></search>";
     http_send_response(c);
+    release_session(c, s);
 }
 
 
 static void cmd_stat(struct http_channel *c)
 {
-    struct http_request *rq = c->request;
     struct http_response *rs = c->response;
-    struct http_session *s = locate_session(rq, rs);
+    struct http_session *s = locate_session(c);
     struct statistics stat;
     int clients;
 
@@ -939,7 +1162,8 @@ static void cmd_stat(struct http_channel *c)
     clients = session_active_clients(s->psession);
     statistics(s->psession, &stat);
 
-    if (stat.num_clients > 0) {
+    if (stat.num_clients > 0)
+    {
     	progress = (stat.num_clients  - clients) / (float)stat.num_clients;
     }
 
@@ -959,6 +1183,7 @@ static void cmd_stat(struct http_channel *c)
     wrbuf_puts(c->wrbuf, "</stat>");
     rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
     http_send_response(c);
+    release_session(c, s);
 }
 
 static void cmd_info(struct http_channel *c)
@@ -969,7 +1194,7 @@ static void cmd_info(struct http_channel *c)
     wrbuf_rewind(c->wrbuf);
     wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<info>\n");
     wrbuf_puts(c->wrbuf, " <version>\n");
-    wrbuf_puts(c->wrbuf, "<pazpar2");
+    wrbuf_puts(c->wrbuf, "  <pazpar2");
 #ifdef PAZPAR2_VERSION_SHA1
     wrbuf_printf(c->wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1);
 #endif
@@ -987,6 +1212,8 @@ static void cmd_info(struct http_channel *c)
 
     wrbuf_puts(c->wrbuf, " </version>\n");
     
+    info_services(c->server, c->wrbuf);
+
     wrbuf_puts(c->wrbuf, "</info>");
     rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
     http_send_response(c);
@@ -1004,6 +1231,8 @@ struct {
     { "search", cmd_search },
     { "termlist", cmd_termlist },
     { "exit", cmd_exit },
+    { "session-status", cmd_session_status },
+    { "server-status", cmd_server_status },
     { "ping", cmd_ping },
     { "record", cmd_record },
     { "info", cmd_info },