#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
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);
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);
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);
{
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)
{
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();
}