Changeset: 71ba1e183f9a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71ba1e183f9a
Modified Files:
sql/src/backends/monet5/merovingian/ChangeLog.Oct2010
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (51 lines):
diff -r 951314ad6b43 -r 71ba1e183f9a
sql/src/backends/monet5/merovingian/ChangeLog.Oct2010
--- a/sql/src/backends/monet5/merovingian/ChangeLog.Oct2010 Wed Oct 27
12:55:13 2010 +0200
+++ b/sql/src/backends/monet5/merovingian/ChangeLog.Oct2010 Wed Oct 27
14:01:17 2010 +0200
@@ -5,6 +5,6 @@
- Report a stopped and locked database as under maintenance, instead of
without connections, bug #2685
-* Fri 16 Jul 2010 Arjen de Rijke <arjen.de.ri...@cwi.nl>
+* Fri Jul 16 2010 Arjen de Rijke <arjen.de.ri...@cwi.nl>
- Add readonly property for databases to monetdb and merovingian.
diff -r 951314ad6b43 -r 71ba1e183f9a sql/src/test/concurrent-stress.sh
--- a/sql/src/test/concurrent-stress.sh Wed Oct 27 12:55:13 2010 +0200
+++ b/sql/src/test/concurrent-stress.sh Wed Oct 27 14:01:17 2010 +0200
@@ -48,13 +48,35 @@
concurrent_runner() {
local num=$1
local cnt=1
+ local now=$SECONDS
+ local lcnt=0
+ local elapse=
+ local t=
while mclient $MDATABASE $MHOST $MPORT -ftab -s "SELECT 1;" > /dev/null
; do
: $((cnt++))
+ elapse=$((SECONDS - now))
+ if [[ ${elapse} -ge 3 ]] ; then
+ t=$((cnt - lcnt))
+ t=$((t * 100))
+ t=$((t / elapse))
+ echo "mclient $num executed query $cnt, current speed:
${t%??}.${t#${t%??}}q/s"
+ lcnt=${cnt}
+ now=$SECONDS
+ fi
done
echo "mclient $num terminated in query $cnt"
}
+FORKS=
for nr in $(seq 1 $CONCURRENCY) ; do
concurrent_runner $nr &
+ FORKS+=" $!"
done
-wait
+
+cleanup() {
+ kill $FORKS
+}
+trap cleanup TERM INT QUIT
+
+# wait for all children to end
+wait $FORKS
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
