X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fsession.c;h=f2acbaaa7ad40218e5cb2b4241498688fb1be3f5;hb=6f67e37390eee5bb4df6a456de88045ef810406d;hp=33331fbb66a8b82c49d634441c7e94a085a7f701;hpb=e357450419e008ed47265e4e7dd54f3ddb5c89f1;p=pazpar2-moved-to-github.git diff --git a/src/session.c b/src/session.c index 33331fb..f2acbaa 100644 --- a/src/session.c +++ b/src/session.c @@ -25,6 +25,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #endif +#include #include #include #include @@ -81,6 +82,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(); @@ -101,12 +107,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. @@ -354,7 +360,7 @@ static int prepare_map(struct session *se, struct session_database *sdb) } } sdb->map = normalize_cache_get(se->normalize_cache, - se->service, s); + se->service->server->config, s); if (!sdb->map) return -1; } @@ -445,17 +451,35 @@ 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) { - while (se->clients) + struct client_list *l; + + session_enter(se); + l = se->clients; + se->clients = 0; + session_leave(se); + + while (l) { - struct client *cl = se->clients; - client_remove_from_session(cl); - client_destroy(cl); + 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; } } @@ -464,17 +488,16 @@ static void session_remove_clients(struct session *se) // setting overrides static int select_targets(struct session *se, const char *filter) { - session_remove_clients(se); 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; @@ -490,17 +513,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; + struct timeval tval; yaz_log(YLOG_DEBUG, "Search"); *addinfo = 0; + + session_remove_clients(se); session_enter(se); reclist_destroy(se->reclist); se->reclist = 0; - nmem_reset(se->nmem); relevance_destroy(&se->relevance); + nmem_reset(se->nmem); se->total_records = se->total_hits = se->total_merged = 0; se->num_termlists = 0; live_channels = select_targets(se, filter); @@ -511,23 +537,29 @@ 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)) + gettimeofday(&tval, 0); + + tval.tv_sec += 5; + + 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 { no_working++; if (client_prep_connection(cl, se->service->z3950_operation_timeout, se->service->z3950_session_timeout, - se->service->server->iochan_man)) + se->service->server->iochan_man, + &tval)) client_start_search(cl); } } @@ -640,21 +672,22 @@ void session_apply_setting(struct session *se, char *dbname, char *setting, } } -void destroy_session(struct session *s) +void destroy_session(struct session *se) { struct session_database *sdb; - session_remove_clients(s); + yaz_log(YLOG_DEBUG, "%p Pazpar2 session destroy", se); + session_remove_clients(se); - for (sdb = s->databases; sdb; sdb = sdb->next) + for (sdb = se->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); - wrbuf_destroy(s->wrbuf); + normalize_cache_destroy(se->normalize_cache); + relevance_destroy(&se->relevance); + reclist_destroy(se->reclist); + nmem_destroy(se->nmem); + service_destroy(se->service); + yaz_mutex_destroy(&se->session_mutex); + wrbuf_destroy(se->wrbuf); } struct session *new_session(NMEM nmem, struct conf_service *service, @@ -663,7 +696,7 @@ struct session *new_session(NMEM nmem, struct conf_service *service, int i; struct session *session = nmem_malloc(nmem, sizeof(*session)); - yaz_log(YLOG_DEBUG, "New Pazpar2 session"); + yaz_log(YLOG_DEBUG, "%p New Pazpar2 session", session); session->service = service; session->relevance = 0; @@ -684,9 +717,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; - - pazpar2_mutex_create(&session->mutex, name); + session->session_mutex = 0; + pazpar2_mutex_create(&session->session_mutex, name); return session; } @@ -694,17 +726,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); @@ -724,19 +757,19 @@ struct hitsbytarget *hitsbytarget(struct session *se, int *count, NMEM nmem) return res; } -struct termlist_score **termlist(struct session *s, const char *name, int *num) +struct termlist_score **termlist(struct session *se, const char *name, int *num) { int i; struct termlist_score **tl = 0; - session_enter(s); - for (i = 0; i < s->num_termlists; i++) - if (!strcmp((const char *) s->termlists[i].name, name)) + session_enter(se); + for (i = 0; i < se->num_termlists; i++) + if (!strcmp((const char *) se->termlists[i].name, name)) { - tl = termlist_highscore(s->termlists[i].termlist, num); + tl = termlist_highscore(se->termlists[i].termlist, num); break; } - session_leave(s); + session_leave(se); return tl; } @@ -753,50 +786,49 @@ void report_nmem_stats(void) } #endif -struct record_cluster *show_single_start(struct session *s, const char *id, +struct record_cluster *show_single_start(struct session *se, const char *id, struct record_cluster **prev_r, struct record_cluster **next_r) { struct record_cluster *r; - session_enter(s); - reclist_enter(s->reclist); + session_enter(se); + reclist_enter(se->reclist); *prev_r = 0; *next_r = 0; - while ((r = reclist_read_record(s->reclist))) + while ((r = reclist_read_record(se->reclist))) { if (!strcmp(r->recid, id)) { - *next_r = reclist_read_record(s->reclist); + *next_r = reclist_read_record(se->reclist); break; } *prev_r = r; } - reclist_leave(s->reclist); + reclist_leave(se->reclist); if (!r) - session_leave(s); + session_leave(se); return r; } -void show_single_stop(struct session *s, struct record_cluster *rec) +void show_single_stop(struct session *se, struct record_cluster *rec) { - session_leave(s); + session_leave(se); } -struct record_cluster **show_range_start(struct session *s, +struct record_cluster **show_range_start(struct session *se, struct reclist_sortparms *sp, int start, int *num, int *total, Odr_int *sumhits) { - struct record_cluster **recs = nmem_malloc(s->nmem, *num - * sizeof(struct record_cluster *)); + struct record_cluster **recs; struct reclist_sortparms *spp; int i; #if USE_TIMING yaz_timing_t t = yaz_timing_create(); #endif - - session_enter(s); - if (!s->relevance) + session_enter(se); + recs = nmem_malloc(se->nmem, *num * sizeof(struct record_cluster *)); + if (!se->relevance) { *num = 0; *total = 0; @@ -808,17 +840,17 @@ struct record_cluster **show_range_start(struct session *s, for (spp = sp; spp; spp = spp->next) if (spp->type == Metadata_sortkey_relevance) { - relevance_prepare_read(s->relevance, s->reclist); + relevance_prepare_read(se->relevance, se->reclist); break; } - reclist_sort(s->reclist, sp); + reclist_sort(se->reclist, sp); - reclist_enter(s->reclist); - *total = reclist_get_num_records(s->reclist); - *sumhits = s->total_hits; + reclist_enter(se->reclist); + *total = reclist_get_num_records(se->reclist); + *sumhits = se->total_hits; for (i = 0; i < start; i++) - if (!reclist_read_record(s->reclist)) + if (!reclist_read_record(se->reclist)) { *num = 0; recs = 0; @@ -827,7 +859,7 @@ struct record_cluster **show_range_start(struct session *s, for (i = 0; i < *num; i++) { - struct record_cluster *r = reclist_read_record(s->reclist); + struct record_cluster *r = reclist_read_record(se->reclist); if (!r) { *num = i; @@ -835,7 +867,7 @@ struct record_cluster **show_range_start(struct session *s, } recs[i] = r; } - reclist_leave(s->reclist); + reclist_leave(se->reclist); } #if USE_TIMING yaz_timing_stop(t); @@ -847,19 +879,20 @@ struct record_cluster **show_range_start(struct session *s, return recs; } -void show_range_stop(struct session *s, struct record_cluster **recs) +void show_range_stop(struct session *se, struct record_cluster **recs) { - session_leave(s); + session_leave(se); } 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)) @@ -1110,7 +1143,7 @@ int ingest_record(struct client *cl, const char *rec, int record_no, NMEM nmem) { struct session *se = client_get_session(cl); - int ret; + 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); @@ -1138,7 +1171,8 @@ int ingest_record(struct client *cl, const char *rec, return -1; } session_enter(se); - ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm); + if (client_get_session(cl) == se) + ret = ingest_to_cluster(cl, xdoc, root, record_no, mergekey_norm); session_leave(se); xmlFreeDoc(xdoc);