#if HAVE_CONFIG_H
#include <config.h>
#endif
-#include <pthread.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#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_DEBUG, "%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;
int diagnostic;
enum client_state state;
struct show_raw *show_raw;
- struct client *next; // next client in session or next in free list
ZOOM_resultset resultset;
YAZ_MUTEX mutex;
int ref_count;
static void client_show_raw_error(struct client *cl, const char *addinfo);
-// Close connection and set state to error
-void client_fatal(struct client *cl)
-{
- yaz_log(YLOG_WARN, "Fatal error from %s", client_get_url(cl));
- connection_destroy(cl->connection);
- client_set_state(cl, Client_Error);
-}
-
struct connection *client_get_connection(struct client *cl)
{
return cl->connection;
void client_got_records(struct client *cl)
{
- if (cl->session)
+ struct session *se = cl->session;
+ if (se)
{
- session_alert_watch(cl->session, SESSION_WATCH_SHOW);
- session_alert_watch(cl->session, SESSION_WATCH_RECORD);
+ client_unlock(cl);
+ session_alert_watch(se, SESSION_WATCH_SHOW);
+ session_alert_watch(se, SESSION_WATCH_RECORD);
+ client_lock(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;
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);
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
r->state = Client_Disconnected;
r->show_raw = 0;
r->resultset = 0;
- r->next = 0;
r->mutex = 0;
pazpar2_mutex_create(&r->mutex, "client");
r->ref_count = 1;
+ client_use(1);
return r;
}
+void client_lock(struct client *c)
+{
+ yaz_mutex_enter(c->mutex);
+}
+
+void client_unlock(struct client *c)
+{
+ yaz_mutex_leave(c->mutex);
+}
+
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_DEBUG, "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_DEBUG, "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;
xfree(c->pquery);
c->pquery = 0;
xfree(c->cqlquery);
c->cqlquery = 0;
+ assert(!c->connection);
- ZOOM_resultset_destroy(c->resultset);
+ if (c->resultset)
+ {
+ ZOOM_resultset_destroy(c->resultset);
+ }
yaz_mutex_destroy(&c->mutex);
xfree(c);
+ client_use(-1);
return 1;
}
}
return 0;
}
-
-void client_remove_from_session(struct client *c)
-{
- struct session *se;
- client_incref(c);
-
- se = c->session;
- assert(se);
- if (se)
- {
- struct client **ccp = &se->clients;
-
- while (*ccp && *ccp != c)
- ccp = &(*ccp)->next;
- assert(*ccp == c);
- *ccp = c->next;
-
- c->database = 0;
- c->session = 0;
- c->next = 0;
- }
- client_destroy(c);
-}
-
void client_set_session(struct client *cl, struct session *se)
{
cl->session = se;
- cl->next = se->clients;
- se->clients = cl;
}
int client_is_active(struct client *cl)
return 0;
}
-struct client *client_next_in_session(struct client *cl)
-{
- if (cl)
- return cl->next;
- return 0;
-
-}
-
Odr_int client_get_hits(struct client *cl)
{
return cl->hits;
projects / pazpar2-moved-to-github.git / blobdiff