X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp_command.c;h=eb799f039779d69ad3213738aac3947afe7e379a;hb=2cd4639d9c1f2f54935c393002cace28a4076a4b;hp=6a0a7b485efbbc9e068764f1a4dfae6e5a65c605;hpb=b7c5f432169f9b532ad006c369e28631cdf3c8ce;p=pazpar2-moved-to-github.git diff --git a/src/http_command.c b/src/http_command.c index 6a0a7b4..eb799f0 100644 --- a/src/http_command.c +++ b/src/http_command.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2010 Index Data + Copyright (C) 2006-2011 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -41,6 +41,32 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include "settings.h" #include "client.h" +#ifdef HAVE_MALLINFO +#include + +void print_meminfo(WRBUF wrbuf) { + + struct mallinfo minfo; + minfo = mallinfo(); + wrbuf_printf(wrbuf, " \n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " %d\n" + " \n", + minfo.arena, minfo.uordblks, minfo.fordblks,minfo.ordblks, minfo.keepcost, minfo.hblks, minfo.hblkhd, minfo.arena + minfo.hblkhd, minfo.uordblks + minfo.hblkhd); + +} +#else +#define print_meminfo(x) +#endif + + // Update this when the protocol changes #define PAZPAR2_PROTOCOL_VERSION "1" @@ -61,14 +87,33 @@ struct http_session { struct http_sessions { struct http_session *session_list; YAZ_MUTEX mutex; + int log_level; }; +static YAZ_MUTEX g_http_session_mutex = 0; +static int g_http_sessions = 0; + +int http_session_use(int delta) +{ + int sessions; + if (!g_http_session_mutex) + yaz_mutex_create(&g_http_session_mutex); + yaz_mutex_enter(g_http_session_mutex); + g_http_sessions += delta; + sessions = g_http_sessions; + yaz_mutex_leave(g_http_session_mutex); + yaz_log(YLOG_DEBUG, "%s sesions=%d", delta == 0 ? "" : (delta > 0 ? "INC" : "DEC"), sessions); + return sessions; + +} + http_sessions_t http_sessions_create(void) { http_sessions_t hs = xmalloc(sizeof(*hs)); hs->session_list = 0; hs->mutex = 0; pazpar2_mutex_create(&hs->mutex, "http_sessions"); + hs->log_level = yaz_log_module_level("HTTP"); return hs; } @@ -107,7 +152,7 @@ struct http_session *http_session_create(struct conf_service *service, char tmp_str[50]; sprintf(tmp_str, "session#%u", sesid); - r->psession = new_session(nmem, service, tmp_str); + r->psession = new_session(nmem, service, sesid); r->session_id = sesid; r->timestamp = 0; r->nmem = nmem; @@ -121,10 +166,11 @@ struct http_session *http_session_create(struct conf_service *service, r->timeout_iochan = iochan_create(-1, session_timeout, 0, "http_session_timeout"); iochan_setdata(r->timeout_iochan, r); - yaz_log(YLOG_LOG, "%p HTTP session %u created. timeout chan=%p timeout=%d", r, sesid, r->timeout_iochan, service->session_timeout); + yaz_log(http_sessions->log_level, "%p Session %u created. timeout chan=%p timeout=%d", r, sesid, r->timeout_iochan, service->session_timeout); iochan_settimeout(r->timeout_iochan, service->session_timeout); iochan_add(service->server->iochan_man, r->timeout_iochan); + http_session_use(1); return r; } @@ -134,12 +180,12 @@ void http_session_destroy(struct http_session *s) http_sessions_t http_sessions = s->http_sessions; - yaz_log(YLOG_LOG, "%p HTTP session destroy %u", s, s->session_id); + yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id); yaz_mutex_enter(http_sessions->mutex); /* only if http_session has no active http sessions on it can be destroyed */ if (s->destroy_counter == s->activity_counter) { - must_destroy = 1; struct http_session **p = 0; + must_destroy = 1; for (p = &http_sessions->session_list; *p; p = &(*p)->next) if (*p == s) { @@ -150,13 +196,15 @@ void http_session_destroy(struct http_session *s) yaz_mutex_leave(http_sessions->mutex); if (must_destroy) { /* destroying for real */ - yaz_log(YLOG_LOG, "Destroying session %u", s->session_id); + yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed", s, s->session_id); iochan_destroy(s->timeout_iochan); destroy_session(s->psession); + http_session_use(-1); nmem_destroy(s->nmem); } else { - yaz_log(YLOG_DEBUG, "%p HTTP Session %d. Active clients (%d-%d). Waiting for new timeout.", s, s->session_id, s->activity_counter, s->destroy_counter); + yaz_log(http_sessions->log_level, "%p HTTP Session %u destroyed delayed. Active clients (%d-%d). Waiting for new timeout.", + s, s->session_id, s->activity_counter, s->destroy_counter); } } @@ -224,7 +272,7 @@ unsigned int make_sessionid(void) unsigned int res; seq++; - if (global_parameters.debug_mode) + if (global_parameters.predictable_sessions) res = seq; else { @@ -277,7 +325,7 @@ static struct http_session *locate_session(struct http_channel *c) } // Call after use of locate_session, in order to increment the destroy_counter -static struct http_session *release_session(struct http_channel *c, struct http_session *session) { +static void release_session(struct http_channel *c, struct http_session *session) { http_sessions_t http_sessions = c->http_sessions; yaz_mutex_enter(http_sessions->mutex); if (session) @@ -317,7 +365,12 @@ static int process_settings(struct session *se, struct http_request *rq, static void cmd_exit(struct http_channel *c) { + char buf[1024]; + struct http_response *rs = c->response; yaz_log(YLOG_WARN, "exit"); + sprintf(buf, HTTP_COMMAND_RESPONSE_PREFIX "OK"); + rs->payload = nmem_strdup(c->nmem, buf); + http_send_response(c); http_close_server(c->server); } @@ -365,11 +418,11 @@ static void cmd_init(struct http_channel *c) sesid = make_sessionid(); s = http_session_create(service, c->http_sessions, sesid); - yaz_log(YLOG_DEBUG, "HTTP Session init"); + yaz_log(c->http_sessions->log_level, "%p Session init %u ", s, sesid); if (!clear || *clear == '0') session_init_databases(s->psession); else - yaz_log(YLOG_LOG, "No databases preloaded"); + yaz_log(YLOG_LOG, "HTTP Session %u init: No databases preloaded", sesid); if (process_settings(s->psession, c->request, c->response) < 0) return; @@ -423,8 +476,10 @@ static void cmd_settings(struct http_channel *c) xmlFreeDoc(doc); } - if (process_settings(s->psession, rq, rs) < 0) + if (process_settings(s->psession, rq, rs) < 0) { + release_session(c,s); return; + } rs->payload = HTTP_COMMAND_RESPONSE_PREFIX "OK"; http_send_response(c); release_session(c,s); @@ -439,7 +494,7 @@ static int cmp_ht(const void *p1, const void *p2) } // This implements functionality somewhat similar to 'bytarget', but in a termlist form -static void targets_termlist(WRBUF wrbuf, struct session *se, int num, +static int targets_termlist(WRBUF wrbuf, struct session *se, int num, NMEM nmem) { struct hitsbytarget *ht; @@ -476,6 +531,7 @@ static void targets_termlist(WRBUF wrbuf, struct session *se, int num, ht[i].diagnostic); wrbuf_puts(wrbuf, "\n"); } + return count; } static void cmd_termlist(struct http_channel *c) @@ -490,6 +546,7 @@ static void cmd_termlist(struct http_channel *c) const char *nums = http_argbyname(rq, "num"); int num = 15; int status; + WRBUF debug_log = wrbuf_alloc(); if (!s) return; @@ -516,16 +573,19 @@ static void cmd_termlist(struct http_channel *c) tp = name + strlen(name); strncpy(tname, name, tp - name); tname[tp - name] = '\0'; - wrbuf_puts(c->wrbuf, "wrbuf, tname); wrbuf_puts(c->wrbuf, "\">\n"); - if (!strcmp(tname, "xtargets")) - targets_termlist(c->wrbuf, s->psession, num, c->nmem); + if (!strcmp(tname, "xtargets")) { + int targets = targets_termlist(c->wrbuf, s->psession, num, c->nmem); + wrbuf_printf(debug_log, " xtargets: %d", targets); + } else { p = termlist(s->psession, tname, &len); - if (p) + if (p && len) + wrbuf_printf(debug_log, " %s: %d", tname, len); + if (p) { for (i = 0; i < len && i < num; i++){ // prevnt sending empty term elements if (!p[i]->term || !p[i]->term[0]) @@ -541,6 +601,7 @@ static void cmd_termlist(struct http_channel *c) p[i]->frequency); wrbuf_puts(c->wrbuf, "\n"); } + } } wrbuf_puts(c->wrbuf, "\n"); name = tp; @@ -548,11 +609,85 @@ static void cmd_termlist(struct http_channel *c) name++; } wrbuf_puts(c->wrbuf, "\n"); + yaz_log(YLOG_DEBUG, "termlist response: %s ", wrbuf_cstr(debug_log)); + wrbuf_destroy(debug_log); rs->payload = nmem_strdup(rq->channel->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); release_session(c,s); } +size_t session_get_memory_status(struct session *session); + +static void session_status(struct http_channel *c, struct http_session *s) +{ + size_t session_nmem; + wrbuf_printf(c->wrbuf, "%u\n", s->activity_counter); + wrbuf_printf(c->wrbuf, "%zu\n", nmem_total(s->nmem) ); + session_nmem = session_get_memory_status(s->psession); + wrbuf_printf(c->wrbuf, "%zu\n", session_nmem); +} + +static void cmd_session_status(struct http_channel *c) { + struct http_response *rs = c->response; + struct http_session *s = locate_session(c); + if (!s) + return; + + wrbuf_rewind(c->wrbuf); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "OK\n"); + session_status(c, s); + wrbuf_puts(c->wrbuf, "\n"); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); + http_send_response(c); + release_session(c,s); + +} + +int sessions_count(void); +int clients_count(void); +#ifdef HAVE_RESULTSETS_COUNT +int resultsets_count(void); +#else +#define resultsets_count() 0 +#endif + +static void cmd_server_status(struct http_channel *c) +{ + struct http_response *rs = c->response; + int sessions = sessions_count(); + int clients = clients_count(); + int resultsets = resultsets_count(); + wrbuf_rewind(c->wrbuf); + wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n"); + wrbuf_printf(c->wrbuf, " %u\n", sessions); + wrbuf_printf(c->wrbuf, " %u\n", clients); + /* Only works if yaz has been compiled with enabling of this */ + wrbuf_printf(c->wrbuf, " %u\n",resultsets); + print_meminfo(c->wrbuf); + +/* TODO add all sessions status */ +/* http_sessions_t http_sessions = c->http_sessions; */ +/* struct http_session *p; */ +/* + yaz_mutex_enter(http_sessions->mutex); + for (p = http_sessions->session_list; p; p = p->next) { + p->activity_counter++; + wrbuf_puts(c->wrbuf, "\n"); + wrbuf_printf(c->wrbuf, "%s\n", p->session_id); + yaz_mutex_leave(http_sessions->mutex); + session_status(c, p); + wrbuf_puts(c->wrbuf, "\n"); + yaz_mutex_enter(http_sessions->mutex); + p->activity_counter--; + } + yaz_mutex_leave(http_sessions->mutex); +*/ + wrbuf_puts(c->wrbuf, "\n"); + rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); + http_send_response(c); + xmalloc_trav(0); +} + static void cmd_bytarget(struct http_channel *c) { @@ -594,11 +729,10 @@ static void cmd_bytarget(struct http_channel *c) if (settings && *settings == '1') { wrbuf_puts(c->wrbuf, "\n"); - wrbuf_puts(c->wrbuf, wrbuf_cstr(ht[i].settings_xml)); + wrbuf_puts(c->wrbuf, ht[i].settings_xml); wrbuf_puts(c->wrbuf, "\n"); } wrbuf_puts(c->wrbuf, ""); - wrbuf_destroy(ht[i].settings_xml); } wrbuf_puts(c->wrbuf, ""); @@ -923,18 +1057,30 @@ static void cmd_show(struct http_channel *c) if (block) { - if (status && reclist_get_num_records(s->psession->reclist) == 0) + if (!strcmp(block, "preferred") && !session_is_preferred_clients_ready(s->psession) && reclist_get_num_records(s->psession->reclist) == 0) { + // if there is already a watch/block. we do not block this one + if (session_set_watch(s->psession, SESSION_WATCH_SHOW_PREF, + show_records_ready, c, c) != 0) + { + yaz_log(c->http_sessions->log_level, + "%p Session %u: Blocking on cmd_show. Waiting for preferred targets", s, s->session_id); + } + release_session(c,s); + return; + + } + else if (status && reclist_get_num_records(s->psession->reclist) == 0) { // if there is already a watch/block. we do not block this one if (session_set_watch(s->psession, SESSION_WATCH_SHOW, show_records_ready, c, c) != 0) { - yaz_log(YLOG_DEBUG, "Blocking on cmd_show"); + yaz_log(c->http_sessions->log_level, "%p Session %u: Blocking on cmd_show", s, s->session_id); } + release_session(c,s); return; } } - show_records(c, status); release_session(c,s); } @@ -1060,7 +1206,7 @@ static void cmd_info(struct http_channel *c) wrbuf_rewind(c->wrbuf); wrbuf_puts(c->wrbuf, HTTP_COMMAND_RESPONSE_PREFIX "\n"); wrbuf_puts(c->wrbuf, " \n"); - wrbuf_puts(c->wrbuf, "wrbuf, " wrbuf, " sha1=\"%s\"", PAZPAR2_VERSION_SHA1); #endif @@ -1078,6 +1224,8 @@ static void cmd_info(struct http_channel *c) wrbuf_puts(c->wrbuf, " \n"); + info_services(c->server, c->wrbuf); + wrbuf_puts(c->wrbuf, ""); rs->payload = nmem_strdup(c->nmem, wrbuf_cstr(c->wrbuf)); http_send_response(c); @@ -1095,6 +1243,8 @@ struct { { "search", cmd_search }, { "termlist", cmd_termlist }, { "exit", cmd_exit }, + { "session-status", cmd_session_status }, + { "server-status", cmd_server_status }, { "ping", cmd_ping }, { "record", cmd_record }, { "info", cmd_info },