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
Simplify IOCHAN destrouction
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
f318378
..
f205252
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-42,7
+42,7
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/comstack.h>
#include <yaz/tcpip.h>
#include "connection.h"
#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"
#include "host.h"
#include "client.h"
#include "settings.h"
@@
-55,8
+55,6
@@
struct connection {
ZOOM_connection link;
struct host *host;
struct client *client;
ZOOM_connection link;
struct host *host;
struct client *client;
- char *ibuf;
- int ibufsize;
char *zproxy;
enum {
Conn_Resolving,
char *zproxy;
enum {
Conn_Resolving,
@@
-68,9
+66,7
@@
struct connection {
struct connection *next; // next for same host or next in free list
};
struct connection *next; // next for same host or next in free list
};
-static struct connection *connection_freelist = 0;
-
-static int connection_connect(struct connection *con);
+static int connection_connect(struct connection *con, iochan_man_t iochan_man);
static int connection_is_idle(struct connection *co)
{
static int connection_is_idle(struct connection *co)
{
@@
-98,16
+94,17
@@
static void remove_connection_from_host(struct connection *con)
{
struct connection **conp = &con->host->connections;
assert(con);
{
struct connection **conp = &con->host->connections;
assert(con);
+ yaz_mutex_enter(con->host->mutex);
while (*conp)
{
if (*conp == con)
{
*conp = (*conp)->next;
while (*conp)
{
if (*conp == con)
{
*conp = (*conp)->next;
- return;
+ break;
}
conp = &(*conp)->next;
}
}
conp = &(*conp)->next;
}
- assert(*conp == 0);
+ yaz_mutex_leave(con->host->mutex);
}
// Close connection and recycle structure
}
// Close connection and recycle structure
@@
-126,31
+123,27
@@
void connection_destroy(struct connection *co)
client_disconnect(co->client);
}
xfree(co->zproxy);
client_disconnect(co->client);
}
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
// client's database
static struct connection *connection_create(struct client *cl,
int operation_timeout,
}
// Creates a new connection for client, associated with the host of
// client's database
static struct connection *connection_create(struct client *cl,
int operation_timeout,
- int session_timeout)
+ int session_timeout,
+ iochan_man_t iochan_man)
{
struct connection *new;
struct host *host = client_get_host(cl);
{
struct connection *new;
struct host *host = client_get_host(cl);
- if ((new = connection_freelist))
- connection_freelist = new->next;
- else
- {
- new = xmalloc(sizeof (struct connection));
- new->ibuf = 0;
- new->ibufsize = 0;
- }
+ new = xmalloc(sizeof(*new));
new->host = host;
new->host = host;
+
+ yaz_mutex_enter(host->mutex);
new->next = new->host->connections;
new->host->connections = new;
new->next = new->host->connections;
new->host->connections = new;
+ yaz_mutex_leave(host->mutex);
+
new->client = cl;
new->zproxy = 0;
client_set_connection(cl, new);
new->client = cl;
new->zproxy = 0;
client_set_connection(cl, new);
@@
-159,7
+152,7
@@
static struct connection *connection_create(struct client *cl,
new->operation_timeout = operation_timeout;
new->session_timeout = session_timeout;
if (host->ipport)
new->operation_timeout = operation_timeout;
new->session_timeout = session_timeout;
if (host->ipport)
- connection_connect(new);
+ connection_connect(new, iochan_man);
return new;
}
return new;
}
@@
-271,46
+264,51
@@
void connection_release(struct connection *co)
{
struct client *cl = co->client;
{
struct client *cl = co->client;
- yaz_log(YLOG_DEBUG, "Connection release %s", co->host->hostport);
if (!cl)
return;
client_set_connection(cl, 0);
co->client = 0;
}
if (!cl)
return;
client_set_connection(cl, 0);
co->client = 0;
}
-void connect_resolver_host(struct host *host)
+void connect_resolver_host(struct host *host, iochan_man_t iochan_man)
{
{
- struct connection *con = host->connections;
+ struct connection *con;
+
+ yaz_mutex_enter(host->mutex);
+ con = host->connections;
while (con)
{
if (con->state == Conn_Resolving)
{
if (!host->ipport) /* unresolved */
{
while (con)
{
if (con->state == Conn_Resolving)
{
if (!host->ipport) /* unresolved */
{
+ yaz_mutex_leave(host->mutex);
connection_destroy(con);
/* start all over .. at some point it will be NULL */
con = host->connections;
connection_destroy(con);
/* start all over .. at some point it will be NULL */
con = host->connections;
- continue;
}
else if (!con->client)
{
}
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;
connection_destroy(con);
/* start all over .. at some point it will be NULL */
con = host->connections;
- continue;
}
else
{
}
else
{
- connection_connect(con);
+ yaz_mutex_leave(host->mutex);
+ connection_connect(con, iochan_man);
client_start_search(con->client);
client_start_search(con->client);
+ con = host->connections;
}
}
else
{
yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
}
}
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)
}
static struct host *connection_get_host(struct connection *con)
@@
-340,7
+338,7
@@
static int maskfun(IOCHAN c)
return ZOOM_connection_get_mask(co->link);
}
return ZOOM_connection_get_mask(co->link);
}
-static int connection_connect(struct connection *con)
+static int connection_connect(struct connection *con, iochan_man_t iochan_man)
{
ZOOM_connection link = 0;
struct host *host = connection_get_host(con);
{
ZOOM_connection link = 0;
struct host *host = connection_get_host(con);
@@
-404,7
+402,7
@@
static int connection_connect(struct connection *con)
iochan_setdata(con->iochan, con);
iochan_setsocketfun(con->iochan, socketfun);
iochan_setmaskfun(con->iochan, maskfun);
iochan_setdata(con->iochan, con);
iochan_setsocketfun(con->iochan, socketfun);
iochan_setmaskfun(con->iochan, maskfun);
- pazpar2_add_channel(con->iochan);
+ iochan_add(iochan_man, con->iochan);
/* this fragment is bad DRY: from client_prep_connection */
client_set_state(con->client, Client_Connecting);
/* this fragment is bad DRY: from client_prep_connection */
client_set_state(con->client, Client_Connecting);
@@
-419,7
+417,8
@@
const char *connection_get_url(struct connection *co)
// Ensure that client has a connection associated
int client_prep_connection(struct client *cl,
// Ensure that client has a connection associated
int client_prep_connection(struct client *cl,
- int operation_timeout, int session_timeout)
+ int operation_timeout, int session_timeout,
+ iochan_man_t iochan_man)
{
struct connection *co;
struct session *se = client_get_session(cl);
{
struct connection *co;
struct session *se = client_get_session(cl);
@@
-441,9
+440,10
@@
int client_prep_connection(struct client *cl,
{
// See if someone else has an idle connection
// We should look at timestamps here to select the longest-idle connection
{
// 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) &&
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)))
!strcmp(ZOOM_connection_option_get(co->link, "user"),
session_setting_oneval(client_get_database(cl),
PZ_AUTHENTICATION)))
@@
-458,6
+458,7
@@
int client_prep_connection(struct client *cl,
connection_release(co);
client_set_connection(cl, co);
co->client = cl;
connection_release(co);
client_set_connection(cl, co);
co->client = cl;
+ yaz_mutex_leave(host->mutex);
co->operation_timeout = operation_timeout;
co->session_timeout = session_timeout;
/* tells ZOOM to reconnect if necessary. Disabled becuase
co->operation_timeout = operation_timeout;
co->session_timeout = session_timeout;
/* tells ZOOM to reconnect if necessary. Disabled becuase
@@
-466,7
+467,9
@@
int client_prep_connection(struct client *cl,
}
else
{
}
else
{
- co = connection_create(cl, operation_timeout, session_timeout);
+ yaz_mutex_leave(host->mutex);
+ co = connection_create(cl, operation_timeout, session_timeout,
+ iochan_man);
}
}
}
}