From: Jakub Skoczen Date: Mon, 12 Apr 2010 09:54:49 +0000 (+0200) Subject: Merge commit 'origin/json-client' X-Git-Tag: v1.4.0~42^2 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=61b0286e7f7c7c496dd61cfc0dc6c997f43f23f4;hp=555ce40e9d956821e2976288405937761bc7aac4;p=pazpar2-moved-to-github.git Merge commit 'origin/json-client' --- diff --git a/etc/tmarc.xsl b/etc/tmarc.xsl new file mode 100644 index 0000000..51636dd --- /dev/null +++ b/etc/tmarc.xsl @@ -0,0 +1,660 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + electronic resource + + + electronic resource + + + article + + + book + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + , + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , + + + + + + + + + diff --git a/perf/ztest/perf.xml b/perf/ztest/perf.xml index ecfd8e2..6777f3c 100644 --- a/perf/ztest/perf.xml +++ b/perf/ztest/perf.xml @@ -1,9 +1,13 @@ + +] +> - - + diff --git a/src/connection.c b/src/connection.c index 72c1260..260196c 100644 --- a/src/connection.c +++ b/src/connection.c @@ -236,7 +236,9 @@ static void non_block_events(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) @@ -249,6 +251,7 @@ static void connection_handler(IOCHAN iochan, int event) /* 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); return; }