--- db2gantt.cgi 2002/09/16 15:09:19 1.20
+++ db2gantt.cgi 2002/11/18 08:09:58 1.24
@@ -20,6 +20,7 @@
'In Progress/Failures' => '192,64,192',
'In Progress/Errors' => '255,128,128',
'Queuing' => '255,255,0',
+ 'Queuing/Errors' => '255,192,64',
'Aborted' => '255,0,0',
'Failed' => '255,0,0',
'Completed' => '64,255,64',
@@ -27,6 +28,7 @@
'Completed/Failure' => '128,0,128',
'Mount Request' => '128,128,255',
'Mount/Errors' => '255,64,128',
+ 'Mount/Failures' => '255,128,192',
);
my $int_t = (12 * 60 * 60); # interval to display on one screen
@@ -59,16 +61,18 @@
# keep count of each status
my %count;
-if (param('pic')) {
- print "Content-type: image/png\nCache-Control: max-age=3600, must-revalidate\n\n";
+if (path_info()) {
+ print "Content-type: image/png\nCache-Control: max-age=86400, must-revalidate\nExpires: ",scalar localtime(time()+24*60*60),"\nLast-Modified: ",scalar localtime(0),"\n";
# create picture using GD
use GD;
my $im = new GD::Image(1,$height);
my $back = $im->colorAllocate(255,255,255);
$im->transparent($back);
- my ($r,$g,$b) = split(/,/,param('pic'));
- my $col = $im->colorAllocate($r,$g,$b);
+ my $col = path_info(); $col =~ s,/,,g;
+ my ($r,$g,$b) = split(/,/,$col);
+ $col = $im->colorAllocate($r,$g,$b);
$im->fill(0,0,$col);
+ print "Content-Length: ",length($im->png),"\n\n";
binmode STDOUT;
print $im->png;
exit;
@@ -80,7 +84,7 @@
OmniBack Gantt: $from - $to
-";
+";
if ($use_js) {
print '
@@ -204,7 +208,7 @@
print STDERR "bar[$col] len:$l s scale:",($len_t/$width)," size:$size px
alt:$alt\n" if ($debug);
- my $html = "url(-relative=>1)."?pic=$col\" width=\"$size\" height=\"$h\"";
+ my $html = "url(-relative=>1)."/$col\" width=\"$size\" height=\"$h\"";
if ($use_js && $alt) {
$html .= " onmouseover=\"T('$alt')\" onmouseout=\"T()\"";
@@ -228,7 +232,7 @@
my %spec; # specification hash
-my $curr_spec;
+my $curr_spec = "";
my $curr_t = $from_t;
$sth->execute() || die "sql: $sql ".$dbh->errstr;
@@ -254,44 +258,76 @@
$len++;
} else {
my $h = $last_var / $max_use * $height;
- my $c = 255 - 255 * $last_var / $max_use;
+ my $c = 255 - int (255 * $last_var / $max_use);
print color_bar($len,"$c,$c,$c","$last_var concurrent jobs",1,$h+1);
$len = 0;
$last_var = $v;
}
}
my $h = $last_var / $max_use * $height;
- my $c = 255 - 255 * $last_var / $max_use;
+ my $c = 255 - int (255 * $last_var / $max_use);
print color_bar($len,"$c,$c,$c","$last_var concurrent jobs",1,$h+1) if ($len);
print "";
}
+my @line_t; # all seconds for this specification
+my @line_arr = (""); # all segments on line which are not fillers
+
+sub html_spec {
+ print "$curr_spec | ";
+
+ my $last_var = 0;
+ my $len = 0;
+ my $i;
+ for (my $t=0; $t<=$len_t; $t++) {
+ $i = $line_t[$t] || 0;
+ if ($i == $last_var) {
+ $len++;
+ } else {
+ if ($last_var == 0) {
+ print bar($len);
+ } else {
+ print bar($len,split(/\t/,$line_arr[$last_var],2));
+ }
+ $len = 0;
+ $last_var = $i;
+ }
+ }
+ print bar($len,split(/\t/,$line_arr[$i],2));
+
+ print " |
\n";
+}
+
while(my $row = $sth->fetchrow_hashref) {
- if (!defined $curr_spec || $row->{specification} ne $curr_spec) {
+ if ($row->{specification} ne $curr_spec) {
if ($curr_t < $to_t && $curr_spec) {
my $t = $to_t - $curr_t;
print STDERR "[end filler $curr_t:$t]" if ($debug);
- print bar($t);
+# print bar($t);
}
- print "\n" if ($curr_t != $from_t);
+# print "\n" if ($curr_t != $from_t);
- if ($dev && @dev_t && $dev ne $row->{device}) {
- sum_bar("summary for $dev",@dev_t);
- $dev = $row->{device};
- @dev_t = ();
- } elsif (! $dev) {
- $dev = $row->{device};
- }
# init vars for next line
($fix_s,$fix_d) = (0,0); # init fix vars for bar
- print "", $row->{specification}," | ";
+
+ html_spec if ($curr_spec ne "");
$curr_t = $from_t; # init timeline
$curr_spec = $row->{specification};
+ @line_t = ();
+ @line_arr = ( "" );
+
+ if ($dev && @dev_t && $dev ne $row->{device}) {
+ sum_bar("summary for $dev",@dev_t);
+ $dev = $row->{device};
+ @dev_t = ();
+ } elsif (! $dev) {
+ $dev = $row->{device};
+ }
}
my $start_t = str2time($row->{start});
@@ -301,7 +337,7 @@
if ($start_t > $curr_t + ($len_t / $width)) {
my $t = $start_t - $curr_t;
print STDERR "[middle filler $curr_t:$t]" if ($debug);
- print bar($t);
+# print bar($t);
$curr_t = $start_t;
} else {
# prepend too few seconds to next event
@@ -334,10 +370,12 @@
$row->{type}." ".$row->{status}." ".
$row->{user_group_host}." ".$row->{sessionid}." ".
$row->{device}." on ".$row->{host};
- print bar($len,$row->{status},$alt);
+# print bar($len,$row->{status},$alt);
+ push @line_arr,$row->{status}."\t".$alt;
# store use of devices for each minute
for (my $s=0; $s<$len; $s++) {
+ $line_t[$curr_t-$from_t+$s] = $#line_arr;
$dev_t[$curr_t-$from_t+$s]++;
$dev_sum_t[$curr_t-$from_t+$s]++;
}
@@ -349,19 +387,18 @@
}
if ($curr_t == $from_t) { # no entries in database!
- print " |
| ";
+# print " |
| ";
}
if ($curr_t < $to_t ) {
my $t = $to_t - $curr_t;
print STDERR "[last_line filler $curr_t:$t]" if ($debug);
- print bar($t);
}
undef $sth;
$dbh->disconnect;
-print " |
\n";
+html_spec();
sum_bar("summary for $dev",@dev_t);
hour_grid();
sum_bar("summary for all devices",@dev_sum_t);