Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2

diff --git a/perf/bash/client.sh b/perf/bash/client.sh
index c48e89e..9f1c4c0 100755 (executable)
--- a/perf/bash/client.sh
+++ b/perf/bash/client.sh
@@ -8,10 +8,14 @@ PORT=$2
 if test -z "$PORT"; then
        PORT=9004
 fi
+SERVICE=$3
+if test -z "$SERVICE"; then
+       SERVICE=perf
+fi
 
 
 H="http://localhost:${PORT}/search.pz2"
-wget -q -O $OF.init.xml "$H/?command=init&service=perf&extra=$OF"
+wget -q -O $OF.init.xml "$H/?command=init&service=${SERVICE}&extra=$OF"
 S=`xsltproc get_session.xsl $OF.init.xml`
 wget -q -O $OF.search.xml "$H?command=search&query=100&session=$S"
 sleep 1

diff --git a/perf/bash/par.sh b/perf/bash/par.sh
index 0374b46..02d271f 100755 (executable)
--- a/perf/bash/par.sh
+++ b/perf/bash/par.sh
@@ -3,6 +3,9 @@ DELAY=0.001
 WAIT=5
 NUMBER=10
 ROUNDS=5
+PORT=9004
+SERVICE=perf
+SHUTDOWN=1
 if test -n "$1"; then
        . $1
 fi
@@ -11,7 +14,7 @@ while test $r -lt $ROUNDS; do
        echo "$r"
        let i=0
        while test $i -lt $NUMBER; do
-               ./client.sh $r.$i >$r.$i.log 2>&1 &
+               ./client.sh $r.$i $PORT $SERVICE >$r.$i.log 2>&1 &
                sleep $DELAY
                let i=$i+1
        done
@@ -19,4 +22,6 @@ while test $r -lt $ROUNDS; do
        let r=$r+1
 done
 wait
-wget -O x 'http://localhost:9004/?command=exit'
+if [ "$SHUTDOWN" == "1" ] ; then 
+    wget -O x "http://localhost:${PORT}/?command=exit"
+fi

diff --git a/src/eventl.c b/src/eventl.c
index 0f0d46b..faba34d 100644 (file)
--- a/src/eventl.c
+++ b/src/eventl.c
@@ -95,6 +95,7 @@ void iochan_man_destroy(iochan_man_t *mp) {
             xfree(c);
             c = c_next;
         }
+        yaz_mutex_destroy(&(*mp)->iochan_mutex);
         xfree(*mp);
         *mp = 0;
     }