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.
}
}
sdb->map = normalize_cache_get(se->normalize_cache,
- se->service, s);
+ se->service->server->config, s);
if (!sdb->map)
return -1;
}
static void session_remove_clients(struct session *se)
{
- struct client_list *l = se->clients;
+ 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;
}
- se->clients = 0;
}
// Associates a set of clients with a session;
// 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);
}
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);
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
{
{
struct session_database *sdb;
+ yaz_log(YLOG_DEBUG, "%p Pazpar2 session destroy", s);
session_remove_clients(s);
for (sdb = s->databases; sdb; sdb = sdb->next)
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);
}
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;
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;
}
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);
xmlFreeDoc(xdoc);
return -1;
}
+ client_unlock(cl);
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;