struct parameters global_parameters =
{
0, // dump_records
- 0 // debug_mode
+ 0, // debug_mode
+ 0, // predictable sessions
};
struct client_list {
/* session counting (1) , disable client counting (0) */
static YAZ_MUTEX g_session_mutex = 0;
static int no_sessions = 0;
+static int no_session_total = 0;
static int session_use(int delta)
{
yaz_mutex_create(&g_session_mutex);
yaz_mutex_enter(g_session_mutex);
no_sessions += delta;
+ if (delta > 0)
+ no_session_total += delta;
sessions = no_sessions;
yaz_mutex_leave(g_session_mutex);
yaz_log(YLOG_DEBUG, "%s sesions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), no_sessions);
return session_use(0);
}
+int session_count_total(void) {
+ int total = 0;
+ if (!g_session_mutex)
+ return 0;
+ yaz_mutex_enter(g_session_mutex);
+ total = no_session_total;
+ yaz_mutex_leave(g_session_mutex);
+ return total;
+}
+
+
static void log_xml_doc(xmlDoc *doc)
{
FILE *lf = yaz_log_file();
s->num_termlists = i + 1;
}
-#if
+#if 0
session_log(s, YLOG_DEBUG, "Facets for %s: %s norm:%s (%d)", type, value, wrbuf_cstr(facet_wrbuf), count);
#endif
termlist_insert(s->termlists[i].termlist, wrbuf_cstr(facet_wrbuf),
return res == 0;
}
-
-
enum pazpar2_error_code search(struct session *se,
const char *query,
const char *startrecs, const char *maxrecs,
}
}
-void destroy_session(struct session *se)
-{
+void session_destroy(struct session *se) {
struct session_database *sdb;
session_log(se, YLOG_DEBUG, "Destroying");
session_use(-1);
wrbuf_destroy(se->wrbuf);
}
+/* Depreciated: use session_destroy */
+void destroy_session(struct session *se)
+{
+ session_destroy(se);
+}
+
size_t session_get_memory_status(struct session *session) {
size_t session_nmem;
if (session == 0)
res[*count].state = client_get_state_str(cl);
res[*count].connected = client_get_connection(cl) ? 1 : 0;
session_settings_dump(se, client_get_database(cl), w);
- res[*count].settings_xml = w;
+ res[*count].settings_xml = nmem_strdup(nmem, wrbuf_cstr(w));
+ wrbuf_destroy(w);
(*count)++;
}
session_leave(se);
return res;
}
-struct termlist_score **termlist(struct session *se, const char *name, int *num)
+struct termlist_score **get_termlist_score(struct session *se,
+ const char *name, int *num)
{
int i;
struct termlist_score **tl = 0;
\param nmem working NMEM
\retval 0 OK
\retval -1 failure
+ \retval -2 Filtered
*/
int ingest_record(struct client *cl, const char *rec,
int record_no, NMEM nmem)
if (!check_record_filter(root, sdb))
{
- session_log(se, YLOG_WARN, "Filtered out record no %d from %s",
+ session_log(se, YLOG_LOG, "Filtered out record no %d from %s",
record_no, sdb->database->url);
xmlFreeDoc(xdoc);
- return -1;
+ return -2;
}
mergekey_norm = get_mergekey(xdoc, cl, record_no, service, nmem);
// construct facets ... unless the client already has reported them
if (ser_md->termlist && !client_has_facet(cl, (char *) type))
{
-
if (ser_md->type == Metadata_type_year)
{
char year[64];