X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=146035cd2fbe372533e76bc5e5737d0967e3a497;hb=419a9b497318d051f7b1dd6b1d123a7ee31a7ee0;hp=0d6112be5d767800bddcce734f07e7143bac1650;hpb=ab72dd93ca49a2d6cc55e643fdf83fbed439e45a;p=pazpar2-moved-to-github.git

diff --git a/src/client.c b/src/client.c
index 0d6112b..146035c 100644
--- a/src/client.c
+++ b/src/client.c
@@ -67,6 +67,24 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include "relevance.h"
 #include "incref.h"
 
+/* client counting (1) , disable client counting (0) */
+#if 1
+static YAZ_MUTEX g_mutex = 0;
+static int no_clients = 0;
+
+static void client_use(int delta)
+{
+    if (!g_mutex)
+        yaz_mutex_create(&g_mutex);
+    yaz_mutex_enter(g_mutex);
+    no_clients += delta;
+    yaz_mutex_leave(g_mutex);
+    yaz_log(YLOG_LOG, "%s clients=%d", delta > 0 ? "INC" : "DEC", no_clients);
+}
+#else
+#define client_use(x)
+#endif
+
 /** \brief Represents client state for a connection to one search target */
 struct client {
     struct session_database *database;
@@ -610,6 +628,7 @@ struct client *client_create(void)
     pazpar2_mutex_create(&r->mutex, "client");
 
     r->ref_count = 1;
+    client_use(1);
     
     return r;
 }
@@ -634,10 +653,12 @@ int client_destroy(struct client *c)
             c->pquery = 0;
             xfree(c->cqlquery);
             c->cqlquery = 0;
-
-            ZOOM_resultset_destroy(c->resultset);
+            assert(!c->connection);
+            assert(!c->resultset);
+            
             yaz_mutex_destroy(&c->mutex);
             xfree(c);
+            client_use(-1);
             return 1;
         }
     }
@@ -646,6 +667,11 @@ int client_destroy(struct client *c)
 
 void client_set_connection(struct client *cl, struct connection *con)
 {
+    if (cl->resultset)
+    {
+        ZOOM_resultset_destroy(cl->resultset);
+        cl->resultset = 0;
+    }
     if (con)
     {
         assert(cl->connection == 0);