From 1e3d4b79883989ce4b9982ed612c2ba0a02a8033 Mon Sep 17 00:00:00 2001
From: sage <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Tue, 28 Feb 2006 17:27:25 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@698 29311d96-e01e-0410-9327-a35deaab8ce9
---
 ceph/script/comb.pl   | 19 ++++++++++++++++---
 ceph/script/runset.pl |  7 +++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ceph/script/comb.pl b/ceph/script/comb.pl
index 0e4e63476504f..0585077c85e24 100755
--- 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 2837c3f03428a..0c6a72520625d 100755
--- 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!
-- 
2.39.5