X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=c800b62c8876170567de770df4a95c427ea1dbf4;hb=5fd1cc0768a02607d750dd8d53149abfb94d483d;hp=3631740998c4650f328e7eb0734aa1bf9a6f7b28;hpb=e356b466f900722adf6c4f13588e2bed05555134;p=pazpar2-moved-to-github.git
diff --git a/src/http_command.c b/src/http_command.c
index 3631740..c800b62 100644
--- a/src/http_command.c
+++ b/src/http_command.c
@@ -35,7 +35,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "eventl.h"
#include "parameters.h"
-#include "pazpar2.h"
+#include "session.h"
#include "http.h"
#include "settings.h"
#include "client.h"
@@ -50,11 +50,44 @@ struct http_session {
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;
};
-static struct http_session *session_list = 0; /* thread pr */
+struct http_sessions {
+ struct http_session *session_list;
+ YAZ_MUTEX mutex;
+};
+
+http_sessions_t http_sessions_create(void)
+{
+ http_sessions_t hs = xmalloc(sizeof(*hs));
+ hs->session_list = 0;
+ hs->mutex = 0;
+ yaz_mutex_create(&hs->mutex);
+ return hs;
+}
+
+void http_sessions_destroy(http_sessions_t hs)
+{
+ if (hs)
+ {
+ struct http_session *s = hs->session_list;
+ while (s)
+ {
+ struct http_session *s_next = s->next;
+ iochan_destroy(s->timeout_iochan);
+ destroy_session(s->psession);
+ nmem_destroy(s->nmem);
+ s = s_next;
+ }
+ yaz_mutex_destroy(&hs->mutex);
+ xfree(hs);
+ }
+}
void http_session_destroy(struct http_session *s);
@@ -64,7 +97,8 @@ static void session_timeout(IOCHAN i, int event)
http_session_destroy(s);
}
-struct http_session *http_session_create(struct conf_service *service)
+struct http_session *http_session_create(struct conf_service *service,
+ http_sessions_t http_sessions)
{
NMEM nmem = nmem_create();
struct http_session *r = nmem_malloc(nmem, sizeof(*r));
@@ -73,30 +107,61 @@ struct http_session *http_session_create(struct conf_service *service)
r->session_id = 0;
r->timestamp = 0;
r->nmem = nmem;
- r->next = session_list;
- session_list = r;
+ r->destroy_counter = r->activity_counter;
+ r->http_sessions = http_sessions;
+
+ yaz_mutex_enter(http_sessions->mutex);
+ r->next = http_sessions->session_list;
+ http_sessions->session_list = r;
+ yaz_mutex_leave(http_sessions->mutex);
+
r->timeout_iochan = iochan_create(-1, session_timeout, 0);
iochan_setdata(r->timeout_iochan, r);
+ yaz_log(YLOG_LOG, "timeout=%d", service->session_timeout);
iochan_settimeout(r->timeout_iochan, service->session_timeout);
- pazpar2_add_channel(r->timeout_iochan);
+ iochan_add(service->server->iochan_man, r->timeout_iochan);
return r;
}
void http_session_destroy(struct http_session *s)
{
- struct http_session **p;
+ int must_destroy = 1;
- for (p = &session_list; *p; p = &(*p)->next)
- if (*p == s)
- {
- *p = (*p)->next;
- break;
- }
- yaz_log(YLOG_LOG, "Destroying session %u", s->session_id);
- iochan_destroy(s->timeout_iochan);
- destroy_session(s->psession);
- nmem_destroy(s->nmem);
+ 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);
+
+ /* 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;
+
+ /* only if there are no active Z39.50 clients we will allow it to be
+ destroyed */
+ if (session_active_clients(s->psession))
+ 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);
+ 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);
+ }
}
static const char *get_msg(enum pazpar2_error_code code)
@@ -185,10 +250,13 @@ unsigned int make_sessionid(void)
return res;
}
-static struct http_session *locate_session(struct http_request *rq, struct http_response *rs)
+static struct http_session *locate_session(struct http_channel *c)
{
+ struct http_response *rs = c->response;
+ struct http_request *rq = c->request;
struct http_session *p;
const char *session = http_argbyname(rq, "session");
+ http_sessions_t http_sessions = c->http_sessions;
unsigned int id;
if (!session)
@@ -197,14 +265,18 @@ static struct http_session *locate_session(struct http_request *rq, struct http_
return 0;
}
id = atoi(session);
- for (p = session_list; p; p = p->next)
+ yaz_mutex_enter(http_sessions->mutex);
+ for (p = http_sessions->session_list; p; p = p->next)
if (id == p->session_id)
- {
- iochan_activity(p->timeout_iochan);
- return p;
- }
- error(rs, PAZPAR2_NO_SESSION, session);
- return 0;
+ break;
+ if (p)
+ p->activity_counter++;
+ yaz_mutex_leave(http_sessions->mutex);
+ if (p)
+ iochan_activity(p->timeout_iochan);
+ else
+ error(rs, PAZPAR2_NO_SESSION, session);
+ return p;
}
// Decode settings parameters and apply to session
@@ -284,7 +356,7 @@ static void cmd_init(struct http_channel *c)
return;
}
}
- s = http_session_create(service);
+ s = http_session_create(service, c->http_sessions);
yaz_log(YLOG_DEBUG, "HTTP Session init");
if (!clear || *clear == '0')
@@ -324,7 +396,7 @@ static void cmd_settings(struct http_channel *c)
{
struct http_response *rs = c->response;
struct http_request *rq = c->request;
- struct http_session *s = locate_session(rq, rs);
+ struct http_session *s = locate_session(c);
const char *content_type = http_lookup_header(rq->headers, "Content-Type");
if (!s)
@@ -404,7 +476,7 @@ static void cmd_termlist(struct http_channel *c)
{
struct http_response *rs = c->response;
struct http_request *rq = c->request;
- struct http_session *s = locate_session(rq, rs);
+ struct http_session *s = locate_session(c);
struct termlist_score **p;
int len;
int i;
@@ -479,7 +551,7 @@ static void cmd_bytarget(struct http_channel *c)
{
struct http_response *rs = c->response;
struct http_request *rq = c->request;
- struct http_session *s = locate_session(rq, rs);
+ struct http_session *s = locate_session(c);
struct hitsbytarget *ht;
const char *settings = http_argbyname(rq, "settings");
int count, i;
@@ -639,7 +711,7 @@ static void cmd_record(struct http_channel *c)
{
struct http_response *rs = c->response;
struct http_request *rq = c->request;
- struct http_session *s = locate_session(rq, rs);
+ struct http_session *s = locate_session(c);
struct record_cluster *rec, *prev_r, *next_r;
struct record *r;
struct conf_service *service;
@@ -656,7 +728,7 @@ static void cmd_record(struct http_channel *c)
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)
{
@@ -686,7 +758,6 @@ static void cmd_record(struct http_channel *c)
if (!r)
{
error(rs, PAZPAR2_RECORD_FAIL, "no record at offset given");
- return;
}
else
{
@@ -734,6 +805,7 @@ static void cmd_record(struct http_channel *c)
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)
@@ -747,7 +819,7 @@ static void show_records(struct http_channel *c, int active)
{
struct http_request *rq = c->request;
struct http_response *rs = c->response;
- struct http_session *s = locate_session(rq, rs);
+ struct http_session *s = locate_session(c);
struct record_cluster **rl;
struct reclist_sortparms *sp;
const char *start = http_argbyname(rq, "start");
@@ -778,7 +850,8 @@ static void show_records(struct http_channel *c, int active)
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 "\nOK\n");
@@ -802,13 +875,16 @@ static void show_records(struct http_channel *c, int active)
if (ccount > 1)
wrbuf_printf(c->wrbuf, "%d\n", ccount);
if (strstr(sort, "relevance"))
- wrbuf_printf(c->wrbuf, "%d\n", rec->relevance);
+ wrbuf_printf(c->wrbuf, "%d\n",
+ rec->relevance_score);
wrbuf_puts(c->wrbuf, "");
wrbuf_xmlputs(c->wrbuf, rec->recid);
wrbuf_puts(c->wrbuf, "\n");
wrbuf_puts(c->wrbuf, "\n");
}
+ show_range_stop(s->psession, rl);
+
wrbuf_puts(c->wrbuf, "\n");
rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf));
http_send_response(c);
@@ -824,8 +900,7 @@ static void show_records_ready(void *data)
static void cmd_show(struct http_channel *c)
{
struct http_request *rq = c->request;
- struct http_response *rs = c->response;
- struct http_session *s = locate_session(rq, rs);
+ struct http_session *s = locate_session(c);
const char *block = http_argbyname(rq, "block");
int status;
@@ -853,9 +928,8 @@ static void cmd_show(struct http_channel *c)
static void cmd_ping(struct http_channel *c)
{
- struct http_request *rq = c->request;
struct http_response *rs = c->response;
- struct http_session *s = locate_session(rq, rs);
+ struct http_session *s = locate_session(c);
if (!s)
return;
rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK";
@@ -891,7 +965,7 @@ static void cmd_search(struct http_channel *c)
{
struct http_request *rq = c->request;
struct http_response *rs = c->response;
- struct http_session *s = locate_session(rq, rs);
+ struct http_session *s = locate_session(c);
const char *query = http_argbyname(rq, "query");
const char *filter = http_argbyname(rq, "filter");
const char *maxrecs = http_argbyname(rq, "maxrecs");
@@ -924,9 +998,8 @@ static void cmd_search(struct http_channel *c)
static void cmd_stat(struct http_channel *c)
{
- struct http_request *rq = c->request;
struct http_response *rs = c->response;
- struct http_session *s = locate_session(rq, rs);
+ struct http_session *s = locate_session(c);
struct statistics stat;
int clients;