Remove include of pthread.h

[pazpar2-moved-to-github.git] / src / http.c

diff --git a/src/http.c b/src/http.c
index 5158ddb..aec3593 100644 (file)
--- a/src/http.c
+++ b/src/http.c
@@ -63,7 +63,8 @@ typedef int socklen_t;
 #include <yaz/nmem.h>
 #include <yaz/mutex.h>
 
-#include "pazpar2.h"
+#include "ppmutex.h"
+#include "session.h"
 #include "http.h"
 
 #define MAX_HTTP_HEADER 4096
@@ -797,7 +798,7 @@ static int http_proxy(struct http_request *rq)
         p->first_response = 1;
         c->proxy = p;
         // We will add EVENT_OUTPUT below
-        p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT);
+        p->iochan = iochan_create(sock, proxy_io, EVENT_INPUT, "http_proxy");
         iochan_setdata(p->iochan, p);
 
         iochan_add(ser->iochan_man, p->iochan);
@@ -877,13 +878,13 @@ static void http_error(struct http_channel *hc, int no, const char *msg)
 static void http_io(IOCHAN i, int event)
 {
     struct http_channel *hc = iochan_getdata(i);
-
-    switch (event)
+    while (event)
     {
-        int res, reqlen;
-        struct http_buf *htbuf;
-
-        case EVENT_INPUT:
+        if (event == EVENT_INPUT)
+        {
+            int res, reqlen;
+            struct http_buf *htbuf;
+            
             htbuf = http_buf_create(hc->http_server);
             res = recv(iochan_getfd(i), htbuf->buf, HTTP_BUF_SIZE -1, 0);
             if (res == -1 && errno == EAGAIN)
@@ -932,12 +933,16 @@ static void http_io(IOCHAN i, int event)
                     http_command(hc);
                 }
             }
-            break;
-        case EVENT_OUTPUT:
+        }
+        else if (event == EVENT_OUTPUT)
+        {
+            event = 0;
             if (hc->oqueue)
             {
                 struct http_buf *wb = hc->oqueue;
-                res = send(iochan_getfd(hc->iochan), wb->buf + wb->offset, wb->len, 0);
+                int res;
+                res = send(iochan_getfd(hc->iochan),
+                           wb->buf + wb->offset, wb->len, 0);
                 if (res <= 0)
                 {
                     yaz_log(YLOG_WARN|YLOG_ERRNO, "write");
@@ -954,7 +959,8 @@ static void http_io(IOCHAN i, int event)
                     wb->len -= res;
                     wb->offset += res;
                 }
-                if (!hc->oqueue) {
+                if (!hc->oqueue)
+                {
                     if (!hc->keep_alive)
                     {
                         http_channel_destroy(i);
@@ -964,17 +970,19 @@ static void http_io(IOCHAN i, int event)
                     {
                         iochan_clearflag(i, EVENT_OUTPUT);
                         if (hc->iqueue)
-                            iochan_setevent(hc->iochan, EVENT_INPUT);
+                            event = EVENT_INPUT;
                     }
                 }
             }
-
             if (!hc->oqueue && hc->proxy && !hc->proxy->iochan) 
                 http_channel_destroy(i); // Server closed; we're done
-            break;
-        default:
+        }
+        else
+        {
             yaz_log(YLOG_WARN, "Unexpected event on connection");
             http_channel_destroy(i);
+            event = 0;
+        }
     }
 }
 
@@ -1170,7 +1178,7 @@ static void http_accept(IOCHAN i, int event)
     enable_nonblock(s);
 
     yaz_log(YLOG_DEBUG, "New command connection");
-    c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT);
+    c = iochan_create(s, http_io, EVENT_INPUT | EVENT_EXCEPT, "http_session_socket");
     
     ch = http_channel_create(server->http_server, inet_ntoa(addr.sin_addr),
                              server);
@@ -1245,7 +1253,7 @@ int http_init(const char *addr, struct conf_server *server)
 
     server->http_server->listener_socket = l;
 
-    c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT);
+    c = iochan_create(l, http_accept, EVENT_INPUT | EVENT_EXCEPT, "http_server");
     iochan_setdata(c, server);
 
     iochan_add(server->iochan_man, c);
@@ -1373,14 +1381,9 @@ void http_server_destroy(http_server_t hs)
     {
         int r;
 
-        if (hs->mutex)
-        {
-            yaz_mutex_enter(hs->mutex);
-            r = --(hs->ref_count);
-            yaz_mutex_leave(hs->mutex);
-        }
-        else
-            r = --(hs->ref_count);
+        yaz_mutex_enter(hs->mutex); /* OK: hs->mutex may be NULL */
+        r = --(hs->ref_count);
+        yaz_mutex_leave(hs->mutex);
 
         if (r == 0)
         {
@@ -1421,7 +1424,7 @@ void http_mutex_init(struct conf_server *server)
     assert(server);
 
     assert(server->http_server->mutex == 0);
-    yaz_mutex_create(&server->http_server->mutex);
+    pazpar2_mutex_create(&server->http_server->mutex, "http_server");
     server->http_server->http_sessions = http_sessions_create();
 }