X-Git-Url: http://xvm.mit.edu/gitweb/invirt/third/libt4.git/blobdiff_plain/5fd8cc8409d0efadc07dfe8d6774ad9ff477663d..5bb7eb131773abd9e642f83629528b4c4e706b2e:/rsm_tester.pl

diff --git a/rsm_tester.pl b/rsm_tester.pl
index 7018164..3d94744 100755
--- a/rsm_tester.pl
+++ b/rsm_tester.pl
@@ -43,9 +43,6 @@ sub spawn {
   if (my $pid = fork) {
 # parent
     push( @logs, "$p-$aa.log" );
-    if( $p =~ /config_server/ ) {
-      push( @logs, paxos_log($a[1]) );
-    }
     if( $p =~ /lock_server/ ) {
       push( @logs, paxos_log($a[1]) );
     }
@@ -70,7 +67,7 @@ sub randports {
   my $num = shift;
   my @p = ();
   for( my $i = 0; $i < $num; $i++ ) {
-    push( @p, int(rand(54000))+10000 );
+    push( @p, int(rand(54000/2))*2+10000 );
   }
   my @sp = sort { $a <=> $b } @p;
   return @sp;
@@ -91,12 +88,6 @@ sub spawn_ls {
   return spawn( "./lock_server", $master, $port );
 }
 
-sub spawn_config {
-  my $master = shift;
-  my $port = shift;
-  return spawn( "./config_server", $master, $port );
-}
-
 sub check_views {
 
   my $l = shift;
@@ -168,8 +159,8 @@ sub wait_for_view_change {
   my $start = time();
   while( (get_num_views( $log, $including ) < $num_views) and
       ($start + $timeout > time()) ) {
-		my $lastv = `grep done  $log | tail -n 1`;
-		chomp $lastv;
+    my $lastv = `grep done  $log | tail -n 1`;
+    chomp $lastv;
     print "   Waiting for $including to be present in >=$num_views views in $log (Last view: $lastv)\n";
     sleep 1;
   }
@@ -229,13 +220,10 @@ sub start_nodes ($$){
   my $command = shift;
 
   for (my $i = 0; $i < $n; $i++) {
-		if ($command eq "ls") {
-			@pid = (@pid, spawn_ls($p[0],$p[$i]));
-			print "Start lock_server on $p[$i]\n";
-		}elsif ($command eq "config_server"){
-			@pid = (@pid, spawn_config($p[0],$p[$i]));
-			print "Start config on $p[$i]\n";
-		}
+    if ($command eq "ls") {
+      @pid = (@pid, spawn_ls($p[0],$p[$i]));
+      print "Start lock_server on $p[$i]\n";
+    }
     sleep 1;
 
     my @vv = @p[0..$i];
@@ -429,7 +417,7 @@ if ($do_run[5]) {
   foreach my $port (@lastv) {
     wait_for_view_change(paxos_log($port), $in_views{$port}+1, $port, 20);
   }
-	sleep 10;
+  sleep 10;
 
 # now check the paxos logs and make sure the logs go through the right
 # views
@@ -559,7 +547,7 @@ if ($do_run[7]) {
 
 if ($do_run[8]) {
   print "test8: start 3-process lock service\n";
-	start_nodes(3,"ls");
+  start_nodes(3,"ls");
   
   print "Start lock_tester $p[0]\n";
   $t = spawn("./lock_tester", $p[0]);
@@ -578,7 +566,7 @@ if ($do_run[8]) {
 if ($do_run[9]) {
 
   print "test9: start 3-process rsm, kill second slave while lock_tester is running\n";
-	start_nodes(3,"ls");
+  start_nodes(3,"ls");
   
   print "Start lock_tester $p[0]\n";
   $t = spawn("./lock_tester", $p[0]);
@@ -608,7 +596,7 @@ if ($do_run[9]) {
 if ($do_run[10]) {
 
   print "test10: start 3-process rsm, kill second slave and restarts it later while lock_tester is running\n";
-	start_nodes(3,"ls");
+  start_nodes(3,"ls");
   
   print "Start lock_tester $p[0]\n";
   $t = spawn("./lock_tester", $p[0]);
@@ -646,7 +634,7 @@ if ($do_run[10]) {
 if ($do_run[11]) {
 
   print "test11: start 3-process rsm, kill primary while lock_tester is running\n";
-	start_nodes(3,"ls");
+  start_nodes(3,"ls");
 
   print "Start lock_tester $p[0]\n";
   $t = spawn("./lock_tester", $p[0]);