X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.c;h=77e4a3e9a7d04a0487e10618300e6e284bee9c09;hb=aa698bfd22b2ead2ee2c73b330806f7f7c161bfb;hp=bb0e915f0ee2b6a2135564adcf96e6eacaab51a8;hpb=ca9817524ebe069581ad72f6bca0e9775d61e30c;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index bb0e915..77e4a3e 100644 --- a/src/session.c +++ b/src/session.c @@ -57,6 +57,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif +#include "ppmutex.h" #include "parameters.h" #include "session.h" #include "eventl.h" @@ -80,6 +81,11 @@ struct parameters global_parameters = 0 // debug_mode }; +struct client_list { + struct client *client; + struct client_list *next; +}; + static void log_xml_doc(xmlDoc *doc) { FILE *lf = yaz_log_file(); @@ -100,12 +106,12 @@ static void log_xml_doc(xmlDoc *doc) static void session_enter(struct session *s) { - yaz_mutex_enter(s->mutex); + yaz_mutex_enter(s->session_mutex); } static void session_leave(struct session *s) { - yaz_mutex_leave(s->mutex); + yaz_mutex_leave(s->session_mutex); } // Recursively traverse query structure to extract terms. @@ -395,17 +401,27 @@ int session_set_watch(struct session *s, int what, session_watchfun fun, void *data, struct http_channel *chan) { + int ret; + session_enter(s); if (s->watchlist[what].fun) - return -1; - s->watchlist[what].fun = fun; - s->watchlist[what].data = data; - s->watchlist[what].obs = http_add_observer(chan, &s->watchlist[what], - session_watch_cancel); + ret = -1; + else + { + + s->watchlist[what].fun = fun; + s->watchlist[what].data = data; + s->watchlist[what].obs = http_add_observer(chan, &s->watchlist[what], + session_watch_cancel); + ret = 0; + } + session_leave(s); return 0; } void session_alert_watch(struct session *s, int what) { + assert(s); + session_enter(s); if (s->watchlist[what].fun) { /* our watch is no longer associated with http_channel */ @@ -422,8 +438,11 @@ void session_alert_watch(struct session *s, int what) s->watchlist[what].data = 0; s->watchlist[what].obs = 0; + session_leave(s); fun(data); } + else + session_leave(s); } //callback for grep_databases @@ -431,8 +450,36 @@ static void select_targets_callback(void *context, struct session_database *db) { struct session *se = (struct session*) context; struct client *cl = client_create(); + struct client_list *l; client_set_database(cl, db); + client_set_session(cl, se); + l = xmalloc(sizeof(*l)); + l->client = cl; + l->next = se->clients; + se->clients = l; +} + +static void session_remove_clients(struct session *se) +{ + struct client_list *l; + + session_enter(se); + l = se->clients; + se->clients = 0; + session_leave(se); + + while (l) + { + struct client_list *l_next = l->next; + client_lock(l->client); + client_set_session(l->client, 0); + client_set_database(l->client, 0); + client_unlock(l->client); + client_destroy(l->client); + xfree(l); + l = l_next; + } } // Associates a set of clients with a session; @@ -440,19 +487,16 @@ static void select_targets_callback(void *context, struct session_database *db) // setting overrides static int select_targets(struct session *se, const char *filter) { - while (se->clients) - client_destroy(se->clients); - return session_grep_databases(se, filter, select_targets_callback); } int session_active_clients(struct session *s) { - struct client *c; + struct client_list *l; int res = 0; - for (c = s->clients; c; c = client_next_in_session(c)) - if (client_is_active(c)) + for (l = s->clients; l; l = l->next) + if (client_is_active(l->client)) res++; return res; @@ -468,18 +512,20 @@ enum pazpar2_error_code search(struct session *se, int live_channels = 0; int no_working = 0; int no_failed = 0; - struct client *cl; + struct client_list *l; yaz_log(YLOG_DEBUG, "Search"); *addinfo = 0; + + session_remove_clients(se); session_enter(se); - nmem_reset(se->nmem); - se->relevance = 0; - se->total_records = se->total_hits = se->total_merged = 0; reclist_destroy(se->reclist); se->reclist = 0; + nmem_reset(se->nmem); + relevance_destroy(&se->relevance); + se->total_records = se->total_hits = se->total_merged = 0; se->num_termlists = 0; live_channels = select_targets(se, filter); if (!live_channels) @@ -489,16 +535,17 @@ enum pazpar2_error_code search(struct session *se, } se->reclist = reclist_create(se->nmem); - for (cl = se->clients; cl; cl = client_next_in_session(cl)) + for (l = se->clients; l; l = l->next) { + struct client *cl = l->client; + if (maxrecs) client_set_maxrecs(cl, atoi(maxrecs)); if (startrecs) client_set_startrecs(cl, atoi(startrecs)); if (prepare_session_database(se, client_get_database(cl)) < 0) - continue; - // Parse query for target - if (client_parse_query(cl, query) < 0) + ; + else if (client_parse_query(cl, query) < 0) no_failed++; else { @@ -622,19 +669,21 @@ void destroy_session(struct session *s) { struct session_database *sdb; - while (s->clients) - client_destroy(s->clients); + session_remove_clients(s); + for (sdb = s->databases; sdb; sdb = sdb->next) session_database_destroy(sdb); normalize_cache_destroy(s->normalize_cache); + relevance_destroy(&s->relevance); reclist_destroy(s->reclist); nmem_destroy(s->nmem); service_destroy(s->service); - yaz_mutex_destroy(&s->mutex); + yaz_mutex_destroy(&s->session_mutex); wrbuf_destroy(s->wrbuf); } -struct session *new_session(NMEM nmem, struct conf_service *service) +struct session *new_session(NMEM nmem, struct conf_service *service, + const char *name) { int i; struct session *session = nmem_malloc(nmem, sizeof(*session)); @@ -660,8 +709,8 @@ struct session *new_session(NMEM nmem, struct conf_service *service) session->watchlist[i].fun = 0; } session->normalize_cache = normalize_cache_create(); - session->mutex = 0; - yaz_mutex_create(&session->mutex); + session->session_mutex = 0; + pazpar2_mutex_create(&session->session_mutex, name); return session; } @@ -669,17 +718,18 @@ struct session *new_session(NMEM nmem, struct conf_service *service) struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem) { struct hitsbytarget *res = 0; - struct client *cl; + struct client_list *l; size_t sz = 0; session_enter(se); - for (cl = se->clients; cl; cl = client_next_in_session(cl)) + for (l = se->clients; l; l = l->next) sz++; res = nmem_malloc(nmem, sizeof(*res) * sz); *count = 0; - for (cl = se->clients; cl; cl = client_next_in_session(cl)) + for (l = se->clients; l; l = l->next) { + struct client *cl = l->client; WRBUF w = wrbuf_alloc(); const char *name = session_setting_oneval(client_get_database(cl), PZ_NAME); @@ -829,12 +879,13 @@ void show_range_stop(struct session *s, struct record_cluster **recs) void statistics(struct session *se, struct statistics *stat) { - struct client *cl; + struct client_list *l; int count = 0; memset(stat, 0, sizeof(*stat)); - for (cl = se->clients; cl; cl = client_next_in_session(cl)) + for (l = se->clients; l; l = l->next) { + struct client *cl = l->client; if (!client_get_connection(cl)) stat->num_no_connection++; switch (client_get_state(cl)) @@ -926,10 +977,9 @@ static int get_mergekey_from_doc(xmlDoc *doc, xmlNode *root, const char *name, { const char *norm_str; pp2_relevance_token_t prt = - pp2_relevance_tokenize( - service->mergekey_pct, - (const char *) value, 0); + pp2_relevance_tokenize(service->mergekey_pct); + pp2_relevance_first(prt, (const char *) value, 0); if (wrbuf_len(norm_wr) > 0) wrbuf_puts(norm_wr, " "); wrbuf_puts(norm_wr, name); @@ -966,10 +1016,9 @@ static const char *get_mergekey(xmlDoc *doc, struct client *cl, int record_no, { const char *norm_str; pp2_relevance_token_t prt = - pp2_relevance_tokenize( - service->mergekey_pct, - (const char *) mergekey, 0); - + pp2_relevance_tokenize(service->mergekey_pct); + + pp2_relevance_first(prt, (const char *) mergekey, 0); while ((norm_str = pp2_relevance_token_next(prt))) { if (*norm_str) @@ -1086,27 +1135,27 @@ static int ingest_to_cluster(struct client *cl, int ingest_record(struct client *cl, const char *rec, int record_no, NMEM nmem) { - struct session_database *sdb = client_get_database(cl); struct session *se = client_get_session(cl); + int ret = 0; + struct session_database *sdb = client_get_database(cl); struct conf_service *service = se->service; xmlDoc *xdoc = normalize_record(sdb, service, rec, nmem); xmlNode *root; const char *mergekey_norm; - int ret; - + if (!xdoc) return -1; - + root = xmlDocGetRootElement(xdoc); - + if (!check_record_filter(root, sdb)) { yaz_log(YLOG_WARN, "Filtered out record no %d from %s", record_no, - sdb->database->url); + sdb->database->url); xmlFreeDoc(xdoc); return -1; } - + mergekey_norm = get_mergekey(xdoc, cl, record_no, service, nmem); if (!mergekey_norm) { @@ -1114,12 +1163,17 @@ int ingest_record(struct client *cl, const char *rec, xmlFreeDoc(xdoc); return -1; } + client_unlock(cl); + pazpar2_sleep(0.01); session_enter(se); - ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm); + client_lock(cl); + if (client_get_session(cl) == se) + ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm); + client_unlock(cl); session_leave(se); - + client_lock(cl); + xmlFreeDoc(xdoc); - return ret; } @@ -1250,9 +1304,10 @@ static int ingest_to_cluster(struct client *cl, nmem_malloc(se->nmem, sizeof(union data_types)); - prt = pp2_relevance_tokenize( - service->sort_pct, - rec_md->data.text.disp, skip_article); + prt = pp2_relevance_tokenize(service->sort_pct); + + pp2_relevance_first(prt, rec_md->data.text.disp, + skip_article); pp2_relevance_token_next(prt);