X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fhttp.c;h=c0f9596c0b0c612d2fecc95952c6e4dd6fe88261;hb=1db48a73126beef112e9a3de775832173fa317f3;hp=1ce0aa4fc9f0d5a2926c8d23d3673db429b5528b;hpb=f13ac948b76f05aeb46350de335406f9626054ba;p=pazpar2-moved-to-github.git

diff --git a/src/http.c b/src/http.c
index 1ce0aa4..c0f9596 100644
--- a/src/http.c
+++ b/src/http.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2011 Index Data
+   Copyright (C) 2006-2012 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
@@ -70,6 +70,7 @@ typedef int socklen_t;
 #include "ppmutex.h"
 #include "session.h"
 #include "http.h"
+#include "parameters.h"
 
 #define MAX_HTTP_HEADER 4096
 
@@ -98,13 +99,6 @@ static void http_server_incref(http_server_t hs);
 
 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;
@@ -133,18 +127,7 @@ const char *http_lookup_header(struct http_header *header,
 
 static struct http_buf *http_buf_create(http_server_t hs)
 {
-    struct http_buf *r = 0;
-
-    yaz_mutex_enter(hs->mutex);
-    if (hs->http_buf_freelist)
-    {
-        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)
-        r = xmalloc(sizeof(struct http_buf));
+    struct http_buf *r = xmalloc(sizeof(*r));
     r->offset = 0;
     r->len = 0;
     r->next = 0;
@@ -153,24 +136,7 @@ static struct http_buf *http_buf_create(http_server_t hs)
 
 static void http_buf_destroy(http_server_t hs, struct http_buf *b)
 {
-    yaz_mutex_enter(hs->mutex);
-    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++;
-#if 0 
-        yaz_log(YLOG_DEBUG, "Free %d http buffers on server.", hs->http_buf_freelist_count);
-#endif
-    }
-    yaz_mutex_leave(hs->mutex);
+    xfree(b);
 }
 
 static void http_buf_destroy_queue(http_server_t hs, struct http_buf *b)
@@ -684,6 +650,12 @@ static struct http_buf *http_serialize_response(struct http_channel *c,
     if (r->payload)
         wrbuf_puts(c->wrbuf, r->payload);
 
+    if (global_parameters.dump_records > 1)
+    {
+        FILE *lf = yaz_log_file();
+        yaz_log(YLOG_LOG, "Response:");
+        fwrite(wrbuf_buf(c->wrbuf), 1, wrbuf_len(c->wrbuf), lf);
+    }
     return http_buf_bywrbuf(c->http_server, c->wrbuf);
 }
 
@@ -924,7 +896,7 @@ static void http_io(IOCHAN i, int event)
                 {
                     struct timeval tv;
                     gettimeofday(&tv, 0);
-                    fprintf(hc->http_server->record_file, "%lld %lld %lld 0\n",
+                    fprintf(hc->http_server->record_file, "r %lld %lld %lld 0\n",
                             (long long) tv.tv_sec, (long long) tv.tv_usec,
                             (long long) iochan_getfd(i));
                 }
@@ -956,11 +928,12 @@ static void http_io(IOCHAN i, int event)
                     for (hb = hc->iqueue; hb; hb = hb->next)
                         sz += hb->len;
                     gettimeofday(&tv, 0);
-                    fprintf(hc->http_server->record_file, "%lld %lld %lld %d\n",
+                    fprintf(hc->http_server->record_file, "r %lld %lld %lld %d\n",
                             (long long) tv.tv_sec, (long long) tv.tv_usec,
                             (long long) iochan_getfd(i), sz);
                     for (hb = hc->iqueue; hb; hb = hb->next)
                         fwrite(hb->buf, 1, hb->len, hc->http_server->record_file);
+                    fflush(hc->http_server->record_file);
                 }
  #endif
                 if (!(hc->request = http_parse_request(hc, &hc->iqueue, reqlen)))
@@ -1003,6 +976,21 @@ static void http_io(IOCHAN i, int event)
                 }
                 if (res == wb->len)
                 {
+#if HAVE_SYS_TIME_H
+                    if (hc->http_server->record_file)
+                    {
+                        struct timeval tv;
+                        int sz = wb->offset + wb->len;
+                        gettimeofday(&tv, 0);
+                        fprintf(hc->http_server->record_file, "w %lld %lld %lld %d\n",
+                                (long long) tv.tv_sec, (long long) tv.tv_usec,
+                                (long long) iochan_getfd(i), sz);
+                        fwrite(wb->buf, 1, wb->offset + wb->len,
+                               hc->http_server->record_file);
+                        fputc('\n', hc->http_server->record_file);
+                        fflush(hc->http_server->record_file);
+                    }
+ #endif
                     hc->oqueue = hc->oqueue->next;
                     http_buf_destroy(hc->http_server, wb);
                 }
@@ -1116,6 +1104,7 @@ static void proxy_io(IOCHAN pi, int event)
         default:
             yaz_log(YLOG_WARN, "Unexpected event on connection");
             http_channel_destroy(hc->iochan);
+            break;
     }
 }
 
@@ -1149,24 +1138,6 @@ static void http_channel_destroy(IOCHAN i)
 
     http_server = s->http_server; /* save it for destroy (decref) */
 
-    yaz_mutex_enter(s->http_server->mutex);
-    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);
 
 #ifdef WIN32
@@ -1175,6 +1146,9 @@ static void http_channel_destroy(IOCHAN i)
     close(iochan_getfd(i));
 #endif
     iochan_destroy(i);
+    nmem_destroy(s->nmem);
+    wrbuf_destroy(s->wrbuf);
+    xfree(s);
 }
 
 static struct http_channel *http_channel_create(http_server_t hs,
@@ -1183,25 +1157,10 @@ static struct http_channel *http_channel_create(http_server_t hs,
 {
     struct http_channel *r;
 
-    yaz_mutex_enter(hs->mutex);
-    r = hs->http_channel_freelist;
-    if (r) {
-        hs->http_channel_freelist = r->next;
-        hs->http_channel_freelist_count--;
-    }
-    yaz_mutex_leave(hs->mutex);
+    r = xmalloc(sizeof(struct http_channel));
+    r->nmem = nmem_create();
+    r->wrbuf = wrbuf_alloc();
 
-    if (r)
-    {
-        nmem_reset(r->nmem);
-        wrbuf_rewind(r->wrbuf);
-    }
-    else
-    {
-        r = xmalloc(sizeof(struct http_channel));
-        r->nmem = nmem_create();
-        r->wrbuf = wrbuf_alloc();
-    }
     http_server_incref(hs);
     r->http_server = hs;
     r->http_sessions = hs->http_sessions;
@@ -1452,15 +1411,6 @@ http_server_t http_server_create(void)
     hs->ref_count = 1;
     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;
     hs->record_file = 0;
     return hs;
 }
@@ -1477,22 +1427,6 @@ void http_server_destroy(http_server_t hs)
 
         if (r == 0)
         {
-            struct http_buf *b = hs->http_buf_freelist;
-            struct http_channel *c = hs->http_channel_freelist;
-            while (b)
-            {
-                struct http_buf *b_next = b->next;
-                xfree(b);
-                b = b_next;
-            }
-            while (c)
-            {
-                struct http_channel *c_next = c->next;
-                nmem_destroy(c->nmem);
-                wrbuf_destroy(c->wrbuf);
-                xfree(c);
-                c = c_next;
-            }
             http_sessions_destroy(hs->http_sessions);
             xfree(hs->proxy_addr);
             yaz_mutex_destroy(&hs->mutex);