X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=5975b69061eb122f520e55330a32879ec5df40d6;hb=94630b3298c7dca7c7d171681240ca8ad5fd66d0;hp=3e641c58621ea468b100066d1bcefcaad966dc8a;hpb=e291361dfa0a35fce0a1461c5ad5d288bed68ca6;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 3e641c5..5975b69 100644 --- a/src/client.c +++ b/src/client.c @@ -58,12 +58,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif -#include "pazpar2.h" +#include "session.h" #include "parameters.h" #include "client.h" #include "connection.h" #include "settings.h" #include "relevance.h" +#include "incref.h" /** \brief Represents client state for a connection to one search target */ struct client { @@ -81,6 +82,8 @@ struct client { 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,6 +107,17 @@ static const char *client_states[] = { "Client_Disconnected" }; +static void client_enter(struct client *cl) +{ + yaz_mutex_enter(cl->mutex); +} + +static void client_leave(struct client *cl) +{ + yaz_mutex_leave(cl->mutex); +} + + const char *client_get_state_str(struct client *cl) { return client_states[cl->state]; @@ -117,12 +131,16 @@ 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); @@ -386,31 +404,36 @@ static void ingest_raw_record(struct client *cl, ZOOM_record rec) client_show_raw_dequeue(cl); } -void client_search_response(struct client *cl) +static void search_response(struct client *cl) { struct connection *co = cl->connection; 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_search_response(struct client *cl) +{ + search_response(cl); +} -void client_record_response(struct client *cl) +static void record_response(struct client *cl) { struct connection *co = cl->connection; ZOOM_connection link = connection_get_link(co); @@ -448,31 +471,37 @@ 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), 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)) + if (ingest_record(cl, xmlrec, cl->record_offset, nmem)) + yaz_log(YLOG_WARN, "Failed to ingest from %s", + client_get_url(cl)); + else { session_alert_watch(cl->session, SESSION_WATCH_SHOW); session_alert_watch(cl->session, SESSION_WATCH_RECORD); } - else - yaz_log(YLOG_WARN, "Failed to ingest"); } - else - yaz_log(YLOG_WARN, "Failed to extract ZOOM record"); + nmem_destroy(nmem); } - } else { @@ -483,6 +512,11 @@ void client_record_response(struct client *cl) } } +void client_record_response(struct client *cl) +{ + record_response(cl); +} + void client_start_search(struct client *cl) { struct session_database *sdb = client_get_database(cl); @@ -575,35 +609,60 @@ struct client *client_create(void) r->show_raw = 0; r->resultset = 0; r->next = 0; + r->mutex = 0; + yaz_mutex_create(&r->mutex); + r->ref_count = 1; + return r; } -void client_destroy(struct client *c) +void client_incref(struct client *c) { - struct session *se = c->session; - if (c == se->clients) - se->clients = c->next; - else + pazpar2_incref(&c->ref_count, c->mutex); + yaz_log(YLOG_LOG, "client_incref %s %d", client_get_url(c), c->ref_count); +} + +int client_destroy(struct client *c) +{ + if (c) { - struct client *cc; - for (cc = se->clients; cc && cc->next != c; cc = cc->next) - ; - if (cc) - cc->next = c->next; + yaz_log(YLOG_LOG, "client_destroy %s %d", + 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; + c->hits = 12345678; + +#if 0 + if (c->connection) + connection_release(c->connection); +#endif + ZOOM_resultset_destroy(c->resultset); + yaz_mutex_destroy(&c->mutex); + xfree(c); + return 1; + } } - xfree(c->pquery); - xfree(c->cqlquery); - - if (c->connection) - connection_release(c->connection); - - ZOOM_resultset_destroy(c->resultset); - xfree(c); + return 0; } void client_set_connection(struct client *cl, struct connection *con) { - cl->connection = con; + 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) @@ -751,6 +810,26 @@ int client_parse_query(struct client *cl, const char *query) return 0; } + +void client_remove_from_session(struct client *c) +{ + struct session *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->session = 0; + c->next = 0; + } +} + void client_set_session(struct client *cl, struct session *se) { cl->session = se;