--- db2gantt.cgi 2002/09/13 18:35:50 1.11 +++ db2gantt.cgi 2002/09/16 15:09:19 1.20 @@ -11,14 +11,14 @@ my $debug = 0; my $width = 600; # width of bar -my $height = 12; # height of bar +my $height = 15; # height of bar my $use_js = 1; # use JavaScript pop-up # status colors my %cols = ( 'In Progress' => '0,255,0', - 'In Progress/Failure' => '255,64,255', - 'In Progress/Errors' => '255,64,0', + 'In Progress/Failures' => '192,64,192', + 'In Progress/Errors' => '255,128,128', 'Queuing' => '255,255,0', 'Aborted' => '255,0,0', 'Failed' => '255,0,0', @@ -75,10 +75,12 @@ } print "Content-type: text/html +Cache-Control: max-age=60, must-revalidate -OmniBack Gantt: $from - $to"; +OmniBack Gantt: $from - $to +"; if ($use_js) { print ' @@ -112,7 +114,7 @@ return "url(-relative=>1)."?from_t=${f}&to_t=${t}\">$ch"; } -print ""; +print "
"; print "\n"; } hour_grid(); -my $fix_d = 0; # used to fix graph len +my $fix_d = 0; # used to fix graph len (in pixels) +my $fix_s = 0; # used to collect round errors of size sub bar { my $l = shift @_; @@ -156,16 +171,27 @@ # $col .= '240,240,240'; $col .= '220,220,220'; } - return color_bar($l,$col,$alt); + return color_bar($l,$col,$alt,$min_l); } sub color_bar { my $l = shift @_; # lenght of event utime my $col = shift @_ || '240,240,240'; # default color (filler) my $alt = shift @_ || undef; + my $min_l = shift @_ || 1; + my $h = shift @_ || $height; + + my $size = $l / ($len_t / $width); + $fix_s += $size - int($size); + $size=int($size); + # add rounding error to size + if ($fix_s > 1) { + my $i = $fix_s ; $i = int($i); + $fix_s -= $i; + $size += $i; + } - my $size = int($l / ($len_t / $width)); - if ($size < $min_l) { + if ($alt && $size < $min_l) { $fix_d += ($min_l - $size); print STDERR "fix_d: $fix_d\n" if ($debug); $size = $min_l; @@ -178,7 +204,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=\"$height\""; + my $html = "url(-relative=>1)."?pic=$col\" width=\"$size\" height=\"$h\""; if ($use_js && $alt) { $html .= " onmouseover=\"T('$alt')\" onmouseout=\"T()\""; @@ -195,7 +221,7 @@ from gantt where (start < '$from' and finish > '$from') or (start > '$from' and start < '$to') - order by device,specification + order by device,specification,start "; my $sth = $dbh->prepare($sql) || die "sql: $sql ".$dbh->errstr; @@ -207,6 +233,39 @@ $sth->execute() || die "sql: $sql ".$dbh->errstr; +my $dev; # current device +my @dev_t; # all minutes in one hour [1440] +my @dev_sum_t; + +sub sum_bar { + my $label = shift @_; + my @dev_t = @_; + # display device summary + my $max_use = 0; + for (my $i=0; $i < $len_t; $i++) { + $max_use = $dev_t[$i] if (defined $dev_t[$i] && $dev_t[$i] > $max_use); + } + print ""; +} + while(my $row = $sth->fetchrow_hashref) { if (!defined $curr_spec || $row->{specification} ne $curr_spec) { @@ -217,6 +276,17 @@ } 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 "\n"; +sum_bar("summary for $dev",@dev_t); hour_grid(); +sum_bar("summary for all devices",@dev_sum_t); print "
Specification"; print mknav(($from_t-$int_t),$to_t,'<<'),$from; print mknav(($from_t+$int_t),$to_t,'>>') if ($from_t+$int_t < $to_t); @@ -125,18 +127,31 @@ print "
hour grid"; my @c = ("255,255,128","255,192,128"); my $hr=strftime("%H",localtime ($from_t)); - print color_bar(3600 - $from_t % 3600,$c[0],sprintf("%02d",$hr++ % 24)); + sub hour_bar { + my ($t,$c,$hr) = @_; + my $clock_hr = $hr % 24; + my $alt = sprintf("%02d:00",$clock_hr); + if ($clock_hr == 0) { + my $pix_hr = int(1 / $width); + print color_bar($pix_hr,"0,0,0",strftime("%Y-%m-%d", localtime($from_t + $hr*3600))); + print color_bar($t-$pix_hr,$c,$alt); + } else { + print color_bar($t,$c,$alt); + } + } + hour_bar(3600 - $from_t % 3600,$c[0],$hr++); for (my $i=1; $i
$label [$max_use]"; + my $last_var = 0; + my $len = 0; + for (my $i=1; $i<= ($to_t-$from_t); $i++) { + my $v = $dev_t[$i] || 0; + if ($v == $last_var) { + $len++; + } else { + my $h = $last_var / $max_use * $height; + my $c = 255 - 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; + print color_bar($len,"$c,$c,$c","$last_var concurrent jobs",1,$h+1) if ($len); + print "
", $row->{specification},""; $curr_t = $from_t; # init timeline @@ -224,14 +294,18 @@ } - my $start_t = m_round(str2time($row->{start})); - my $fin_t = m_round(str2time($row->{finish})); + my $start_t = str2time($row->{start}); + my $fin_t = str2time($row->{finish}); - if ($start_t > $curr_t + 60) { + # Can I squeeze here 1 pixel of time (many seconds) ? + 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); $curr_t = $start_t; + } else { + # prepend too few seconds to next event + $start_t = $curr_t; } my $len = $fin_t - $start_t; @@ -256,11 +330,18 @@ my $alt = $row->{start}." - ".$row->{finish}."
"; $alt =~ s/:\d\d\.\d+//g; $alt =~ s/\s+/ /g; - $alt .= $row->{type}." ".$row->{status}."
". - $row->{user_group_host}." ".$row->{sessionid}."
". - $row->{device}." on ".$row->{host}; + $alt .= $row->{specification}."
". + $row->{type}." ".$row->{status}."
". + $row->{user_group_host}." ".$row->{sessionid}."
". + $row->{device}." on ".$row->{host}; print bar($len,$row->{status},$alt); + # store use of devices for each minute + for (my $s=0; $s<$len; $s++) { + $dev_t[$curr_t-$from_t+$s]++; + $dev_sum_t[$curr_t-$from_t+$s]++; + } + $curr_t += $len; # print Dumper($row); @@ -281,7 +362,9 @@ $dbh->disconnect; print "
"; @@ -298,5 +381,5 @@ # it will first evaluate bar sub (thus increasing number by one) and # then display number (wrongly). } -print "\n

Reload url(-relative=>1),"\">current.

"; +print "\n

Reload url(-relative=>1),"\">current or see help.

";