/* 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
#include "settings.h"
/* connection counting (1) , disable connection counting (0) */
-#if 0
+#if 1
static YAZ_MUTEX g_mutex = 0;
static int no_connections = 0;
+static int total_no_connections = 0;
-static void connection_use(int delta)
+static int connection_use(int delta)
{
+ int result;
if (!g_mutex)
yaz_mutex_create(&g_mutex);
yaz_mutex_enter(g_mutex);
no_connections += delta;
+ result = no_connections;
+ if (delta > 0)
+ total_no_connections += delta;
yaz_mutex_leave(g_mutex);
+ if (delta == 0)
+ return result;
yaz_log(YLOG_LOG, "%s connections=%d", delta > 0 ? "INC" : "DEC",
no_connections);
+ return result;
}
+
+int connections_count(void)
+{
+ return connection_use(0);
+}
+
+
#else
#define connection_use(x)
+#define connections_count(x) 0
+#define connections_count_total(x) 0
#endif
struct client *client;
char *zproxy;
enum {
- Conn_Resolving,
+ Conn_Closed,
Conn_Connecting,
Conn_Open
} state;
ZOOM_connection_destroy(co->link);
iochan_destroy(co->iochan);
}
- yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
+ yaz_log(YLOG_DEBUG, "%p Connection destroy %s", co, co->host->url);
if (co->client)
{
// Creates a new connection for client, associated with the host of
// client's database
static struct connection *connection_create(struct client *cl,
+ struct host *host,
int operation_timeout,
int session_timeout,
iochan_man_t iochan_man)
{
struct connection *co;
- struct host *host = client_get_host(cl);
co = xmalloc(sizeof(*co));
co->host = host;
co->zproxy = 0;
client_set_connection(cl, co);
co->link = 0;
- co->state = Conn_Resolving;
+ co->state = Conn_Closed;
co->operation_timeout = operation_timeout;
co->session_timeout = session_timeout;
+
if (host->ipport)
connection_connect(co, iochan_man);
if ((err = ZOOM_connection_error(link, &error, &addinfo)))
{
yaz_log(YLOG_LOG, "Error %s from %s",
- error, client_get_url(cl));
+ error, client_get_id(cl));
client_set_diagnostic(cl, err);
client_set_state(cl, Client_Error);
}
case ZOOM_EVENT_RECV_APDU:
break;
case ZOOM_EVENT_CONNECT:
- yaz_log(YLOG_LOG, "Connected to %s", client_get_url(cl));
+ yaz_log(YLOG_LOG, "Connected to %s", client_get_id(cl));
co->state = Conn_Open;
break;
case ZOOM_EVENT_RECV_SEARCH:
break;
default:
yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
- ev, client_get_url(cl));
+ ev, client_get_id(cl));
}
}
if (got_records)
{
int r = ZOOM_connection_exec_task(co->link);
if (!r)
- yaz_log(YLOG_WARN, "No task was executed for connection");
- iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));
- iochan_setfd(co->iochan, ZOOM_connection_get_socket(co->link));
+ {
+ const char *error, *addinfo;
+ int err;
+ if ((err = ZOOM_connection_error(co->link, &error, &addinfo)))
+ {
+ if (co->client)
+ {
+ yaz_log(YLOG_LOG, "Error %s from %s",
+ error, client_get_id(co->client));
+ client_set_diagnostic(co->client, err);
+ client_set_state_nb(co->client, Client_Error);
+ }
+ }
+ }
+ else
+ {
+ iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));
+ iochan_setfd(co->iochan, ZOOM_connection_get_socket(co->link));
+ }
}
static void connection_handler(IOCHAN iochan, int event)
{
if (co->state == Conn_Connecting)
{
- yaz_log(YLOG_WARN, "connect timeout %s", client_get_url(cl));
+ yaz_log(YLOG_WARN, "%p connect timeout %s", co, client_get_id(cl));
client_set_state(cl, Client_Error);
+ remove_connection_from_host(co);
+ yaz_mutex_leave(host->mutex);
connection_destroy(co);
}
else
{
- yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl));
+ yaz_log(YLOG_LOG, "%p Connection idle timeout %s", co, client_get_id(cl));
+ remove_connection_from_host(co);
+ yaz_mutex_leave(host->mutex);
connection_destroy(co);
}
- yaz_mutex_leave(host->mutex);
}
else
{
con = host->connections;
while (con)
{
- if (con->state == Conn_Resolving)
+ if (con->state == Conn_Closed)
{
if (!host->ipport) /* unresolved */
{
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
{
- ZOOM_connection link = 0;
struct host *host = connection_get_host(con);
ZOOM_options zoptions = ZOOM_options_create();
const char *auth;
const char *sru_version = 0;
struct session_database *sdb = client_get_database(con->client);
- const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
- assert(host->ipport);
assert(con);
ZOOM_options_set(zoptions, "async", "1");
if ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET)))
ZOOM_options_set(zoptions, "charset", charset);
- if (zproxy && *zproxy)
+ assert(host->ipport);
+ if (host->proxy)
{
- con->zproxy = xstrdup(zproxy);
- ZOOM_options_set(zoptions, "proxy", zproxy);
+ yaz_log(YLOG_LOG, "proxy=%s", host->ipport);
+ ZOOM_options_set(zoptions, "proxy", host->ipport);
}
+ else
+ {
+ assert(host->tproxy);
+ yaz_log(YLOG_LOG, "tproxy=%s", host->ipport);
+ ZOOM_options_set(zoptions, "tproxy", host->ipport);
+ }
+
if (apdulog && *apdulog)
ZOOM_options_set(zoptions, "apdulog", apdulog);
if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
&& *sru_version)
ZOOM_options_set(zoptions, "sru_version", sru_version);
-
- if (!(link = ZOOM_connection_create(zoptions)))
+ if (!(con->link = ZOOM_connection_create(zoptions)))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");
ZOOM_options_destroy(zoptions);
{
char http_hostport[512];
strcpy(http_hostport, "http://");
- strcat(http_hostport, host->hostport);
- ZOOM_connection_connect(link, http_hostport, 0);
+ strcat(http_hostport, host->url);
+ yaz_log(YLOG_LOG, "SRU connect to : %s", http_hostport);
+ ZOOM_connection_connect(con->link, http_hostport, 0);
}
- else if (zproxy && *zproxy)
- ZOOM_connection_connect(link, host->hostport, 0);
else
- ZOOM_connection_connect(link, host->ipport, 0);
-
- con->link = link;
+ {
+ ZOOM_connection_connect(con->link, host->url, 0);
+ }
con->iochan = iochan_create(-1, connection_handler, 0, "connection_socket");
con->state = Conn_Connecting;
iochan_settimeout(con->iochan, con->operation_timeout);
iochan_setdata(con->iochan, con);
iochan_add(iochan_man, con->iochan);
- /* this fragment is bad DRY: from client_prep_connection */
client_set_state(con->client, Client_Connecting);
ZOOM_options_destroy(zoptions);
return 0;
const struct timeval *abstime)
{
struct connection *co;
- struct host *host = client_get_host(cl);
struct session_database *sdb = client_get_database(cl);
const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
+ const char *url = session_setting_oneval(sdb, PZ_URL);
+ const char *sru = session_setting_oneval(sdb, PZ_SRU);
+ struct host *host = 0;
+ int default_port = *sru ? 80 : 210;
if (zproxy && zproxy[0] == '\0')
zproxy = 0;
+ if (!url || !*url)
+ url = sdb->database->id;
+
+ host = find_host(client_get_session(cl)->service->server->database_hosts,
+ url, zproxy, default_port, iochan_man);
+
+ yaz_log(YLOG_DEBUG, "client_prep_connection: target=%s url=%s",
+ client_get_id(cl), url);
if (!host)
return 0;
co = client_get_connection(cl);
- yaz_log(YLOG_DEBUG, "Client prep %s", client_get_url(cl));
-
+ if (co)
+ {
+ assert(co->host);
+ if (co->host == host)
+ ; /* reusing connection. It's ours! */
+ else
+ {
+ client_incref(cl);
+ connection_release(co);
+ co = 0;
+ }
+ }
if (!co)
{
int max_connections = 0;
PZ_MAX_CONNECTIONS);
if (v && *v)
max_connections = atoi(v);
-
+
v = session_setting_oneval(client_get_database(cl),
PZ_REUSE_CONNECTIONS);
if (v && *v)
int num_connections = 0;
for (co = host->connections; co; co = co->next)
num_connections++;
- if (reuse_connections) {
+ if (reuse_connections)
+ {
for (co = host->connections; co; co = co->next)
{
if (connection_is_idle(co) &&
num_connections, max_connections);
if (yaz_cond_wait(host->cond_ready, host->mutex, abstime))
{
- yaz_log(YLOG_LOG, "out of connections %s", client_get_url(cl));
+ yaz_log(YLOG_LOG, "out of connections %s", client_get_id(cl));
client_set_state(cl, Client_Error);
yaz_mutex_leave(host->mutex);
return 0;
}
if (co)
{
+ yaz_log(YLOG_LOG, "%p Connection reuse. state: %d", co, co->state);
connection_release(co);
client_set_connection(cl, co);
co->client = cl;
else
{
yaz_mutex_leave(host->mutex);
- co = connection_create(cl, operation_timeout, session_timeout,
+ co = connection_create(cl, host, operation_timeout, session_timeout,
iochan_man);
}
+ assert(co->host);
}
if (co && co->link)
projects / pazpar2-moved-to-github.git / blobdiff