#include <yaz/comstack.h>
#include <yaz/tcpip.h>
#include "connection.h"
-#include "pazpar2.h"
+#include "session.h"
#include "host.h"
#include "client.h"
#include "settings.h"
struct connection *next; // next for same host or next in free list
};
-static struct connection *connection_freelist = 0; /* thread pr */
-
static int connection_connect(struct connection *con, iochan_man_t iochan_man);
static int connection_is_idle(struct connection *co)
if (!ZOOM_connection_is_idle(link))
return 0;
event = ZOOM_connection_peek_event(link);
- if (event == ZOOM_EVENT_NONE || event == ZOOM_EVENT_END)
+ if (event == ZOOM_EVENT_NONE)
return 1;
else
return 0;
if (*conp == con)
{
*conp = (*conp)->next;
- return;
+ break;
}
conp = &(*conp)->next;
}
- assert(*conp == 0);
}
// Close connection and recycle structure
-void connection_destroy(struct connection *co)
+static void connection_destroy(struct connection *co)
{
if (co->link)
{
}
yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
- remove_connection_from_host(co);
if (co->client)
{
client_disconnect(co->client);
}
+
+ remove_connection_from_host(co);
xfree(co->zproxy);
- co->zproxy = 0;
- co->next = connection_freelist;
- connection_freelist = co;
+ xfree(co);
}
// Creates a new connection for client, associated with the host of
int session_timeout,
iochan_man_t iochan_man)
{
- struct connection *new;
+ struct connection *co;
struct host *host = client_get_host(cl);
- if ((new = connection_freelist))
- connection_freelist = new->next;
- else
- {
- new = xmalloc(sizeof (struct connection));
- }
- new->host = host;
- new->next = new->host->connections;
- new->host->connections = new;
- new->client = cl;
- new->zproxy = 0;
- client_set_connection(cl, new);
- new->link = 0;
- new->state = Conn_Resolving;
- new->operation_timeout = operation_timeout;
- new->session_timeout = session_timeout;
+ co = xmalloc(sizeof(*co));
+ co->host = host;
+
+ co->client = cl;
+ co->zproxy = 0;
+ client_set_connection(cl, co);
+ co->link = 0;
+ co->state = Conn_Resolving;
+ co->operation_timeout = operation_timeout;
+ co->session_timeout = session_timeout;
if (host->ipport)
- connection_connect(new, iochan_man);
- return new;
+ connection_connect(co, iochan_man);
+
+ yaz_mutex_enter(host->mutex);
+ co->next = co->host->connections;
+ co->host->connections = co;
+ yaz_mutex_leave(host->mutex);
+
+ return co;
}
static void non_block_events(struct connection *co)
{
- struct client *cl = co->client;
+ int got_records = 0;
IOCHAN iochan = co->iochan;
ZOOM_connection link = co->link;
while (1)
{
+ struct client *cl = co->client;
int ev;
int r = ZOOM_event_nonblock(1, &link);
if (!r)
break;
+ if (!cl)
+ continue;
ev = ZOOM_connection_last_event(link);
+
#if 0
yaz_log(YLOG_LOG, "ZOOM_EVENT_%s", ZOOM_get_event_str(ev));
#endif
break;
case ZOOM_EVENT_RECV_RECORD:
client_record_response(cl);
+ got_records = 1;
break;
default:
yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
ev, client_get_url(cl));
}
}
+ if (got_records)
+ {
+ struct client *cl = co->client;
+ if (cl)
+ {
+ client_got_records(cl);
+ }
+ }
}
void connection_continue(struct connection *co)
{
- non_block_events(co);
+ int r = ZOOM_connection_exec_task(co->link);
+ if (!r)
+ yaz_log(YLOG_WARN, "No task was executed for connection");
}
static void connection_handler(IOCHAN iochan, int event)
{
struct connection *co = iochan_getdata(iochan);
struct client *cl = co->client;
- struct session *se = 0;
+ struct host *host = co->host;
- if (cl)
- se = client_get_session(cl);
- else
+ yaz_mutex_enter(host->mutex);
+ 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);
connection_destroy(co);
- return;
+ yaz_mutex_leave(host->mutex);
}
-
- 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));
- client_fatal(cl);
+
+ connection_destroy(co);
+ client_set_state(cl, Client_Error);
}
- else
+ else if (client_get_state(co->client) == Client_Idle)
{
yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl));
connection_destroy(co);
}
+ else
+ {
+ yaz_log(YLOG_LOG, "ignore timeout %s", client_get_url(cl));
+ }
+ yaz_mutex_leave(host->mutex);
}
else
{
+ yaz_mutex_leave(host->mutex);
+
+ client_lock(cl);
non_block_events(co);
ZOOM_connection_fire_event_socket(co->link, event);
non_block_events(co);
+ client_unlock(cl);
}
}
// Disassociate connection from client
-void connection_release(struct connection *co)
+static void connection_release(struct connection *co)
{
struct client *cl = co->client;
- yaz_log(YLOG_DEBUG, "Connection release %s", co->host->hostport);
if (!cl)
return;
client_set_connection(cl, 0);
void connect_resolver_host(struct host *host, iochan_man_t iochan_man)
{
- struct connection *con = host->connections;
+ struct connection *con;
+
+start:
+ yaz_mutex_enter(host->mutex);
+ con = host->connections;
while (con)
{
if (con->state == Conn_Resolving)
{
if (!host->ipport) /* unresolved */
{
+ yaz_mutex_leave(host->mutex);
connection_destroy(con);
+ goto start;
/* start all over .. at some point it will be NULL */
- con = host->connections;
- continue;
}
else if (!con->client)
{
+ yaz_mutex_leave(host->mutex);
connection_destroy(con);
/* start all over .. at some point it will be NULL */
- con = host->connections;
- continue;
+ goto start;
}
else
{
+ yaz_mutex_leave(host->mutex);
connection_connect(con, iochan_man);
client_start_search(con->client);
+ goto start;
}
}
else
{
yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
+ con = con->next;
}
- con = con->next;
}
+ yaz_mutex_leave(host->mutex);
}
static struct host *connection_get_host(struct connection *con)
ZOOM_connection_connect(link, host->ipport, 0);
con->link = link;
- con->iochan = iochan_create(0, connection_handler, 0);
+ con->iochan = iochan_create(0, connection_handler, 0, "connection_socket");
con->state = Conn_Connecting;
iochan_settimeout(con->iochan, con->operation_timeout);
iochan_setdata(con->iochan, con);
return 0;
}
-const char *connection_get_url(struct connection *co)
-{
- return client_get_url(co->client);
-}
-
// Ensure that client has a connection associated
int client_prep_connection(struct client *cl,
int operation_timeout, int session_timeout,
iochan_man_t iochan_man)
{
struct connection *co;
- struct session *se = client_get_session(cl);
struct host *host = client_get_host(cl);
struct session_database *sdb = client_get_database(cl);
const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
{
// See if someone else has an idle connection
// We should look at timestamps here to select the longest-idle connection
+ yaz_mutex_enter(host->mutex);
for (co = host->connections; co; co = co->next)
if (connection_is_idle(co) &&
- (!co->client || client_get_session(co->client) != se) &&
+ (!co->client || client_get_state(co->client) == Client_Idle) &&
!strcmp(ZOOM_connection_option_get(co->link, "user"),
session_setting_oneval(client_get_database(cl),
PZ_AUTHENTICATION)))
connection_release(co);
client_set_connection(cl, co);
co->client = cl;
+ /* ensure that connection is only assigned to this client
+ by marking the client non Idle */
+ client_set_state(cl, Client_Working);
+ yaz_mutex_leave(host->mutex);
co->operation_timeout = operation_timeout;
co->session_timeout = session_timeout;
/* tells ZOOM to reconnect if necessary. Disabled becuase
}
else
{
+ yaz_mutex_leave(host->mutex);
co = connection_create(cl, operation_timeout, session_timeout,
iochan_man);
}