Changeset 28358

Show
Ignore:
Timestamp:
07.10.2013 10:04:32 (6 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gs2-extensions/parallel-building/trunk/src/bin/script/generate_gantt.pl

    r28189 r28358  
    5656  { 
    5757    &printUsage('Error! Not a directory: ' . $dir); 
     58  } 
     59  if ($dir =~ /(.*)[\\\/]$/) 
     60  { 
     61    $dir = $1; 
    5862  } 
    5963  &searchForTimingCSV($dir); 
     
    284288  print HTMLOUT "  <th>Fastest File:</th><td>" . &renderTime($fastest_file) . "</td>\n"; 
    285289  print HTMLOUT "  <th>Slowest File:</th><td>" . &renderTime($slowest_file) . "</td>\n"; 
    286   if ($data_locality > 0) 
    287   { 
     290  #if ($data_locality > 0) 
     291  #{ 
    288292    print HTMLOUT "  <th>Data Locality:</th><td>" . sprintf('%d%% [%d out of %d]', (($data_locality / $file_count) * 100), $data_locality, $file_count) . "</td>\n"; 
    289   } 
    290   else 
    291   { 
    292     print HTMLOUT "  <th>Data Locality:</th><td><i>Not Applicable</i></td>\n"; 
    293   } 
     293  #} 
     294  #else 
     295  #{ 
     296  #  print HTMLOUT "  <th>Data Locality:</th><td><i>Not Applicable</i></td>\n"; 
     297  #} 
    294298  print HTMLOUT "</tr>\n"; 
    295299 
     
    303307    { 
    304308      my $data = $timing_data->{$worker_id}; 
    305       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); 
     309      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); 
    306310    } 
    307311  } 
     
    407411{ 
    408412  my ($table_width, $start, $end, $class, $tname, $tstart, $tend, $jobs, $data_locality) = @_; 
    409   &debugPrint("renderLine($table_width, $start, $end, $class, $tname, $tstart, $tend, <jobs>)"); 
     413  &debugPrint("renderLine($table_width, $start, $end, $class, $tname, $tstart, $tend, <jobs>, $data_locality)"); 
    410414  # All timings need to be relative to 0 (relative start) 
    411415  my $duration = $end - $start; 
     
    466470    my $cpu_percent = int((($rpwidth / $jwidth) * 100) + 0.5); 
    467471    $html .= '<div class="job" style="left:' . $jleft . 'px;width:' . $jwidth . 'px;'; 
     472    print "Data Locality? " . $data_locality . " DL? " . $jobs->{$jstart}->{'DL'} . "\n"; 
    468473    if ($data_locality > 1 && $jobs->{$jstart}->{'DL'} != 1) 
    469474    {