Changeset 997 for branches/reconfiguration/modules/dspin_router/caba/test

Timestamp:

May 29, 2015, 5:51:08 PM (10 years ago)

Author:

cfuguet

Message:

reconf: improve the recovery broadcast replication policy

• Improve the validation scripts for this replication policy.

Location:

branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test

Files:

• broadcast_check.sh (modified) (3 diffs)
• run_broadcast_check.sh (modified) (1 diff)

branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test/broadcast_check.sh

@@ -10 +10 @@
         last=0
         failure=0
+        min=99999999
+        max=0
 }
 #   Parse coordinates of routers
@@ -36 +38 @@
         }
         else {
-                # store the number of received packets of a router that actually
-                # received packets.
-                if (last == 0) {
-                        last=$6
+                # store the min and max number of received packets
+                if ($6 < min) {
+                        min=$6;
                 }
-                # test if the error is too important. The error is defined as
-                # difference between the number of packets received by different
-                # routers.
-                error=last - $6
-                if ((error > 20) || (error < -20)) {
-                        failure=1
-                        exit;
+                if ($6 > max) {
+                        max=$6;
                 }
         }
@@ -54 +50 @@
 #   Validate the file
 END {
-        # an error was too important
-        if (failure == 1) {
-                exit 1
-        }
-
         # it should be only two routers that do not receive the broadcast:
         # the source and the faulty router.
-        if (zero != 2) {
+        if (zero > 2) {
+                print "error: some routers did not received broadcasts\n";
                 exit 1;
         }
 
-        # test if the error is too important
-        error=last - sent
-        if ((error > 20) || (error < -20)) {
+        if (max > sent) {
+                print "error: at least a router received a number of broadcast greater"
+                print "than the number of broadcast sent\n";
+                exit 1;
+        }
+
+        if (zero == 1) {
+                print "error: the broadcast source received broadcasts\n";
+                exit 1;
+        }
+
+        error=sent - min
+        if (error > 20) {
+                print "error: the number of broadcast received by a router is inferior "
+                print "to the error threshold\n";
                 exit 1;
         }

branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test/run_broadcast_check.sh

@@ -1 +1 @@
 #!/usr/bin/env sh
 LOGDIR=logs
-COMMON="-X 5 -Y 5 -N 3000"
+COMMON="-X 5 -Y 5 -N 10000"
 
 mkdir -p $LOGDIR