From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Mon, 6 Oct 2014 05:58:56 +0000 (+0200)
Subject: Simplify run.pl
X-Git-Tag: pc-sw-update~20
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/2d7815969d99faf9c355759d62cd35cbeb97e57f

Simplify run.pl
---

diff --git a/continuous/gw-setup/run.pl b/continuous/gw-setup/run.pl
index abb8b07..f9de8f2 100755
--- a/continuous/gw-setup/run.pl
+++ b/continuous/gw-setup/run.pl
@@ -1,33 +1,32 @@
 #!/usr/bin/perl -w
 
 use FindBin;
+use Expect;
 
 # Create startup script in ramdisk
 my $S99 = "$FindBin::Bin/initramfs/etc/init.d/S99benchmark";
 system("rm -f $S99");
 system("cat > $S99; chmod +x $S99") unless -t STDIN;
 
-# Boot gateway
-my $boot;
-my $pid = &run_boot;
-$|=1;
-
-my $ready;
-while (<$boot>){
-    last if ($ready = m/Welcome to Buildroot/ ||
-		      m/UGW started/ ||
-		      m/t...a...s...k...s... ...s...t...a...r...t...e...d/); # RTEMS has bug - it sends 4 characters instead of just one
-}
-die "Boot failed" unless $ready;
+# Boot the gateway
+# die("No boot command") if ($#ARGV eq -1);
+my $bootcmd = scalar @ARGV ? "'".join("' '", @ARGV)."'" : "$FindBin::Bin/boot";
+$exp = Expect->spawn($bootcmd);
+$exp->expect(120,
+	     'Welcome to Buildroot',
+	     'UGW started',
+	     '-re', 't...a...s...k...s... ...s...t...a...r...t...e...d') # RTEMS has bug - it sends 4 characters instead of just one
+    or die "Cannot spawn $bootcmd: $!";
 
 # Measure latencies
 my $latester=<<'EOF';
+set -x
 rm -f tmp-stat.txt
 echo "Starting latester"
-sudo ip l set eth0 down
+sudo ifdown eth0
 sudo ~/bin/latester -d can0 -d can1 -d can2 -c 3200 -q --oneattime -n tmp
 r=$?
-sudo ip l set eth0 up
+sudo ifup eth0
 set -e
 source tmp-stat.txt
 for i in sent lost enobufs $(seq -f percentile%g 0 10 100); do keyval="$keyval $i=$((i))"; done
@@ -37,34 +36,5 @@ exit $r
 EOF
 
 my $status = system((qw(ssh -T glab), $latester));
-kill('TERM', -$pid);
+$exp->soft_close();
 exit($status >> 8);
-
-# Helper functions
-sub kill_boot() { kill('TERM', -$pid) if defined $pid; }
-sub run_boot()
-{
-    # die("No boot command") if ($#ARGV eq -1);
-    my $bootcmd = scalar @ARGV ? "'".join("' '", @ARGV)."'" : "$FindBin::Bin/boot";
-
-    $SIG{INT} = sub { kill_boot(); exit; };
-    $SIG{HUP} = sub { kill_boot(); exit; };
-    $SIG{ALRM} = sub { kill_boot(); exit; };
-    $SIG{TERM} = sub { kill_boot(); exit; };
-    $SIG{QUIT} = sub { kill_boot(); exit; };
-
-    pipe($boot, $wh) || die("pipe: $!");
-    my $pid = fork() // die("fork: $!");
-    if ($pid == 0) {
-	setpgrp(); # Start new process group so that we can kill all
-                   # background processes at once
-	close($boot);
-	open(STDERR, ">&", $wh) || die "Can't dup STDERR: $!";
-	my $cmd = "$bootcmd 2>&1 | tee /dev/stderr";
-	exec($cmd) || die "Can't exec $cmd: $!";
-    }
-    close($wh);
-    return $pid;
-}
-
-END { kill_boot(); }