#include "client.h"
#include "settings.h"
+/* connection counting (1) , disable connection counting (0) */
+#if 0
+static YAZ_MUTEX g_mutex = 0;
+static int no_connections = 0;
+
+static void connection_use(int delta)
+{
+ if (!g_mutex)
+ yaz_mutex_create(&g_mutex);
+ yaz_mutex_enter(g_mutex);
+ no_connections += delta;
+ yaz_mutex_leave(g_mutex);
+ yaz_log(YLOG_LOG, "%s connections=%d", delta > 0 ? "INC" : "DEC",
+ no_connections);
+}
+#else
+#define connection_use(x)
+#endif
+
/** \brief Represents a physical, reusable connection to a remote Z39.50 host
*/
remove_connection_from_host(co);
xfree(co->zproxy);
xfree(co);
+ connection_use(-1);
}
// 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);
- new = xmalloc(sizeof(*new));
- new->host = host;
+ co = xmalloc(sizeof(*co));
+ co->host = host;
- 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->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);
+ connection_connect(co, iochan_man);
yaz_mutex_enter(host->mutex);
- new->next = new->host->connections;
- new->host->connections = new;
+ co->next = co->host->connections;
+ co->host->connections = co;
yaz_mutex_leave(host->mutex);
- return new;
+ connection_use(1);
+ return co;
}
static void non_block_events(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));
}
static void connection_handler(IOCHAN iochan, int event)
{
struct connection *co = iochan_getdata(iochan);
- struct client *cl = co->client;
+ struct client *cl;
struct host *host = co->host;
yaz_mutex_enter(host->mutex);
+ cl = co->client;
if (!cl)
{
/* no client associated with it.. We are probably getting
package.. We will just close the connection */
yaz_log(YLOG_LOG, "timeout connection %p event=%d", co, event);
connection_destroy(co);
+ yaz_mutex_leave(host->mutex);
}
else if (event & EVENT_TIMEOUT)
{
{
yaz_log(YLOG_WARN, "connect timeout %s", client_get_url(cl));
- connection_destroy(co);
client_set_state(cl, Client_Error);
+ connection_destroy(co);
}
else if (client_get_state(co->client) == Client_Idle)
{
{
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);
+
+ if (co->link)
+ {
+ iochan_setflags(iochan, ZOOM_connection_get_mask(co->link));
+ iochan_setfd(iochan, ZOOM_connection_get_socket(co->link));
+ }
}
- yaz_mutex_leave(host->mutex);
}
// Disassociate connection from client
-void connection_release(struct connection *co)
+static void connection_release(struct connection *co)
{
struct client *cl = co->client;
return con->host;
}
-// Callback for use by event loop
-// We do this because ZOOM connections don't always have (the same) sockets
-static int socketfun(IOCHAN c)
-{
- struct connection *co = iochan_getdata(c);
- if (!co->link)
- return -1;
- return ZOOM_connection_get_socket(co->link);
-}
-
-// Because ZOOM always knows what events it is interested in; we may not
-static int maskfun(IOCHAN c)
-{
- struct connection *co = iochan_getdata(c);
- if (!co->link)
- return 0;
-
- // This is cheating a little, and assuming that eventl mask IDs are always
- // the same as ZOOM-C's.
- return ZOOM_connection_get_mask(co->link);
-}
-
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
{
ZOOM_connection link = 0;
con->state = Conn_Connecting;
iochan_settimeout(con->iochan, con->operation_timeout);
iochan_setdata(con->iochan, con);
- iochan_setsocketfun(con->iochan, socketfun);
- iochan_setmaskfun(con->iochan, maskfun);
iochan_add(iochan_man, con->iochan);
/* this fragment is bad DRY: from client_prep_connection */
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,