X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=c238f0a9f31074da10e394cc06520e46bb3b7d9d;hb=25a2a0bc6bd136a4d9ea6034e7a86c889d02e4e2;hp=be1bae91adf60f3593c5ee8f6e2da817091ce73b;hpb=ba5951a80fdd0da1d28c318852b69a1178cd6bfa;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index be1bae9..c238f0a 100644 --- a/src/client.c +++ b/src/client.c @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_CONFIG_H #include #endif - +#include #include #include #include @@ -58,12 +58,32 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#include "pazpar2.h" +#include "ppmutex.h" +#include "session.h" #include "parameters.h" #include "client.h" #include "connection.h" #include "settings.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_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 { @@ -79,8 +99,9 @@ struct client { 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; }; struct show_raw { @@ -104,8 +125,6 @@ static const char *client_states[] = { "Client_Disconnected" }; -static struct client *client_freelist = 0; /* thread pr */ - const char *client_get_state_str(struct client *cl) { return client_states[cl->state]; @@ -119,24 +138,20 @@ enum client_state client_get_state(struct client *cl) void client_set_state(struct client *cl, enum client_state st) { cl->state = st; - if (cl->session) + /* no need to check for all client being non-active if this one + already is. Note that session_active_clients also LOCKS session */ +#if 0 + if (!client_is_active(cl) && cl->session) { int no_active = session_active_clients(cl->session); if (no_active == 0) session_alert_watch(cl->session, SESSION_WATCH_SHOW); } +#endif } 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; @@ -344,6 +359,11 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type, { strcpy(type, "xml"); } + else if (!strncmp(s, "txml", 4)) + { + const char *cp = strchr(s, ';'); + yaz_snprintf(type, 80, "txml; charset=%s", cp ? cp+1 : "marc-8s"); + } else return -1; return 0; @@ -358,6 +378,11 @@ static int nativesyntax_to_type(struct session_database *sdb, char *type, strcpy(type, "xml"); return 0; } + else if (!strcmp(syntax, "TXML")) + { + strcpy(type, "txml"); + return 0; + } else if (!strcmp(syntax, "USmarc") || !strcmp(syntax, "MARC21")) { strcpy(type, "xml; charset=marc8-s"); @@ -394,23 +419,35 @@ void client_search_response(struct client *cl) struct session *se = cl->session; ZOOM_connection link = connection_get_link(co); ZOOM_resultset resultset = cl->resultset; - const char *error, *addinfo; - + const char *error, *addinfo = 0; + if (ZOOM_connection_error(link, &error, &addinfo)) { cl->hits = 0; client_set_state(cl, Client_Error); yaz_log(YLOG_WARN, "Search error %s (%s): %s", - error, addinfo, client_get_url(cl)); + error, addinfo, client_get_url(cl)); } else { cl->record_offset = cl->startrecs; cl->hits = ZOOM_resultset_size(resultset); - se->total_hits += cl->hits; + if (se) + se->total_hits += cl->hits; } } +void client_got_records(struct client *cl) +{ + struct session *se = cl->session; + if (se) + { + 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) { @@ -450,31 +487,35 @@ void client_record_response(struct client *cl) if ((rec = ZOOM_resultset_record(resultset, offset))) { cl->record_offset++; - if (ZOOM_record_error(rec, &msg, &addinfo, 0)) + 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; char type[80]; + if (nativesyntax_to_type(sdb, type, rec)) yaz_log(YLOG_WARN, "Failed to determine record type"); - if ((xmlrec = ZOOM_record_get(rec, type, NULL))) + xmlrec = ZOOM_record_get(rec, type, NULL); + if (!xmlrec) + yaz_log(YLOG_WARN, "ZOOM_record_get failed from %s", + client_get_url(cl)); + else { - if (ingest_record(cl, xmlrec, cl->record_offset)) - { - session_alert_watch(cl->session, SESSION_WATCH_SHOW); - session_alert_watch(cl->session, SESSION_WATCH_RECORD); - } - else - yaz_log(YLOG_WARN, "Failed to ingest"); + if (ingest_record(cl, xmlrec, cl->record_offset, nmem)) + yaz_log(YLOG_WARN, "Failed to ingest from %s", + client_get_url(cl)); } - else - yaz_log(YLOG_WARN, "Failed to extract ZOOM record"); + nmem_destroy(nmem); } - } else { @@ -562,14 +603,7 @@ void client_start_search(struct client *cl) struct client *client_create(void) { - struct client *r; - if (client_freelist) - { - r = client_freelist; - client_freelist = client_freelist->next; - } - else - r = xmalloc(sizeof(struct client)); + struct client *r = xmalloc(sizeof(*r)); r->maxrecs = 100; r->startrecs = 0; r->pquery = 0; @@ -583,38 +617,74 @@ struct client *client_create(void) 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_destroy(struct client *c) +void client_lock(struct client *c) { - struct session *se = c->session; - if (c == se->clients) - se->clients = c->next; - else - { - struct client *cc; - for (cc = se->clients; cc && cc->next != c; cc = cc->next) - ; - if (cc) - cc->next = c->next; - } - xfree(c->pquery); - xfree(c->cqlquery); + yaz_mutex_enter(c->mutex); +} - if (c->connection) - connection_release(c->connection); +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_LOG, "client_incref c=%p %s cnt=%d", + c, client_get_url(c), c->ref_count); +} - ZOOM_resultset_destroy(c->resultset); - c->resultset = 0; - c->next = client_freelist; - client_freelist = c; +int client_destroy(struct client *c) +{ + if (c) + { + 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)) + { + xfree(c->pquery); + c->pquery = 0; + xfree(c->cqlquery); + c->cqlquery = 0; + assert(!c->connection); + assert(!c->resultset); + + yaz_mutex_destroy(&c->mutex); + xfree(c); + client_use(-1); + return 1; + } + } + return 0; } void client_set_connection(struct client *cl, struct connection *con) { - cl->connection = con; + if (cl->resultset) + { + ZOOM_resultset_destroy(cl->resultset); + cl->resultset = 0; + } + if (con) + { + assert(cl->connection == 0); + cl->connection = con; + client_incref(cl); + } + else + { + cl->connection = con; + client_destroy(cl); + } } void client_disconnect(struct client *cl) @@ -765,8 +835,6 @@ int client_parse_query(struct client *cl, const char *query) 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) @@ -777,14 +845,6 @@ 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; @@ -817,7 +877,10 @@ struct host *client_get_host(struct client *cl) const char *client_get_url(struct client *cl) { - return client_get_database(cl)->database->url; + if (cl->database) + return client_get_database(cl)->database->url; + else + return "NOURL"; } void client_set_maxrecs(struct client *cl, int v)