*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@698 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/script/comb.pl b/ceph/script/comb.pl
index 0e4e63476504ffa0e873b68d804c6f61b6eb616c..0585077c85e249b43aa916a470d1bbbc4721dd29 100755 (executable)
--- a/ceph/script/comb.pl
+++ b/ceph/script/comb.pl
@@ -52,9 +52,22 @@ my %res;
 my @key;
 my %didkey;
 for my $f (@filt) {
-       for my $d (@dirs) {
-               next if ($f ne '.' && $d !~ /$f/);                      
-
+       my @reg = split(/,/, $f);
+       #print "reg @reg\n";
+       for my $d (@dirs) {
+               if ($f ne '.') {
+                       my $r = (split(/\//,$d))[-1];
+                       my @db = split(/,/, $r);
+                       #print "db @db\n";
+                       my $ok = 1;
+                       for my $r (@reg) {
+                               
+                               $ok = 0 unless grep {$_ eq $r} @db;
+                       }
+                       next unless $ok;
+               }
+               #next if ($f ne '.' && $d !~ /$reg/);                   
+               #print "$d\n";
                my ($x) = $d =~ /$xaxis=(\d+)/;
                
                for my $v (@vars) {

diff --git a/ceph/script/runset.pl b/ceph/script/runset.pl
index 2837c3f03428ae848976364d63b4c7cc38fe477f..0c6a72520625d32d0974ac612b5fb5fb68513d6a 100755 (executable)
--- a/ceph/script/runset.pl
+++ b/ceph/script/runset.pl
@@ -205,6 +205,13 @@ touch $fn/.post
        open(O,">$fn/sh.post");
        print O $post;
        close O;
+
+       my $killmin = 1 + $h->{'kill_after'} / 60;
+       my $srun = "srun -l -t $killmin -N $h->{'n'} -p ltest $c > $fn/o && touch $fn/.done
+";
+       open(O,">$fn/sh.srun");
+       print O $srun;
+       close O;
        
        if ($sim->{'_psub'}) {
                # template!