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
Remove unused function connection_get_url
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
80ba36b
..
1526938
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"
@@
-79,7
+79,7
@@
static int connection_is_idle(struct connection *co)
if (!ZOOM_connection_is_idle(link))
return 0;
event = ZOOM_connection_peek_event(link);
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;
return 1;
else
return 0;
@@
-99,15
+99,14
@@
static void remove_connection_from_host(struct connection *con)
if (*conp == con)
{
*conp = (*conp)->next;
if (*conp == con)
{
*conp = (*conp)->next;
- return;
+ break;
}
conp = &(*conp)->next;
}
}
conp = &(*conp)->next;
}
- assert(*conp == 0);
}
// Close connection and recycle structure
}
// Close connection and recycle structure
-void connection_destroy(struct connection *co)
+static void connection_destroy(struct connection *co)
{
if (co->link)
{
{
if (co->link)
{
@@
-116,11
+115,12
@@
void connection_destroy(struct connection *co)
}
yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
}
yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
- remove_connection_from_host(co);
if (co->client)
{
client_disconnect(co->client);
}
if (co->client)
{
client_disconnect(co->client);
}
+
+ remove_connection_from_host(co);
xfree(co->zproxy);
xfree(co);
}
xfree(co->zproxy);
xfree(co);
}
@@
-137,8
+137,7
@@
static struct connection *connection_create(struct client *cl,
new = xmalloc(sizeof(*new));
new->host = host;
new = xmalloc(sizeof(*new));
new->host = host;
- new->next = new->host->connections;
- new->host->connections = new;
+
new->client = cl;
new->zproxy = 0;
client_set_connection(cl, new);
new->client = cl;
new->zproxy = 0;
client_set_connection(cl, new);
@@
-148,21
+147,31
@@
static struct connection *connection_create(struct client *cl,
new->session_timeout = session_timeout;
if (host->ipport)
connection_connect(new, iochan_man);
new->session_timeout = session_timeout;
if (host->ipport)
connection_connect(new, iochan_man);
+
+ yaz_mutex_enter(host->mutex);
+ new->next = new->host->connections;
+ new->host->connections = new;
+ yaz_mutex_leave(host->mutex);
+
return new;
}
static void non_block_events(struct connection *co)
{
return new;
}
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)
{
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;
int ev;
int r = ZOOM_event_nonblock(1, &link);
if (!r)
break;
+ if (!cl)
+ continue;
ev = ZOOM_connection_last_event(link);
ev = ZOOM_connection_last_event(link);
+
#if 0
yaz_log(YLOG_LOG, "ZOOM_EVENT_%s", ZOOM_get_event_str(ev));
#endif
#if 0
yaz_log(YLOG_LOG, "ZOOM_EVENT_%s", ZOOM_get_event_str(ev));
#endif
@@
-203,53
+212,77
@@
static void non_block_events(struct connection *co)
break;
case ZOOM_EVENT_RECV_RECORD:
client_record_response(cl);
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));
}
}
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)
{
}
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;
}
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);
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));
{
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);
}
{
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
{
}
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);
non_block_events(co);
ZOOM_connection_fire_event_socket(co->link, event);
non_block_events(co);
+ client_unlock(cl);
}
}
}
}
@@
-259,7
+292,6
@@
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);
if (!cl)
return;
client_set_connection(cl, 0);
@@
-268,37
+300,44
@@
void connection_release(struct connection *co)
void connect_resolver_host(struct host *host, iochan_man_t iochan_man)
{
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 */
{
while (con)
{
if (con->state == Conn_Resolving)
{
if (!host->ipport) /* unresolved */
{
+ yaz_mutex_leave(host->mutex);
connection_destroy(con);
connection_destroy(con);
+ goto start;
/* start all over .. at some point it will be NULL */
/* 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 */
connection_destroy(con);
/* start all over .. at some point it will be NULL */
- con = host->connections;
- continue;
+ goto start;
}
else
{
}
else
{
+ yaz_mutex_leave(host->mutex);
connection_connect(con, iochan_man);
client_start_search(con->client);
connection_connect(con, iochan_man);
client_start_search(con->client);
+ goto start;
}
}
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)
@@
-386,7
+425,7
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
ZOOM_connection_connect(link, host->ipport, 0);
con->link = link;
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);
con->state = Conn_Connecting;
iochan_settimeout(con->iochan, con->operation_timeout);
iochan_setdata(con->iochan, con);
@@
-411,7
+450,6
@@
int client_prep_connection(struct client *cl,
iochan_man_t iochan_man)
{
struct connection *co;
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);
struct host *host = client_get_host(cl);
struct session_database *sdb = client_get_database(cl);
const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
@@
-430,9
+468,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)))
@@
-447,6
+486,10
@@
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;
+ /* 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
co->operation_timeout = operation_timeout;
co->session_timeout = session_timeout;
/* tells ZOOM to reconnect if necessary. Disabled becuase
@@
-455,6
+498,7
@@
int client_prep_connection(struct client *cl,
}
else
{
}
else
{
+ yaz_mutex_leave(host->mutex);
co = connection_create(cl, operation_timeout, session_timeout,
iochan_man);
}
co = connection_create(cl, operation_timeout, session_timeout,
iochan_man);
}