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
Per-field native facets, bug 4195
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
44c1fb9
..
0a6f61c
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-2011 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
@@
-78,7
+95,8
@@
struct connection {
enum {
Conn_Resolving,
Conn_Connecting,
enum {
Conn_Resolving,
Conn_Connecting,
- Conn_Open
+ Conn_Open,
+ Conn_Dead
} state;
int operation_timeout;
int session_timeout;
} state;
int operation_timeout;
int session_timeout;
@@
-133,7
+151,7
@@
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->host->hostport);
if (co->client)
{
if (co->client)
{
@@
-287,17
+305,20
@@
static void connection_handler(IOCHAN iochan, int event)
{
if (co->state == Conn_Connecting)
{
{
if (co->state == Conn_Connecting)
{
- yaz_log(YLOG_WARN, "connect timeout %s", client_get_url(cl));
+ yaz_log(YLOG_WARN, "%p connect timeout %s", co, client_get_url(cl));
client_set_state(cl, Client_Error);
client_set_state(cl, Client_Error);
+ remove_connection_from_host(co);
+ yaz_mutex_leave(host->mutex);
connection_destroy(co);
}
else
{
connection_destroy(co);
}
else
{
- yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl));
+ yaz_log(YLOG_LOG, "%p Connection idle timeout %s", co, client_get_url(cl));
+ remove_connection_from_host(co);
+ yaz_mutex_leave(host->mutex);
connection_destroy(co);
}
connection_destroy(co);
}
- yaz_mutex_leave(host->mutex);
}
else
{
}
else
{
@@
-419,7
+440,6
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
&& *sru_version)
ZOOM_options_set(zoptions, "sru_version", sru_version);
if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
&& *sru_version)
ZOOM_options_set(zoptions, "sru_version", sru_version);
-
if (!(link = ZOOM_connection_create(zoptions)))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");
if (!(link = ZOOM_connection_create(zoptions)))
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");
@@
-534,6
+554,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;