Changeset 28358 for gs2-extensions

Timestamp:

2013-10-07T10:04:32+13:00 (11 years ago)

Author:

jmt12

Message:

Replacing my earlier decision to only have data locality information printed if dl count was greater than 1 with always displaying data locality information (even for machines it doesn't make sense like Karearea) as otherwise my experiments with a forced 0 dl don't render properly.

File:

• gs2-extensions/parallel-building/trunk/src/bin/script/generate_gantt.pl (modified) (5 diffs)

gs2-extensions/parallel-building/trunk/src/bin/script/generate_gantt.pl

@@ -56 +56 @@
   {
     &printUsage('Error! Not a directory: ' . $dir);
+  }
+  if ($dir =~ /(.*)[\\\/]$/)
+  {
+    $dir = $1;
   }
   &searchForTimingCSV($dir);
@@ -284 +288 @@
   print HTMLOUT "  <th>Fastest File:</th><td>" . &renderTime($fastest_file) . "</td>\n";
   print HTMLOUT "  <th>Slowest File:</th><td>" . &renderTime($slowest_file) . "</td>\n";
-  if ($data_locality > 0)
-  {
+  #if ($data_locality > 0)
+  #{
     print HTMLOUT "  <th>Data Locality:</th><td>" . sprintf('%d%% [%d out of %d]', (($data_locality / $file_count) * 100), $data_locality, $file_count) . "</td>\n";
-  }
-  else
-  {
-    print HTMLOUT "  <th>Data Locality:</th><td><i>Not Applicable</i></td>\n";
-  }
+  #}
+  #else
+  #{
+  #  print HTMLOUT "  <th>Data Locality:</th><td><i>Not Applicable</i></td>\n";
+  #}
   print HTMLOUT "</tr>\n";
 
@@ -303 +307 @@
     {
       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 +411 @@
 {
   my ($table_width, $start, $end, $class, $tname, $tstart, $tend, $jobs, $data_locality) = @_;
-  &debugPrint("renderLine($table_width, $start, $end, $class, $tname, $tstart, $tend, <jobs>)");
+  &debugPrint("renderLine($table_width, $start, $end, $class, $tname, $tstart, $tend, <jobs>, $data_locality)");
   # All timings need to be relative to 0 (relative start)
   my $duration = $end - $start;
@@ -466 +470 @@
     my $cpu_percent = int((($rpwidth / $jwidth) * 100) + 0.5);
     $html .= '<div class="job" style="left:' . $jleft . 'px;width:' . $jwidth . 'px;';
+    print "Data Locality? " . $data_locality . " DL? " . $jobs->{$jstart}->{'DL'} . "\n";
     if ($data_locality > 1 && $jobs->{$jstart}->{'DL'} != 1)
     {