/* 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
struct http_server
{
struct http_buf *http_buf_freelist;
+ int http_buf_freelist_count;
+ int http_buf_freelist_max;
+
struct http_channel *http_channel_freelist;
+ int http_channel_freelist_count;
+ int http_channel_freelist_max;
YAZ_MUTEX mutex;
int listener_socket;
int ref_count;
{
r = hs->http_buf_freelist;
hs->http_buf_freelist = hs->http_buf_freelist->next;
+ hs->http_buf_freelist_count--;
}
yaz_mutex_leave(hs->mutex);
if (!r)
static void http_buf_destroy(http_server_t hs, struct http_buf *b)
{
yaz_mutex_enter(hs->mutex);
- b->next = hs->http_buf_freelist;
- hs->http_buf_freelist = b;
+ if (hs->http_buf_freelist_max > 0 && hs->http_buf_freelist_count >= hs->http_buf_freelist_max) {
+ xfree(b);
+ while ((b = hs->http_buf_freelist)) {
+ xfree(b);
+ hs->http_buf_freelist = hs->http_buf_freelist->next;
+ }
+ hs->http_buf_freelist_count = 0;
+ }
+ else {
+ b->next = hs->http_buf_freelist;
+ hs->http_buf_freelist = b;
+ hs->http_buf_freelist_count++;
+ yaz_log(YLOG_DEBUG, "Free %d http buffers on server.", hs->http_buf_freelist_count);
+ }
yaz_mutex_leave(hs->mutex);
}
http_server = s->http_server; /* save it for destroy (decref) */
yaz_mutex_enter(s->http_server->mutex);
- s->next = s->http_server->http_channel_freelist;
- s->http_server->http_channel_freelist = s;
+ if (s->http_server->http_channel_freelist_max > 0 && s->http_server->http_channel_freelist_count >= s->http_server->http_channel_freelist_max) {
+ while ((s->next = s->http_server->http_channel_freelist)) {
+ nmem_destroy(s->next->nmem);
+ wrbuf_destroy(s->next->wrbuf);
+ xfree(s->next);
+ s->http_server->http_channel_freelist = s->http_server->http_channel_freelist->next;
+ }
+ s->http_server->http_channel_freelist_count = 0;
+ }
+ else {
+ s->next = s->http_server->http_channel_freelist;
+ s->http_server->http_channel_freelist = s;
+ s->http_server->http_channel_freelist_count++;
+ yaz_log(YLOG_DEBUG, "Free %d channels on server.", s->http_server->http_channel_freelist_count);
+ }
yaz_mutex_leave(s->http_server->mutex);
http_server_destroy(http_server);
yaz_mutex_enter(hs->mutex);
r = hs->http_channel_freelist;
- if (r)
+ if (r) {
hs->http_channel_freelist = r->next;
+ hs->http_channel_freelist_count--;
+ }
yaz_mutex_leave(hs->mutex);
if (r)
hs->mutex = 0;
hs->proxy_addr = 0;
hs->ref_count = 1;
- hs->http_buf_freelist = 0;
- hs->http_channel_freelist = 0;
hs->http_sessions = 0;
+
+ hs->http_channel_freelist = 0;
+ hs->http_channel_freelist_count = 0;
+ /* Disable max check */
+ hs->http_channel_freelist_max = 0;
+
+ hs->http_buf_freelist = 0;
+ hs->http_buf_freelist_count = 0;
+ /* Disable max check */
+ hs->http_buf_freelist_max = 0;
return hs;
}