[SCM] CTDB repository - branch master updated - ctdb-1.0.81-12-g723413f

[Ronnie Sahlberg]

The branch, master has been updated
       via  723413f246399b25166462d2018237920515655f (commit)
       via  3c67e164eb92591f8763883430490805c1dfa9ed (commit)
      from  ea2ca769e1d1068fbbad843750b19acfd87360e0 (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 723413f246399b25166462d2018237920515655f
Author: Martin Schwenke <martin at meltin.net>
Date:   Fri Apr 3 12:54:26 2009 +1100

    In 51_ctdb_bench.sh now allows a 2% difference between positive and
    negative.  ctdb_bench.c checks to ensure the timer has advanced from 0
    before dividing.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

commit 3c67e164eb92591f8763883430490805c1dfa9ed
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Apr 21 16:50:37 2009 +1000

    Avoid floating point divide by 0 in ctdb_fetch.c's bench_fetch().
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 tests/simple/51_ctdb_bench.sh |    7 ++++---
 tests/src/ctdb_bench.c        |    2 +-
 tests/src/ctdb_fetch.c        |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/tests/simple/51_ctdb_bench.sh b/tests/simple/51_ctdb_bench.sh
index b5072c3..6caae05 100755
--- a/tests/simple/51_ctdb_bench.sh
+++ b/tests/simple/51_ctdb_bench.sh
@@ -83,10 +83,11 @@ fi
 perc_diff=$(( ($positive - $negative) * 100 / $positive ))
 perc_diff=${perc_diff#-}
 
-if [ $perc_diff -le 1 ] ; then
-    echo "OK: percentage difference between +ive and -ive ($perc_diff%) <= 1%"
+check_percent=2
+if [ $perc_diff -le $check_percent ] ; then
+    echo "OK: percentage difference between +ive and -ive ($perc_diff%) <= $check_percent%"
 else
-    echo "BAD: percentage difference between +ive and -ive ($perc_diff%) > 1%"
+    echo "BAD: percentage difference between +ive and -ive ($perc_diff%) > $check_percent%"
     exit 1
 fi
 
diff --git a/tests/src/ctdb_bench.c b/tests/src/ctdb_bench.c
index 61bac49..52e5b50 100644
--- a/tests/src/ctdb_bench.c
+++ b/tests/src/ctdb_bench.c
@@ -161,7 +161,7 @@ static void bench_ring(struct ctdb_context *ctdb, struct event_context *ev)
 
 	start_timer();
 	while (end_timer() < timelimit) {
-		if (pnn == 0 && msg_count % 10000 == 0) {
+		if (pnn == 0 && msg_count % 10000 == 0 && end_timer() > 0) {
 			printf("Ring: %.2f msgs/sec (+ve=%d -ve=%d)\r", 
 			       msg_count/end_timer(), msg_plus, msg_minus);
 			fflush(stdout);
diff --git a/tests/src/ctdb_fetch.c b/tests/src/ctdb_fetch.c
index aab4fe1..eecbb84 100644
--- a/tests/src/ctdb_fetch.c
+++ b/tests/src/ctdb_fetch.c
@@ -132,7 +132,7 @@ static void bench_fetch(struct ctdb_context *ctdb, struct event_context *ev)
 	start_timer();
 
 	while (end_timer() < timelimit) {
-		if (pnn == 0 && msg_count % 100 == 0) {
+		if (pnn == 0 && msg_count % 100 == 0 && end_timer() > 0) {
 			printf("Fetch: %.2f msgs/sec\r", msg_count/end_timer());
 			fflush(stdout);
 		}


-- 
CTDB repository