Index: gs2-extensions/parallel-building/trunk/src/bin/script/generate_gantt.pl
===================================================================
--- gs2-extensions/parallel-building/trunk/src/bin/script/generate_gantt.pl (revision 28357)
+++ gs2-extensions/parallel-building/trunk/src/bin/script/generate_gantt.pl (revision 28358)
@@ -56,4 +56,8 @@
{
&printUsage('Error! Not a directory: ' . $dir);
+ }
+ if ($dir =~ /(.*)[\\\/]$/)
+ {
+ $dir = $1;
}
&searchForTimingCSV($dir);
@@ -284,12 +288,12 @@
print HTMLOUT "
Fastest File: | " . &renderTime($fastest_file) . " | \n";
print HTMLOUT " Slowest File: | " . &renderTime($slowest_file) . " | \n";
- if ($data_locality > 0)
- {
+ #if ($data_locality > 0)
+ #{
print HTMLOUT " Data Locality: | " . sprintf('%d%% [%d out of %d]', (($data_locality / $file_count) * 100), $data_locality, $file_count) . " | \n";
- }
- else
- {
- print HTMLOUT " Data Locality: | Not Applicable | \n";
- }
+ #}
+ #else
+ #{
+ # print HTMLOUT " Data Locality: | Not Applicable | \n";
+ #}
print HTMLOUT "\n";
@@ -303,5 +307,5 @@
{
my $data = $timing_data->{$worker_id};
- print HTMLOUT renderLine($chart_width, $timing_data->{'M'}->{'S'}, $timing_data->{'M'}->{'E'}, 'worker', $worker_id . ' [' . $data->{'N'} . ']', $data->{'S'}, $data->{'E'}, $data->{'F'}, $data_locality);
+ print HTMLOUT renderLine($chart_width, $timing_data->{'M'}->{'S'}, $timing_data->{'M'}->{'E'}, 'worker', $worker_id . ' [' . $data->{'N'} . ']', $data->{'S'}, $data->{'E'}, $data->{'F'}, 2); #$data_locality);
}
}
@@ -407,5 +411,5 @@
{
my ($table_width, $start, $end, $class, $tname, $tstart, $tend, $jobs, $data_locality) = @_;
- &debugPrint("renderLine($table_width, $start, $end, $class, $tname, $tstart, $tend, )");
+ &debugPrint("renderLine($table_width, $start, $end, $class, $tname, $tstart, $tend, , $data_locality)");
# All timings need to be relative to 0 (relative start)
my $duration = $end - $start;
@@ -466,4 +470,5 @@
my $cpu_percent = int((($rpwidth / $jwidth) * 100) + 0.5);
$html .= '{$jstart}->{'DL'} . "\n";
if ($data_locality > 1 && $jobs->{$jstart}->{'DL'} != 1)
{