";
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);
@@ -111,36 +125,90 @@
print mknav($from_t,($to_t-$int_t),'<<') if ($to_t-$int_t > $from_t);
print $to,mknav($from_t,($to_t+$int_t),'>>')," |
\n";
-my $fix_d = 0; # used to fix graph len
+# draw hour grid
+sub hour_grid {
+ print "| hour grid | ";
+ my @c = ("255,255,128","255,192,128");
+ my $hr=strftime("%H",localtime ($from_t));
+ 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 |
\n";
+}
+
+hour_grid();
+
+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 @_; # lenght of event utime
- my $status = shift @_ || undef; # what to draw
+ my $l = shift @_;
+ my $status = shift @_;
+ my $alt = shift @_;
+
+ my $col;
+
+ if ($status) {
+ if ($cols{$status}) {
+ $col .= $cols{$status};
+ } else {
+ $col .= "0,0,0"; # unknown status, black
+ }
+ $count{$status}++;
+ } else {
+# $col .= '240,240,240';
+ $col .= '220,220,220';
+ }
+ 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 = int($l / ($len_t / $width));
- if ($size < $min_l) {
+ 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;
+ }
+
+ if ($alt && $size < $min_l) {
+ $fix_d += ($min_l - $size);
+ print STDERR "fix_d: $fix_d\n" if ($debug);
$size = $min_l;
- $fix_d += $min_l;
}
if ($fix_d && $size > $fix_d+$min_l) {
$size -= $fix_d;
$fix_d = 0;
+ print STDERR "fix_d: $fix_d\n" if ($debug);
}
- print STDERR "bar[$status] len:$l s scale:",($len_t/$width)," size:$size px
alt:$alt\n" if ($debug);
+ print STDERR "bar[$col] len:$l s scale:",($len_t/$width)," size:$size px
alt:$alt\n" if ($debug);
- my $html = "![](\"".$q-)
url(-relative=>1)."?pic=";
+ my $html = "url(-relative=>1)."/$col\" width=\"$size\" height=\"$h\"";
- if ($status) {
- $html .= $cols{$status};
- $count{$status}++;
- } else {
-# $html .= '240,240,240';
- $html .= '220,220,220';
- }
-
- $html .= "\" width=\"$size\" height=\"$height\"";
if ($use_js && $alt) {
$html .= " onmouseover=\"T('$alt')\" onmouseout=\"T()\"";
} elsif ($alt) {
@@ -156,7 +224,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;
@@ -168,6 +236,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 "| $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 - 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 - int (255 * $last_var / $max_use);
+ print color_bar($len,"$c,$c,$c","$last_var concurrent jobs",1,$h+1) if ($len);
+ print " |
";
+}
+
while(my $row = $sth->fetchrow_hashref) {
if (!defined $curr_spec || $row->{specification} ne $curr_spec) {
@@ -178,6 +279,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 "| ", $row->{specification}," | ";
$curr_t = $from_t; # init timeline
@@ -188,11 +300,15 @@
my $start_t = str2time($row->{start});
my $fin_t = str2time($row->{finish});
- if ($start_t > $curr_t) {
+ # 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;
@@ -217,11 +333,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);
@@ -241,7 +364,11 @@
undef $sth;
$dbh->disconnect;
-print " |
\n
";
+print "\n";
+sum_bar("summary for $dev",@dev_t);
+hour_grid();
+sum_bar("summary for all devices",@dev_sum_t);
+print "