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
Channel counting. New iochan_destroy_real.
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
3ef5cf6
..
c4dfe72
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-48,22
+48,37
@@
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 void 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_connection;
+ 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() {
+ 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
@@
-393,7
+408,6
@@
static int connection_connect(struct connection *con, iochan_man_t iochan_man)
const char *charset;
const char *sru;
const char *sru_version = 0;
const char *charset;
const char *sru;
const char *sru_version = 0;
- const char *extra_args = 0;
struct session_database *sdb = client_get_database(con->client);
const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
struct session_database *sdb = client_get_database(con->client);
const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
@@
-424,9
+438,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 ((extra_args = session_setting_oneval(sdb, PZ_EXTRA_ARGS)) && *extra_args)
- ZOOM_options_set(zoptions, "extraArgs", extra_args);
-
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");