client counting (for debugging)

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

diff --git a/src/client.c b/src/client.c
index 0f9e220..146035c 100644 (file)
--- 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;
@@ -439,8 +457,6 @@ void client_got_records(struct client *cl)
 
 void client_record_response(struct client *cl)
 {
-    static pthread_mutex_t ingest_mutex = PTHREAD_MUTEX_INITIALIZER;
-    static int ingest_counter = 0, ingest_max = 0;
     struct connection *co = cl->connection;
     ZOOM_connection link = connection_get_link(co);
     ZOOM_resultset resultset = cl->resultset;
@@ -480,27 +496,18 @@ void client_record_response(struct client *cl)
                 if (cl->session == 0)
                     ;
                 else if (ZOOM_record_error(rec, &msg, &addinfo, 0))
+                {
                     yaz_log(YLOG_WARN, "Record error %s (%s): %s (rec #%d)",
-                            error, addinfo, client_get_url(cl),
+                            msg, addinfo, client_get_url(cl),
                             cl->record_offset);
+                }
                 else
                 {
                     struct session_database *sdb = client_get_database(cl);
                     NMEM nmem = nmem_create();
                     const char *xmlrec;
-                    int new_max = 0;
                     char type[80];
-                    yaz_log(YLOG_LOG, "Record ingest begin client=%p session=%p", cl, cl->session);
-                    pthread_mutex_lock(&ingest_mutex);
-                    ++ingest_counter;
-                    if (ingest_counter > ingest_max)
-                    {
-                        ingest_max = ingest_counter;
-                        new_max = ingest_max;
-                    }
-                    pthread_mutex_unlock(&ingest_mutex);
-                    if (new_max)
-                        yaz_log(YLOG_LOG, "New max client=%p new_max=%d", cl, new_max);
+
                     if (nativesyntax_to_type(sdb, type, rec))
                         yaz_log(YLOG_WARN, "Failed to determine record type");
                     xmlrec = ZOOM_record_get(rec, type, NULL);
@@ -513,11 +520,7 @@ void client_record_response(struct client *cl)
                             yaz_log(YLOG_WARN, "Failed to ingest from %s",
                                     client_get_url(cl));
                     }
-                    pthread_mutex_lock(&ingest_mutex);
-                    --ingest_counter;
-                    pthread_mutex_unlock(&ingest_mutex);
                     nmem_destroy(nmem);
-                    yaz_log(YLOG_LOG, "Record ingest end client=%p session=%p max=%d", cl, cl->session, ingest_max);
                 }
             }
             else
@@ -625,6 +628,7 @@ struct client *client_create(void)
     pazpar2_mutex_create(&r->mutex, "client");
 
     r->ref_count = 1;
+    client_use(1);
     
     return r;
 }
@@ -632,15 +636,16 @@ struct client *client_create(void)
 void client_incref(struct client *c)
 {
     pazpar2_incref(&c->ref_count, c->mutex);
-    yaz_log(YLOG_DEBUG, "client_incref %s %d", client_get_url(c), c->ref_count);
+    yaz_log(YLOG_LOG, "client_incref c=%p %s cnt=%d",
+            c, client_get_url(c), c->ref_count);
 }
 
 int client_destroy(struct client *c)
 {
     if (c)
     {
-        yaz_log(YLOG_DEBUG, "client_destroy %s %d",
-                client_get_url(c), c->ref_count);
+        yaz_log(YLOG_LOG, "client_destroy c=%p %s cnt=%d",
+                c, client_get_url(c), c->ref_count);
         if (!pazpar2_decref(&c->ref_count, c->mutex))
         {
             c->next = 0;
@@ -648,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;
         }
     }
@@ -660,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);
@@ -822,7 +834,6 @@ int client_parse_query(struct client *cl, const char *query)
 void client_remove_from_session(struct client *c)
 {
     struct session *se;
-    client_incref(c);
 
     se = c->session;
     assert(se);
@@ -839,7 +850,6 @@ void client_remove_from_session(struct client *c)
         c->session = 0;
         c->next = 0;
     }
-    client_destroy(c);
 }
 
 void client_set_session(struct client *cl, struct session *se)