";
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);
+print mknav($from_t,$to_t,'f-1','<<'),$from;
+print mknav($from_t,$to_t,'f+1','>>') if ($from_t+$int_t < $to_t);
print " | ";
-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";
+print mknav($from_t,$to_t,'t-1','<<') if ($to_t+$int_t > $from_t);
+print $to,mknav($from_t,$to_t,'t+1','>>'),"\n";
# draw hour grid
sub hour_grid {
@@ -179,6 +211,7 @@
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);
@@ -203,14 +236,23 @@
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=$col\" width=\"$size\" height=\"$height\"";
+ my $html;
+
+ my ($html_end, $img_end) = ("","");
+ if ($repgen_url && $alt =~ m#(\d\d\d\d)/(\d\d)/(\d\d)-(\d+)#) {
+ $html .= "";
+ $html_end .= "";
+ $img_end .= " border=0";
+ }
+
+ $html .= "url(-relative=>1)."/$col\" width=\"$size\" height=\"$h\"";
if ($use_js && $alt) {
$html .= " onmouseover=\"T('$alt')\" onmouseout=\"T()\"";
} elsif ($alt) {
$html .= " alt=\"$alt\"";
}
- $html .= ">";
+ $html .= "$img_end>$html_end";
return($html);
}
@@ -224,30 +266,111 @@
";
my $sth = $dbh->prepare($sql) || die "sql: $sql ".$dbh->errstr;
+print STDERR "sql: $sql\n" if ($debug);
my %spec; # specification hash
-my $curr_spec;
+my $curr_spec = "";
my $curr_t = $from_t;
$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;
+ }
+ }
+ # fix division by zero
+ $max_use++ if ($max_use == 0);
+ 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 " |
";
+}
+
+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);
+
+
+ # init vars for next line
($fix_s,$fix_d) = (0,0); # init fix vars for bar
- print "| ", $row->{specification}," | ";
+
+ if ($curr_spec ne "") {
+ $curr_spec =~ s/ +/ /g;
+ html_spec;
+ }
$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});
@@ -257,7 +380,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
@@ -286,11 +409,19 @@
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};
- print bar($len,$row->{status},$alt);
+ $alt .= $row->{specification}."
".
+ $row->{type}." ".$row->{status}."
".
+ $row->{user_group_host}." ".$row->{sessionid}."
".
+ $row->{device}." on ".$row->{host};
+# 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]++;
+ }
$curr_t += $len;
@@ -299,28 +430,34 @@
}
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);
print "
";
# label and usage
-$len_t = 50; # disable bar scaling
print "