#include <yaz/snprintf.h>
#include <yaz/yaz-util.h>
+#include "ppmutex.h"
#include "eventl.h"
#include "parameters.h"
-#include "pazpar2.h"
+#include "session.h"
#include "http.h"
#include "settings.h"
#include "client.h"
struct session *psession;
unsigned int session_id;
int timestamp;
+ int destroy_counter;
+ int activity_counter;
NMEM nmem;
http_sessions_t http_sessions;
struct http_session *next;
http_sessions_t hs = xmalloc(sizeof(*hs));
hs->session_list = 0;
hs->mutex = 0;
- yaz_mutex_create(&hs->mutex);
+ pazpar2_mutex_create(&hs->mutex, "http_sessions");
return hs;
}
}
struct http_session *http_session_create(struct conf_service *service,
- http_sessions_t http_sessions)
+ http_sessions_t http_sessions,
+ unsigned int sesid)
{
NMEM nmem = nmem_create();
struct http_session *r = nmem_malloc(nmem, sizeof(*r));
+ char tmp_str[50];
- r->psession = new_session(nmem, service);
- r->session_id = 0;
+ sprintf(tmp_str, "session#%u", sesid);
+ r->psession = new_session(nmem, service, tmp_str);
+ r->session_id = sesid;
r->timestamp = 0;
r->nmem = nmem;
+ r->destroy_counter = r->activity_counter = 0;
r->http_sessions = http_sessions;
yaz_mutex_enter(http_sessions->mutex);
http_sessions->session_list = r;
yaz_mutex_leave(http_sessions->mutex);
- r->timeout_iochan = iochan_create(-1, session_timeout, 0);
+ r->timeout_iochan = iochan_create(-1, session_timeout, 0, "http_session_timeout");
iochan_setdata(r->timeout_iochan, r);
+ yaz_log(YLOG_LOG, "timeout=%d", service->session_timeout);
iochan_settimeout(r->timeout_iochan, service->session_timeout);
iochan_add(service->server->iochan_man, r->timeout_iochan);
void http_session_destroy(struct http_session *s)
{
- struct http_session **p;
+ int must_destroy = 1;
http_sessions_t http_sessions = s->http_sessions;
+ yaz_log(YLOG_LOG, "http_session_destroy %u", s->session_id);
yaz_mutex_enter(http_sessions->mutex);
- for (p = &http_sessions->session_list; *p; p = &(*p)->next)
- if (*p == s)
- {
- *p = (*p)->next;
- break;
- }
+
+ /* only if http_session destroy was already called, we will allow it
+ to be destroyed */
+ if (s->destroy_counter != s->activity_counter)
+ must_destroy = 0;
+
+ s->destroy_counter = s->activity_counter = 0;
+ if (must_destroy)
+ {
+ struct http_session **p = 0;
+ for (p = &http_sessions->session_list; *p; p = &(*p)->next)
+ if (*p == s)
+ {
+ *p = (*p)->next;
+ break;
+ }
+ }
yaz_mutex_leave(http_sessions->mutex);
- yaz_log(YLOG_LOG, "Destroying session %u", s->session_id);
- iochan_destroy(s->timeout_iochan);
- destroy_session(s->psession);
- nmem_destroy(s->nmem);
+ if (must_destroy)
+ { /* destroying for real */
+ yaz_log(YLOG_LOG, "Destroying session %u", s->session_id);
+ iochan_destroy(s->timeout_iochan);
+ destroy_session(s->psession);
+ nmem_destroy(s->nmem);
+ }
+ else {
+ yaz_log(YLOG_LOG, "Active clients on session %u. Waiting for new timeout.", s->session_id);
+ }
+
}
static const char *get_msg(enum pazpar2_error_code code)
for (p = http_sessions->session_list; p; p = p->next)
if (id == p->session_id)
break;
+ if (p)
+ p->activity_counter++;
yaz_mutex_leave(http_sessions->mutex);
if (p)
iochan_activity(p->timeout_iochan);
return;
}
}
- s = http_session_create(service, c->http_sessions);
+ sesid = make_sessionid();
+ s = http_session_create(service, c->http_sessions, sesid);
yaz_log(YLOG_DEBUG, "HTTP Session init");
if (!clear || *clear == '0')
else
yaz_log(YLOG_LOG, "No databases preloaded");
- sesid = make_sessionid();
- s->session_id = sesid;
if (process_settings(s->psession, c->request, c->response) < 0)
return;
sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX
- "<init><status>OK</status><session>%u", sesid);
+ "<init><status>OK</status><session>%d", sesid);
if (c->server->server_id)
{
strcat(buf, ".");
return;
}
wrbuf_rewind(c->wrbuf);
- if (!(rec = show_single(s->psession, idstr, &prev_r, &next_r)))
+ if (!(rec = show_single_start(s->psession, idstr, &prev_r, &next_r)))
{
if (session_active_clients(s->psession) == 0)
{
if (!r)
{
error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
- return;
}
else
{
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
}
+ show_single_stop(s->psession, rec);
}
static void cmd_record_ready(void *data)
return;
}
- rl = show(s->psession, sp, startn, &numn, &total, &total_hits, c->nmem);
+
+ rl = show_range_start(s->psession, sp, startn, &numn, &total, &total_hits);
wrbuf_rewind(c->wrbuf);
wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "<show>\n<status>OK</status>\n");
if (ccount > 1)
wrbuf_printf(c->wrbuf, "<count>%d</count>\n", ccount);
if (strstr(sort, "relevance"))
- wrbuf_printf(c->wrbuf, "<relevance>%d</relevance>\n", rec->relevance);
+ wrbuf_printf(c->wrbuf, "<relevance>%d</relevance>\n",
+ rec->relevance_score);
wrbuf_puts(c->wrbuf, "<recid>");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_puts(c->wrbuf, "</recid>\n");
wrbuf_puts(c->wrbuf, "</hit>\n");
}
+ show_range_stop(s->psession, rl);
+
wrbuf_puts(c->wrbuf, "</show>\n");
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);