From 40cfd7b9d4d21bb5c63cc949822ad5ae3abf18b0 Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Mon, 31 Oct 2011 13:10:00 +0100
Subject: [PATCH] bq --job

---
 bq | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/bq b/bq
index e35528a..9be29ab 100755
--- a/bq
+++ b/bq
@@ -12,25 +12,24 @@ use BEX;
 
 my $by_host;
 my $queue_name;
+my $given_job;
 
 GetOptions(
 	"h|by-host!" => \$by_host,
+	"j|job=s" => \$given_job,
 	"q|queue=s" => \$queue_name,
 ) or die <<AMEN ;
 Usage: bq [<options>] [[!]<machine-or-class> ...]
 
 Options:
 -h, --by-host		Show jobs sorted by host (default: by job)
+-j, --job=<id>		Show only instances of the specified job
 -q, --queue=<name>	Show jobs in the given queue
 AMEN
 
 my @machines = BEX::Config::parse_machine_list(@ARGV ? @ARGV : '*');
 my $queue = BEX::Queue->new($queue_name);
 
-if ($queue->is_locked(undef, undef)) {
-	print "### Queue lock present\n\n";
-}
-
 my %jobs = ();
 my %machs = ();
 my %subj = ();
@@ -39,10 +38,20 @@ my %mach_locked = ();
 for my $m (@machines) {
 	$mach_locked{$m} = $queue->is_locked($m, undef);
 	for my $j ($queue->scan($m)) {
+		if (defined $given_job) {
+			next if $j ne $given_job;
+		}
 		push @{$jobs{$j}}, $m;
 		push @{$machs{$m}}, $j;
 		my $job = $queue->job_metadata($j);
 		$subj{$j} = ' (' . $job->{'Subject'} . ')';
+
+	}
+}
+
+# Read status of each job
+for my $m (keys %machs) {
+	for my $j (@{$machs{$m}}) {
 		my $st = $queue->read_job_status($m, $j);
 		if (defined($st->{'Time'}) && defined($st->{'Status'})) {
 			$stat{$m}{$j} = ' [' . $st->{'Status'} . ' on ' .
@@ -56,6 +65,10 @@ for my $m (@machines) {
 	}
 }
 
+if ($queue->is_locked(undef, undef)) {
+	print "### Queue lock present\n\n";
+}
+
 if ($by_host) {
 	for my $m (sort keys %machs) {
 		print "$m", ($mach_locked{$m} ? ' [LOCKED]' : ''), "\n";
-- 
2.39.2