Changeset 27559 for gs2-extensions

Timestamp:

2013-06-06T11:15:28+12:00 (11 years ago)

Author:

jmt12

Message:

Changed mime-type away from binary - I hope. Meanwhile, generate improvements to maths to reduce rounding errors, and also to allow multiple tasks to occur at once (a possibility under the more ambiguous Hadoop parallel processing)

File:

• gs2-extensions/parallel-building/trunk/src/bin/script/generate_gantt.pl (modified) (7 diffs, 1 prop)

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

@@ -60 +60 @@
       my $stop = $parts[4];
       my $filepath = $parts[8];
+      $filepath =~ s/^\s+|\s+$//g;
       $import_dir = &longestCommonPath($filepath, $import_dir);
       $timing_data->{$worker_id}->{'F'}->{$parts[3]} = {'FN'=>$filepath, 'PS'=>($stop - $parts[5]), 'PE'=>$stop, 'E'=>$stop};
@@ -82 +83 @@
 print HTMLOUT 'div.worker {border:1px solid black;background-color:green;color:white;font-weight:bold}' . "\n";
 print HTMLOUT 'div.time {font-size:smaller;font-weight:normal}' . "\n";
-print HTMLOUT 'div.job {background-color:transparent;color:black;border:1px solid black;display:block;font-size:smaller;position:relative;text-align:center}' . "\n";
+print HTMLOUT 'div.job {background-color:transparent;color:black;border:1px solid black;display:block;font-size:smaller;position:relative;text-align:center;overflow:hidden}' . "\n";
 print HTMLOUT 'span.process {z-index:-1;background-color:#C7C7C7;position:absolute}' . "\n";
+print HTMLOUT 'span.label {z-index:1;background-color:transparent;overflow:hidden;white-space:nowrap;}' . "\n";
 print HTMLOUT "th {text-align:left}\n";
 print HTMLOUT '</style>' . "\n";
@@ -132 +134 @@
       }
       # Shorten filename
-      $timing_data->{$worker_id}->{'F'}->{$job_start}->{'FN'} = substr($timing_data->{$worker_id}->{'F'}->{$job_start}->{'FN'}, length($import_dir) + 1);
+      if (defined $timing_data->{$worker_id}->{'F'}->{$job_start}->{'FN'})
+      {
+        $timing_data->{$worker_id}->{'F'}->{$job_start}->{'FN'} = substr($timing_data->{$worker_id}->{'F'}->{$job_start}->{'FN'}, length($import_dir) + 1);
+      }
       $file_count++;
     }
@@ -265 +270 @@
   # - subtract any left offset from width
   $width = $width - $left;
-  # - right offset directly subtracted from width 
+  # - right offset directly subtracted from width
   if ($end != $tend)
   {
@@ -272 +277 @@
     $width = $width - $right;
   }
+  # Round things off (simple dutch rounding)
+  $left = int($left + 0.5);
+  $width = int($width + 0.5);
+  # Output the bar for this master/worker
   my $html = '<div class="thread ' . $class . '" style="left:' . $left . 'px;width:' . $width . 'px;">';
   if ($class eq 'master')
@@ -288 +297 @@
     # Scale Job co-ordinates
     my $jleft_percent = $rjstart / $duration;
-    my $jleft = floor($jleft_percent * $table_width);
+    my $jleft = int(($jleft_percent * $table_width) + 0.5);
     my $jwidth_percent = $jduration / $duration;
-    my $jwidth = floor($jwidth_percent * $table_width);
-    if ($jleft < $previous_jright)
-    {
-      $jleft = $previous_jright;
-    } 
+    my $jwidth = int(($jwidth_percent * $table_width) + 0.5);
     if ($jleft + $jwidth > $left + $width)
     {
@@ -301 +306 @@
     # Then scale process timings within that!
     my $rpleft_percent = ($rpstart - $rjstart) / $duration;
-    my $rpleft = floor($rpleft_percent * $table_width);
-    my $rpwidth_percent = ($rpend - $rpstart) / $duration;
-    my $rpwidth = floor($rpwidth_percent * $table_width);
-    $html .= '<div class="job" style="left:' . $jleft . 'px;width:' . $jwidth . 'px" title="S:' . renderTime($rjstart) . ', PS:' . renderTime($rpstart) . ', PE:' . renderTime($rpend) . ', E:' . renderTime($rjend) . '"><span class="process" style="left:' . $rpleft . 'px;width:' . $rpwidth . 'px">&nbsp;</span><span style="background-color:transparent;z-index:1">' . $jobs->{$jstart}->{'FN'} . '</span></div>';
-    $previous_jright = $jleft + $jwidth;
+    my $rpleft = int(($rpleft_percent * $table_width) + 0.5);
+    my $rpwidth = $jwidth - $rpleft;
+    my $cpu_percent = int((($rpwidth / $jwidth) * 100) + 0.5);
+    $html .= '<div class="job" style="left:' . $jleft . 'px;width:' . $jwidth . 'px" title="FN:' . $jobs->{$jstart}->{'FN'} . ', S:' . renderTime($rjstart) . ', E:' . renderTime($rjend) . ', CPU: ' . $cpu_percent . '%"><span class="process" style="left:' . $rpleft . 'px;width:' . $rpwidth . 'px">&nbsp;</span><span class="label">' . $jobs->{$jstart}->{'FN'} . '</span></div>';
   }
   return $html;