X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fclient.c;h=65400337d0d89c0e117af4da60efec6a2ac62251;hb=05f913e34ce31985c00280308c340348ea289f2e;hp=7e1645a4ac41a7ed9db2d05d1f8595cbd8d2ded9;hpb=eae6eee32de3560f84a83ee5cc922a2d3d63cc44;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 7e1645a..6540033 100644 --- a/src/client.c +++ b/src/client.c @@ -24,7 +24,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_CONFIG_H #include #endif - #include #include #include @@ -58,6 +57,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif +#include "ppmutex.h" #include "session.h" #include "parameters.h" #include "client.h" @@ -66,6 +66,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_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; @@ -80,7 +98,6 @@ 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; @@ -134,14 +151,6 @@ void client_set_state(struct client *cl, enum client_state st) 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; @@ -349,6 +358,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; @@ -363,6 +377,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"); @@ -419,10 +438,13 @@ void client_search_response(struct client *cl) 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); } } @@ -467,15 +489,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; char type[80]; + if (nativesyntax_to_type(sdb, type, rec)) yaz_log(YLOG_WARN, "Failed to determine record type"); xmlrec = ZOOM_record_get(rec, type, NULL); @@ -591,37 +616,53 @@ struct client *client_create(void) r->state = Client_Disconnected; r->show_raw = 0; r->resultset = 0; - r->next = 0; r->mutex = 0; - yaz_mutex_create(&r->mutex); + 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_LOG, "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_LOG, "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; } } @@ -630,6 +671,8 @@ int client_destroy(struct client *c) void client_set_connection(struct client *cl, struct connection *con) { + if (cl->resultset) + ZOOM_resultset_release(cl->resultset); if (con) { assert(cl->connection == 0); @@ -788,34 +831,9 @@ int client_parse_query(struct client *cl, const char *query) 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->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) @@ -826,14 +844,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; @@ -866,7 +876,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)