projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into session_lock
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
8311ada
..
5a5f207
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2010 Index Data
+ Copyright (C) 2006-2013 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
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
@@
-48,22
+48,39
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include "settings.h"
/* connection counting (1) , disable connection counting (0) */
#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 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;
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);
yaz_mutex_leave(g_mutex);
+ if (delta == 0)
+ return result;
yaz_log(YLOG_LOG, "%s connections=%d", delta > 0 ? "INC" : "DEC",
no_connections);
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)
#else
#define connection_use(x)
+#define connections_count(x) 0
+#define connections_count_total(x) 0
#endif
#endif
@@
-75,8
+92,9
@@
struct connection {
struct host *host;
struct client *client;
char *zproxy;
struct host *host;
struct client *client;
char *zproxy;
+ char *url;
enum {
enum {
- Conn_Resolving,
+ Conn_Closed,
Conn_Connecting,
Conn_Open
} state;
Conn_Connecting,
Conn_Open
} state;
@@
-133,39
+151,42
@@
static void connection_destroy(struct connection *co)
ZOOM_connection_destroy(co->link);
iochan_destroy(co->iochan);
}
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->url);
if (co->client)
{
client_disconnect(co->client);
}
if (co->client)
{
client_disconnect(co->client);
}
- remove_connection_from_host(co);
xfree(co->zproxy);
xfree(co->zproxy);
+ xfree(co->url);
xfree(co);
connection_use(-1);
}
xfree(co);
connection_use(-1);
}
-// Creates a new connection for client, associated with the host of
+// Creates a new connection for client, associated with the host of
// client's database
static struct connection *connection_create(struct client *cl,
// client's database
static struct connection *connection_create(struct client *cl,
+ const char *url,
+ struct host *host,
int operation_timeout,
int session_timeout,
iochan_man_t iochan_man)
{
struct connection *co;
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->client = cl;
co = xmalloc(sizeof(*co));
co->host = host;
co->client = cl;
+ co->url = xstrdup(url);
co->zproxy = 0;
client_set_connection(cl, co);
co->link = 0;
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;
co->operation_timeout = operation_timeout;
co->session_timeout = session_timeout;
+
if (host->ipport)
connection_connect(co, iochan_man);
if (host->ipport)
connection_connect(co, iochan_man);
@@
-178,7
+199,7
@@
static struct connection *connection_create(struct client *cl,
return co;
}
return co;
}
-static void non_block_events(struct connection *co)
+static void non_block_events_unlocked(struct connection *co)
{
int got_records = 0;
IOCHAN iochan = co->iochan;
{
int got_records = 0;
IOCHAN iochan = co->iochan;
@@
-193,12
+214,14
@@
static void non_block_events(struct connection *co)
if (!cl)
continue;
ev = ZOOM_connection_last_event(link);
if (!cl)
continue;
ev = ZOOM_connection_last_event(link);
-
-#if 0
- yaz_log(YLOG_LOG, "%p Connection ZOOM_EVENT_%s", co, ZOOM_get_event_str(ev));
+
+#if 1
+ yaz_log(YLOG_DEBUG, "%p Connection ZOOM_EVENT_%s", co, ZOOM_get_event_str(ev));
#endif
#endif
- switch (ev)
+ switch (ev)
{
{
+ case ZOOM_EVENT_TIMEOUT:
+ break;
case ZOOM_EVENT_END:
{
const char *error, *addinfo;
case ZOOM_EVENT_END:
{
const char *error, *addinfo;
@@
-206,8
+229,8
@@
static void non_block_events(struct connection *co)
if ((err = ZOOM_connection_error(link, &error, &addinfo)))
{
yaz_log(YLOG_LOG, "Error %s from %s",
if ((err = ZOOM_connection_error(link, &error, &addinfo)))
{
yaz_log(YLOG_LOG, "Error %s from %s",
- error, client_get_url(cl));
- client_set_diagnostic(cl, err);
+ error, client_get_id(cl));
+ client_set_diagnostic(cl, err, error, addinfo);
client_set_state(cl, Client_Error);
}
else
client_set_state(cl, Client_Error);
}
else
@@
-231,19
+254,19
@@
static void non_block_events(struct connection *co)
case ZOOM_EVENT_RECV_APDU:
break;
case ZOOM_EVENT_CONNECT:
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:
client_search_response(cl);
break;
case ZOOM_EVENT_RECV_RECORD:
co->state = Conn_Open;
break;
case ZOOM_EVENT_RECV_SEARCH:
client_search_response(cl);
break;
case ZOOM_EVENT_RECV_RECORD:
- client_record_response(cl);
- got_records = 1;
+ client_record_response(cl, &got_records);
break;
default:
yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
break;
default:
yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
- ev, client_get_url(cl));
+ ev, client_get_id(cl));
+ break;
}
}
if (got_records)
}
}
if (got_records)
@@
-257,13
+280,25
@@
static void non_block_events(struct connection *co)
}
}
}
}
+static void non_block_events(struct client *cl, struct connection *co)
+{
+ session_enter_rw(client_get_session(cl), "non_block_events");
+ non_block_events_unlocked(co);
+ session_leave_rw(client_get_session(cl), "non_block_events");
+}
+
void connection_continue(struct connection *co)
{
int r = ZOOM_connection_exec_task(co->link);
if (!r)
void connection_continue(struct connection *co)
{
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));
+ {
+ non_block_events_unlocked(co);
+ }
+ 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)
}
static void connection_handler(IOCHAN iochan, int event)
@@
-274,42
+309,33
@@
static void connection_handler(IOCHAN iochan, int event)
yaz_mutex_enter(host->mutex);
cl = co->client;
yaz_mutex_enter(host->mutex);
cl = co->client;
- if (!cl)
+ if (!cl)
{
/* no client associated with it.. We are probably getting
a closed connection from the target.. Or, perhaps, an unexpected
package.. We will just close the connection */
yaz_log(YLOG_LOG, "timeout connection %p event=%d", co, event);
{
/* no client associated with it.. We are probably getting
a closed connection from the target.. Or, perhaps, an unexpected
package.. We will just close the connection */
yaz_log(YLOG_LOG, "timeout connection %p event=%d", co, event);
- connection_destroy(co);
+ remove_connection_from_host(co);
yaz_mutex_leave(host->mutex);
yaz_mutex_leave(host->mutex);
+ connection_destroy(co);
}
else if (event & EVENT_TIMEOUT)
{
}
else if (event & EVENT_TIMEOUT)
{
- if (co->state == Conn_Connecting)
- {
- yaz_log(YLOG_WARN, "connect timeout %s", client_get_url(cl));
+ ZOOM_connection_fire_event_timeout(co->link);
- client_set_state(cl, Client_Error);
- connection_destroy(co);
- }
- else
- {
- yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl));
- connection_destroy(co);
- }
+ remove_connection_from_host(co);
yaz_mutex_leave(host->mutex);
yaz_mutex_leave(host->mutex);
+ connection_destroy(co);
}
else
{
yaz_mutex_leave(host->mutex);
}
else
{
yaz_mutex_leave(host->mutex);
- client_lock(cl);
- non_block_events(co);
+ non_block_events(cl, co);
ZOOM_connection_fire_event_socket(co->link, event);
ZOOM_connection_fire_event_socket(co->link, event);
-
- non_block_events(co);
- client_unlock(cl);
+
+ non_block_events(cl, co);
if (co->link)
{
if (co->link)
{
@@
-335,34
+361,37
@@
void connect_resolver_host(struct host *host, iochan_man_t iochan_man)
{
struct connection *con;
{
struct connection *con;
-start:
yaz_mutex_enter(host->mutex);
con = host->connections;
while (con)
{
yaz_mutex_enter(host->mutex);
con = host->connections;
while (con)
{
- if (con->state == Conn_Resolving)
+ if (con->state == Conn_Closed)
{
{
- if (!host->ipport) /* unresolved */
- {
- yaz_mutex_leave(host->mutex);
- connection_destroy(con);
- goto start;
- /* start all over .. at some point it will be NULL */
- }
- else if (!con->client)
+ if (!host->ipport || !con->client) /* unresolved or no client */
{
{
+ remove_connection_from_host(con);
yaz_mutex_leave(host->mutex);
connection_destroy(con);
yaz_mutex_leave(host->mutex);
connection_destroy(con);
- /* start all over .. at some point it will be NULL */
- goto start;
}
else
{
}
else
{
- yaz_mutex_leave(host->mutex);
- connection_connect(con, iochan_man);
- client_start_search(con->client);
- goto start;
+ struct session_database *sdb = client_get_database(con->client);
+ if (sdb)
+ {
+ yaz_mutex_leave(host->mutex);
+ connection_connect(con, iochan_man);
+ client_start_search(con->client);
+ }
+ else
+ {
+ remove_connection_from_host(con);
+ yaz_mutex_leave(host->mutex);
+ connection_destroy(con);
+ }
}
}
+ /* start all over .. at some point it will be NULL */
+ yaz_mutex_enter(host->mutex);
+ con = host->connections;
}
else
{
}
else
{
@@
-380,7
+409,6
@@
static struct host *connection_get_host(struct connection *con)
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
{
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;
struct host *host = connection_get_host(con);
ZOOM_options zoptions = ZOOM_options_create();
const char *auth;
@@
-389,24
+417,30
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
const char *sru_version = 0;
struct session_database *sdb = client_get_database(con->client);
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);
const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
- assert(host->ipport);
assert(con);
ZOOM_options_set(zoptions, "async", "1");
ZOOM_options_set(zoptions, "implementationName", PACKAGE_NAME);
ZOOM_options_set(zoptions, "implementationVersion", VERSION);
assert(con);
ZOOM_options_set(zoptions, "async", "1");
ZOOM_options_set(zoptions, "implementationName", PACKAGE_NAME);
ZOOM_options_set(zoptions, "implementationVersion", VERSION);
-
+
if ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET)))
ZOOM_options_set(zoptions, "charset", charset);
if ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET)))
ZOOM_options_set(zoptions, "charset", charset);
-
- if (zproxy && *zproxy)
+
+ assert(host->ipport);
+ if (host->proxy)
+ {
+ yaz_log(YLOG_LOG, "proxy=%s", host->ipport);
+ ZOOM_options_set(zoptions, "proxy", host->ipport);
+ }
+ else
{
{
- con->zproxy = xstrdup(zproxy);
- ZOOM_options_set(zoptions, "proxy", zproxy);
+ 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 (apdulog && *apdulog)
ZOOM_options_set(zoptions, "apdulog", apdulog);
@@
-414,35
+448,42
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
ZOOM_options_set(zoptions, "user", auth);
if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
ZOOM_options_set(zoptions, "sru", sru);
ZOOM_options_set(zoptions, "user", auth);
if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
ZOOM_options_set(zoptions, "sru", sru);
- if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
+ if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
&& *sru_version)
ZOOM_options_set(zoptions, "sru_version", 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);
return -1;
}
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");
ZOOM_options_destroy(zoptions);
return -1;
}
- if (sru && *sru)
+ if (sru && *sru && !strstr(con->url, "://"))
+ {
+ WRBUF w = wrbuf_alloc();
+ wrbuf_puts(w, "http://");
+ wrbuf_puts(w, con->url);
+ ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
+ wrbuf_destroy(w);
+ }
+ else if (strchr(con->url, '#'))
{
{
- char http_hostport[512];
- strcpy(http_hostport, "http://");
- strcat(http_hostport, host->hostport);
- ZOOM_connection_connect(link, http_hostport, 0);
+ const char *cp = strchr(con->url, '#');
+ WRBUF w = wrbuf_alloc();
+ wrbuf_write(w, con->url, cp - con->url);
+ ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
+ wrbuf_destroy(w);
}
else
}
else
- ZOOM_connection_connect(link, host->ipport, 0);
-
- con->link = link;
+ {
+ ZOOM_connection_connect(con->link, con->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);
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;
client_set_state(con->client, Client_Connecting);
ZOOM_options_destroy(zoptions);
return 0;
@@
-455,20
+496,38
@@
int client_prep_connection(struct client *cl,
const struct timeval *abstime)
{
struct connection *co;
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);
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 (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);
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 && client_get_state(cl) == Client_Idle)
+ {
+ return 2;
+ }
+ connection_release(co);
+ co = 0;
+ }
if (!co)
{
int max_connections = 0;
if (!co)
{
int max_connections = 0;
@@
-491,10
+550,12
@@
int client_prep_connection(struct client *cl,
int num_connections = 0;
for (co = host->connections; co; co = co->next)
num_connections++;
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) &&
for (co = host->connections; co; co = co->next)
{
if (connection_is_idle(co) &&
+ !strcmp(url, co->url) &&
(!co->client || client_get_state(co->client) == Client_Idle) &&
!strcmp(ZOOM_connection_option_get(co->link, "user"),
session_setting_oneval(client_get_database(cl),
(!co->client || client_get_state(co->client) == Client_Idle) &&
!strcmp(ZOOM_connection_option_get(co->link, "user"),
session_setting_oneval(client_get_database(cl),
@@
-522,7
+583,7
@@
int client_prep_connection(struct client *cl,
num_connections, max_connections);
if (yaz_cond_wait(host->cond_ready, host->mutex, abstime))
{
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;
client_set_state(cl, Client_Error);
yaz_mutex_leave(host->mutex);
return 0;
@@
-530,6
+591,7
@@
int client_prep_connection(struct client *cl,
}
if (co)
{
}
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;
connection_release(co);
client_set_connection(cl, co);
co->client = cl;
@@
-546,9
+608,11
@@
int client_prep_connection(struct client *cl,
else
{
yaz_mutex_leave(host->mutex);
else
{
yaz_mutex_leave(host->mutex);
- co = connection_create(cl, operation_timeout, session_timeout,
+ co = connection_create(cl, url, host,
+ operation_timeout, session_timeout,
iochan_man);
}
iochan_man);
}
+ assert(co->host);
}
if (co && co->link)
}
if (co && co->link)