Changes in directory nightlytest-serverside:

ProgramResults.php updated: 1.3 -> 1.4
---
Log message:

Fixed an issue where data table would not be displayed when graphing results


---
Diffs of the changes:  (+308 -318)

 ProgramResults.php |  626 ++++++++++++++++++++++++++---------------------------
 1 files changed, 308 insertions(+), 318 deletions(-)


Index: nightlytest-serverside/ProgramResults.php
diff -u nightlytest-serverside/ProgramResults.php:1.3 
nightlytest-serverside/ProgramResults.php:1.4
--- nightlytest-serverside/ProgramResults.php:1.3       Fri Jul  7 19:32:18 2006
+++ nightlytest-serverside/ProgramResults.php   Wed Aug  2 12:41:10 2006
@@ -3,8 +3,8 @@
 $DEBUG=0;
 
 if($DEBUG){
-       $mysql_link=mysql_connect("127.0.0.1","llvm","ll2002vm") or die("Could 
not connect to server $!\n");
-       mysql_select_db("nightlytestresults");
+  $mysql_link=mysql_connect("127.0.0.1","llvm","ll2002vm") or die("Could not 
connect to server $!\n");
+  mysql_select_db("nightlytestresults");
 }
 
 $medium_number=0;
@@ -21,9 +21,9 @@
 $crazy_decrease="#20FF20";
 
 $category_match=array("GCCAS","Bytecode","LLC\<br\>compile",
-                     "LLC-BETA\<br\>compile","JIT\<br\>codegen","GCC",
-                     "CBE","LLC","LLC-BETA","JIT","GCC\/\<br\>CBE",
-                     "GCC\/\<br\>LLC","GCC\/\<br\>LLC-BETA");
+          "LLC-BETA\<br\>compile","JIT\<br\>codegen","GCC",
+          "CBE","LLC","LLC-BETA","JIT","GCC\/\<br\>CBE",
+          "GCC\/\<br\>LLC","GCC\/\<br\>LLC-BETA");
 $category_array=array("GCCAS","Bytecode","LLC compile","LLC\-BETA compile",
                  "JIT codegen","GCC","CBE","LLC",
                  "LLC\-BETA","JIT","GCC\/\s*CBE", "GCC\/\s*LLC",
@@ -34,84 +34,84 @@
                  "GCC/ LLC-BETA","LLC/ LLC-BETA");
                  
 $category_print_array_description=array("GCCAS - Time to run LLVM optimizers 
on the<br>".
-                                                                               
"program.",
-                                                                               
                
-                                                                               
"Bytecode - The size of the bytecode for the<br>".
-                                                                               
"program.",
-                                                                               
                
-                                                                               
"LLC compile - The time taken to compile with LLC<br>".
-                                                                               
"(the static backend).",
-                                                                               
-                                                                               
"LLC-BETA compile - The time taken compile with LLC<br>".
-                                                                               
"using experimental features.",
-                                                                               
                
-                                                                               
"JIT codegen - The amount of time spent in the JIT<br>".
-                                                                               
"itself, as opposed to executing the program.",
-                                                                               
-                                                                               
"GCC - The time taken to execute the program when<br>".
-                                                                               
"compiled with GCC -O2.",
-                                                                               
-                                                                               
"CBE - The time taken to execute the program after<br>".
-                                                                               
"compilation through the C backend, compiled with<br>".
-                                                                               
"-O2.",
-                                                                               
                
-                                                                               
"LLC - The length of time the program generated by<br>".
-                                                                               
"the static backend LLC takes to execute.",
-                                                                               
-                                                                               
"LLC-BETA - How long the program generated by the<br>".
-                                                                               
"experimental static back end takes to execute.",
-                                                                               
                
-                                                                               
"JIT codegen - The amount of time spent in the JIT<br>".
-                                                                               
"itself, as opposed to executing the program.",
-                                                                               
                
-                                                                               
"GCC/CBE - The speed-up of the CBE output vs the<br>".
-                                                                               
"native GCC output: greater than 1 is a speedup,<br>".
-                                                                               
"less than 1 is a slowdown.",
-                                                                               
-                                                                               
"GCC/LLC - The speed-up of the LLC output vs the<br>".
-                                                                               
"native GCC output: greater than 1 is a speedup,<br>".
-                                                                               
"less than 1 is a slowdown.",
-                                                                               
-                                                                               
"GCC/ LLC-BETA - The speed-up of the LLC output<br>".
-                                                                               
"vs the native GCC output: greater than 1 is a<br>".
-                                                                               
"speedup, less than 1 is a slowdown.",
-                                                                               
-                                                                               
"LLC/ LLC-BETA - The speed-up of the LLC output<br>".
-                                                                               
"vs the LLV-BETA output: greater than 1 is a <br>".
-                                                                               
"speedup, less than 1 is a slowdown.");
+                    "program.",
+                        
+                    "Bytecode - The size of the bytecode for the<br>".
+                    "program.",
+                        
+                    "LLC compile - The time taken to compile with LLC<br>".
+                    "(the static backend).",
+                    
+                    "LLC-BETA compile - The time taken compile with LLC<br>".
+                    "using experimental features.",
+                        
+                    "JIT codegen - The amount of time spent in the JIT<br>".
+                    "itself, as opposed to executing the program.",
+                    
+                    "GCC - The time taken to execute the program when<br>".
+                    "compiled with GCC -O2.",
+                    
+                    "CBE - The time taken to execute the program after<br>".
+                    "compilation through the C backend, compiled with<br>".
+                    "-O2.",
+                        
+                    "LLC - The length of time the program generated by<br>".
+                    "the static backend LLC takes to execute.",
+                    
+                    "LLC-BETA - How long the program generated by the<br>".
+                    "experimental static back end takes to execute.",
+                        
+                    "JIT codegen - The amount of time spent in the JIT<br>".
+                    "itself, as opposed to executing the program.",
+                        
+                    "GCC/CBE - The speed-up of the CBE output vs the<br>".
+                    "native GCC output: greater than 1 is a speedup,<br>".
+                    "less than 1 is a slowdown.",
+                    
+                    "GCC/LLC - The speed-up of the LLC output vs the<br>".
+                    "native GCC output: greater than 1 is a speedup,<br>".
+                    "less than 1 is a slowdown.",
+                    
+                    "GCC/ LLC-BETA - The speed-up of the LLC output<br>".
+                    "vs the native GCC output: greater than 1 is a<br>".
+                    "speedup, less than 1 is a slowdown.",
+                    
+                    "LLC/ LLC-BETA - The speed-up of the LLC output<br>".
+                    "vs the LLV-BETA output: greater than 1 is a <br>".
+                    "speedup, less than 1 is a slowdown.");
                  
 $category_print_array_ordered=array("CBE","LLC","JIT","GCCAS",
-               "Bytecode","LLC compile","LLC-BETA compile",
+    "Bytecode","LLC compile","LLC-BETA compile",
                 "JIT codegen", "LLC-BETA");
                 
 $category_print_array_ordered_description=array("CBE - The time taken to 
execute the program after<br>".
-                                                                               
                "compilation through the C backend, compiled with<br>".
-                                                                               
                "-O2.",
-                                                                               
                
-                                                                               
                "LLC - The length of time the program generated by<br>".
-                                                                               
                "the static backend LLC takes to execute.",
-                                                                               
                
-                                                                               
                "JIT - The amount of time spent running the program<br>".
-                                                                               
                "with the JIT; this includes the code generation<br>".
-                                                                               
                "phase and actually running the program.",
-                                                                               
                
-                                                                               
                "GCCAS - Time to run LLVM optimizers on the<br>".
-                                                                               
                "program.",
-                                                                               
                
-                                                                               
                "Bytecode - The size of the bytecode for the<br>".
-                                                                               
                "program.",
-                                                                               
                
-                                                                               
                "LLC compile - The time taken to compile with LLC<br>".
-                                                                               
                "(the static backend).",
-                                                                               
                
-                                                                               
                "LLC-BETA compile - The time taken compile with LLC<br>".
-                                                                               
                "using experimental features.",
-                                                                               
                
-                                                                               
                "JIT codegen - The amount of time spent in the JIT<br>".
-                                                                               
                "itself, as opposed to executing the program.",
-                                                                               
                
-                                                                               
                "LLC-BETA - How long the program generated by the<br>".
-                                                                               
                "experimental static back end takes to execute.");    
+                        "compilation through the C backend, compiled with<br>".
+                        "-O2.",
+                        
+                        "LLC - The length of time the program generated 
by<br>".
+                        "the static backend LLC takes to execute.",
+                        
+                        "JIT - The amount of time spent running the 
program<br>".
+                        "with the JIT; this includes the code generation<br>".
+                        "phase and actually running the program.",
+                        
+                        "GCCAS - Time to run LLVM optimizers on the<br>".
+                        "program.",
+                        
+                        "Bytecode - The size of the bytecode for the<br>".
+                        "program.",
+                        
+                        "LLC compile - The time taken to compile with LLC<br>".
+                        "(the static backend).",
+                        
+                        "LLC-BETA compile - The time taken compile with 
LLC<br>".
+                        "using experimental features.",
+                        
+                        "JIT codegen - The amount of time spent in the 
JIT<br>".
+                        "itself, as opposed to executing the program.",
+                        
+                        "LLC-BETA - How long the program generated by the<br>".
+                        "experimental static back end takes to execute.");    
             
 
 
@@ -123,30 +123,30 @@
  *
  */
 function GetDayResults($night_id, $array_of_measures, $mysql_link){
-       $result=array();
-       #print "SELECT * FROM program WHERE night=$night_id ORDER BY program 
ASC<br>\n";
-       $program_query = mysql_query("SELECT * FROM program WHERE 
night=$night_id ORDER BY program ASC") or die (mysql_error());
-       while($row = mysql_fetch_array($program_query)){
-               $result["{$row['program']}"]=array();
-               array_push($result["{$row['program']}"], "{$row['type']}");
-               $index=0;
-               $data = $row['result'];
-               $data = str_replace("<br>", " ", $data);
-               foreach ($array_of_measures as $x){
-                       $value=array();
-                       $reg_exp="/$x:\s*([[0-9\.]+|\*|\-|n\/a|\?],)/";
-                       preg_match($reg_exp, $data, $value);
-                       if(isset($value[1])){
-                               array_push($result["{$row['program']}"], 
$value[1]);
-                       }
-                       else{
-                               array_push($result["{$row['program']}"], "-");  
-                       }
-                       $index++;
-               }//end foreach
-       }//end while
-       mysql_free_result($program_query);
-       return $result;
+  $result=array();
+  #print "SELECT * FROM program WHERE night=$night_id ORDER BY program 
ASC<br>\n";
+  $program_query = mysql_query("SELECT * FROM program WHERE night=$night_id 
ORDER BY program ASC") or die (mysql_error());
+  while($row = mysql_fetch_array($program_query)){
+    $result["{$row['program']}"]=array();
+    array_push($result["{$row['program']}"], "{$row['type']}");
+    $index=0;
+    $data = $row['result'];
+    $data = str_replace("<br>", " ", $data);
+    foreach ($array_of_measures as $x){
+      $value=array();
+                  $reg_exp="/$x:\s*([[0-9\.]+|\*|\-|n\/a|\?],)/";
+                  preg_match($reg_exp, $data, $value);
+      if(isset($value[1])){
+        array_push($result["{$row['program']}"], $value[1]);
+      }
+                  else{
+                          array_push($result["{$row['program']}"], "-");  
+      }
+      $index++;
+    }//end foreach
+  }//end while
+  mysql_free_result($program_query);
+  return $result;
 }//end function GetDayResults
 
 /*
@@ -155,78 +155,78 @@
  *
  */
 function CalculateChangeBetweenDays($yesterday_results, $today_results, 
$min_diff=2){
-       $result=array();
-       $medium_change=0;
-       $large_change=0;
-       $crazy_change=0;
-       foreach ( array_keys($today_results) as $x){
-               $result["$x"]=array();
-               array_push($result["$x"], "{$today_results["$x"][0]}");
-               for($y=1; $y<sizeof($today_results["$x"])-3; $y++){
-                       if(isset($yesterday_results["$x"][$y]) && 
$yesterday_results["$x"][$y]!=0){
-                               $delta=0;
-                               #$delta = round($today_results["$x"][$y] - 
$yesterday_results["$x"][$y],2);
-                               $delta = $today_results["$x"][$y] - 
$yesterday_results["$x"][$y];
-                               if(($delta > $min_diff || $delta < 
(-1*$min_diff)) &&
-                                   $today_results["$x"][$y]!=0 &&
-                                   $yesterday_results["$x"][$y]!=0){
-                                       
$result["$x"][$y-1]=(($today_results["$x"][$y] - 
$yesterday_results["$x"][$y])/$yesterday_results["$x"][$y])*100;
-                               }
-                               else{
-                                       $result["$x"][$y-1]="n/a";
-                               }
-                       }
-                       else{
-                               $result["$x"][$y-1]="n/a";
-                       }
-                       if($result["$x"][$y-1]>=$GLOBALS['medium_change']){
-                               $GLOBALS['medium_number']++;                    
        
-                       }
-                       if($result["$x"][$y-1]>=$GLOBALS['large_change']){
-                               $GLOBALS['large_number']++;
-                       }
-                       if($result["$x"][$y-1]>=$GLOBALS['crazy_change']){
-                               $GLOBALS['crazy_number']++;
-                       }
-               }//end for                              
-       }//end foreach
-       return $result;
+  $result=array();
+  $medium_change=0;
+  $large_change=0;
+  $crazy_change=0;
+  foreach ( array_keys($today_results) as $x){
+    $result["$x"]=array();
+    array_push($result["$x"], "{$today_results["$x"][0]}");
+    for($y=1; $y<sizeof($today_results["$x"])-3; $y++){
+      if(isset($yesterday_results["$x"][$y]) && 
$yesterday_results["$x"][$y]!=0){
+        $delta=0;
+        #$delta = round($today_results["$x"][$y] - 
$yesterday_results["$x"][$y],2);
+        $delta = $today_results["$x"][$y] - $yesterday_results["$x"][$y];
+        if(($delta > $min_diff || $delta < (-1*$min_diff)) &&
+            $today_results["$x"][$y]!=0 &&
+            $yesterday_results["$x"][$y]!=0){
+          $result["$x"][$y-1]=(($today_results["$x"][$y] - 
$yesterday_results["$x"][$y])/$yesterday_results["$x"][$y])*100;
+        }
+        else{
+          $result["$x"][$y-1]="n/a";
+        }
+      }
+      else{
+        $result["$x"][$y-1]="n/a";
+      }
+      if($result["$x"][$y-1]>=$GLOBALS['medium_change']){
+        $GLOBALS['medium_number']++;        
+      }
+      if($result["$x"][$y-1]>=$GLOBALS['large_change']){
+        $GLOBALS['large_number']++;
+      }
+      if($result["$x"][$y-1]>=$GLOBALS['crazy_change']){
+        $GLOBALS['crazy_number']++;
+      }
+    }//end for        
+  }//end foreach
+  return $result;
 }//end function
 
 
 function CountSignifigantDifferences($percent_difference_arr, $measure_index, 
$delta){
-       $result=0;
-       foreach( array_keys($percent_difference_arr) as $x ){
-               if($percent_difference_arr["$x"][$measure_index]>=$delta ||
-                  $percent_difference_arr["$x"][$measure_index]<=(-1*$delta)){
-                       $result++;
-               }       
-       }
-       return $result;
+  $result=0;
+  foreach( array_keys($percent_difference_arr) as $x ){
+    if($percent_difference_arr["$x"][$measure_index]>=$delta ||
+       $percent_difference_arr["$x"][$measure_index]<=(-1*$delta)){
+      $result++;
+    }  
+  }
+  return $result;
 }
 
-function DetermineColor($number, $def_color="white"){  
-       $result=$def_color;
-       if($number>=$GLOBALS['crazy_change']){
-               $result=$GLOBALS['crazy_increase'];
-       }
-       else if($number>=$GLOBALS['large_change']){
-               $result=$GLOBALS['large_increase'];
-       }
-       else if($number>=$GLOBALS['medium_change']){
-               $result=$GLOBALS['medium_increase'];
-       }
-       else if($number<=($GLOBALS['crazy_change']*-1)){
-               $result=$GLOBALS['crazy_decrease'];
-       }
-       else if($number<=($GLOBALS['large_change']*-1)){
-               $result=$GLOBALS['large_decrease'];
-       }
-       else if($number<=($GLOBALS['medium_change']*-1)){
-               $result=$GLOBALS['medium_decrease'];
-       }
-       return $result;
-       
+function DetermineColor($number, $def_color="white"){  
+  $result=$def_color;
+  if($number>=$GLOBALS['crazy_change']){
+    $result=$GLOBALS['crazy_increase'];
+  }
+  else if($number>=$GLOBALS['large_change']){
+    $result=$GLOBALS['large_increase'];
+  }
+  else if($number>=$GLOBALS['medium_change']){
+    $result=$GLOBALS['medium_increase'];
+  }
+  else if($number<=($GLOBALS['crazy_change']*-1)){
+    $result=$GLOBALS['crazy_decrease'];
+  }
+  else if($number<=($GLOBALS['large_change']*-1)){
+    $result=$GLOBALS['large_decrease'];
+  }
+  else if($number<=($GLOBALS['medium_change']*-1)){
+    $result=$GLOBALS['medium_decrease'];
+  }
+  return $result;
+  
 }
 
 /*
@@ -236,15 +236,15 @@
  *
  */
 function getSignifigantChanges($day, $prev_day, $diff, $measure){
-       $result=array();
-       foreach(array_keys($diff) as $program){
-               for($x=0; $x<sizeof($diff["$program"]); $x++){
-                       if($diff["$program"][$x]>$GLOBALS['medium_change']){
-                               array_push($result, array($program, 
$measure[$x], $day["$program"][0], round($diff["$program"][$x],2), 
$prev_day["$program"][$x+1], $day["$program"][$x+1]));   
-                       }
-               }//end for
-       }//end foreach
-       return $result;
+  $result=array();
+  foreach(array_keys($diff) as $program){
+    for($x=0; $x<sizeof($diff["$program"]); $x++){
+      if($diff["$program"][$x]>$GLOBALS['medium_change']){
+        array_push($result, array($program, $measure[$x], $day["$program"][0], 
round($diff["$program"][$x],2), $prev_day["$program"][$x+1], 
$day["$program"][$x+1]));   
+      }
+    }//end for
+  }//end foreach
+  return $result;
 }//end function
 
 /*
@@ -255,24 +255,24 @@
  *
  */
 function getTwoDaySignifigantChanges($day, $prev_day, $diff, $measure){
-       $result=array();
-       foreach(array_keys($diff) as $program){
-               for($x=0; $x<sizeof($diff["$program"]); $x++){
-                       if(strcmp($diff["$program"][$x],"-")!=0 && 
-                          ($diff["$program"][$x]>$GLOBALS['medium_change'] ||
-                           $diff["$program"][$x]<(-1 * 
$GLOBALS['medium_change']))){
-                               array_push($result, 
-                                          array($program, 
-                                          $measure[$x], 
-                                          $day["$program"][0], 
-                                          round($diff["$program"][$x],2), 
-                                          "n/a", 
-                                          $prev_day["$program"][$x+1], 
-                                          $day["$program"][$x+1]));   
-                       }
-               }//end for
-       }//end foreach
-       return $result;
+  $result=array();
+  foreach(array_keys($diff) as $program){
+    for($x=0; $x<sizeof($diff["$program"]); $x++){
+      if(strcmp($diff["$program"][$x],"-")!=0 && 
+         ($diff["$program"][$x]>$GLOBALS['medium_change'] ||
+          $diff["$program"][$x]<(-1 * $GLOBALS['medium_change']))){
+        array_push($result, 
+             array($program, 
+               $measure[$x], 
+             $day["$program"][0], 
+             round($diff["$program"][$x],2), 
+             "n/a", 
+             $prev_day["$program"][$x+1], 
+                         $day["$program"][$x+1]));   
+      }
+    }//end for
+  }//end foreach
+  return $result;
 }//end function
 
 /*
@@ -283,24 +283,24 @@
  *
  */
 function getThreeDaySignifigantChanges($day, $prev_day, $old_day, $diff, 
$twoday_diff, $measure){
-       $result=array();
-       foreach(array_keys($diff) as $program){
-               for($x=0; $x<sizeof($diff["$program"]); $x++){
-                       if(strcmp($diff["$program"][$x],"-")!=0 && 
-                          ($diff["$program"][$x]>$GLOBALS['medium_change'] ||
-                           $diff["$program"][$x]<(-1 * 
$GLOBALS['medium_change']))){
-                               array_push($result, 
-                                          array($program, 
-                                          $measure[$x], 
-                                          $day["$program"][0], 
-                                          round($diff["$program"][$x],2), 
-                                          
round($twoday_diff["$program"][$x],2), 
-                                          $prev_day["$program"][$x+1], 
-                                          $day["$program"][$x+1]));   
-                       }
-               }//end for
-       }//end foreach
-       return $result;
+  $result=array();
+  foreach(array_keys($diff) as $program){
+    for($x=0; $x<sizeof($diff["$program"]); $x++){
+      if(strcmp($diff["$program"][$x],"-")!=0 && 
+         ($diff["$program"][$x]>$GLOBALS['medium_change'] ||
+          $diff["$program"][$x]<(-1 * $GLOBALS['medium_change']))){
+        array_push($result, 
+             array($program, 
+               $measure[$x], 
+             $day["$program"][0], 
+             round($diff["$program"][$x],2), 
+             round($twoday_diff["$program"][$x],2), 
+             $prev_day["$program"][$x+1], 
+                         $day["$program"][$x+1]));   
+      }
+    }//end for
+  }//end foreach
+  return $result;
 }//end function
 
 /*
@@ -309,11 +309,11 @@
  *
  */
 function sortSignifigantChangeArray($changes, $index){
-       $temp_arr=array();
-       foreach (array_keys($changes) as $prog){
-               array_push($temp_arr, $changes["$prog"][$index]);
-       }
-       array_multisort($temp_arr, SORT_DESC, SORT_REGULAR, $changes, 
SORT_DESC, SORT_REGULAR);
+  $temp_arr=array();
+  foreach (array_keys($changes) as $prog){
+    array_push($temp_arr, $changes["$prog"][$index]);
+  }
+  array_multisort($temp_arr, SORT_DESC, SORT_REGULAR, $changes, SORT_DESC, 
SORT_REGULAR);
 }
 
 
@@ -326,128 +326,118 @@
  * program[n]) for all the data between the two dates
  */
 function buildResultsHistory($machine_id, $programs, $measure, $mysql_link, 
$start="2000-01-01 01:01:01", $end="2020-01-01 01:01:01"){
-       $preg_measure = str_replace("/","\/", $measure);
-       $results_arr=array();
-       $night_table_statement = "SELECT * FROM night WHERE machine=$machine_id 
". 
-       "AND added >= \"$start\" AND added <= \"$end\" ORDER BY added DESC";
-       $night_table_query = mysql_query($night_table_statement, $mysql_link) 
or die(mysql_error());
-       $night_arr=array();
-       $night_query="(";
-       while($row = mysql_fetch_array($night_table_query)){
-               $night_arr["{$row['id']}"]=$row['added'];
-               $results_arr["{$row['added']}"]=array();
-               
preg_match("/(\d\d\d\d)\-(\d\d)\-(\d\d)\s(\d\d)\:(\d\d)\:(\d\d)/", 
"{$row['added']}", $pjs);
+  $preg_measure = str_replace("/","\/", $measure);
+  $results_arr=array();
+  $night_table_statement = "SELECT id, added FROM night WHERE 
machine=$machine_id ". 
+  "AND added >= \"$start\" AND added <= \"$end\" ORDER BY added DESC";
+  $night_table_query = mysql_query($night_table_statement, $mysql_link) or 
die(mysql_error());
+  $night_arr=array();
+  $night_query="(";
+  while($row = mysql_fetch_array($night_table_query)){
+          $night_arr["{$row['id']}"]=$row['added'];
+    $results_arr["{$row['added']}"]=array();
+    preg_match("/(\d\d\d\d)\-(\d\d)\-(\d\d)\s(\d\d)\:(\d\d)\:(\d\d)/", 
"{$row['added']}", $pjs);
                 $seconds = mktime($pjs[4], $pjs[5], $pjs[6], $pjs[2], 
$pjs[3],$pjs[1]);
-               array_push($results_arr["{$row['added']}"], $seconds);
-               $night_query.=" night={$row['id']} or";
-       }
-       $night_query.=" night=0 )";
-       mysql_free_result($night_table_query);
-
-       $RELEVANT_DATA=0; //will be 0 if all data is null, else will be 1
-       $prog_index=1;
-       foreach ($programs as $prog){
-               $prog=str_replace(" ", "+", $prog);
-               $program_table_statement="SELECT * FROM program WHERE 
program=\"$prog\" ".
-               "and $night_query order by night asc";
-               $night_table_query=mysql_query($program_table_statement) or 
die(mysql_error());
-               while($row=mysql_fetch_array($night_table_query)){
-                       $night_id=$row['night'];
-                       $data="-";
-                       $regexp = "/$preg_measure:\s*([0-9\.]+|\?)/";
-                       preg_match($regexp, "{$row['result']}", $ans);
-                       if(isset($ans[1])){
-                               $data=$ans[1];
-                               $RELEVANT_DATA++;
-                       }//end if isset
-                       
$results_arr["{$night_arr["$night_id"]}"]["$prog_index"]=$data;
-                       
-               }//end while
-               mysql_free_result($night_table_query);
-       $prog_index++;
-       }//end foreach $programs
-
-/*     $normalize=0;
-       if($normalize){
-                for($i=0; $i<sizeof($values); $i++){
-                        if(is_numeric($values[$i])){
-                                $values[$i]=$values[$i]/$data_max;
-                        }#end if
-                }#end for
-        }#end if
-*/     
-       
-       if($RELEVANT_DATA>0){
-               return $results_arr;
-       }
-       else{
-               return array();
-       }
+    array_push($results_arr["{$row['added']}"], $seconds);
+    $night_query.=" night={$row['id']} or";
+  }
+  $night_query.=" night=0 )";
+  mysql_free_result($night_table_query);
+
+  $RELEVANT_DATA=0; //will be 0 if all data is null, else will be 1
+  $prog_index=1;
+  foreach ($programs as $prog){
+    $prog=str_replace(" ", "+", $prog);
+    $program_table_statement="SELECT * FROM program WHERE program=\"$prog\" ".
+    "and $night_query order by night asc";
+    $night_table_query=mysql_query($program_table_statement) or 
die(mysql_error());
+    while($row=mysql_fetch_array($night_table_query)){
+      $row['result'] = str_replace("<br>", " ", "{$row['result']}");
+      $night_id=$row['night'];
+      $data="-";
+      $regexp = "/$preg_measure:\s*([0-9\.]+|\?)/";
+      preg_match($regexp, "{$row['result']}", $ans);
+      if(isset($ans[1])){
+        $data=$ans[1];
+        $RELEVANT_DATA++;
+      }//end if isset
+      $results_arr["{$night_arr["$night_id"]}"]["$prog_index"]=$data;
+    }//end while
+    mysql_free_result($night_table_query);
+    $prog_index++;
+  }//end foreach $programs
+
+  if($RELEVANT_DATA>0){
+    return $results_arr;
+  }
+  else{
+    return array();
+  }
 }
 
 
 
/*$programs=array("Benchmarks/CoyoteBench/huffbench","Benchmarks/CoyoteBench/lpbench");
 $history = buildResultsHistory(18, $programs,"GCCAS",$mysql_link);
 foreach (array_keys($history) as $date){
-       print "$date => ";
-       foreach($history["$date"] as $data){
-               print "$data, ";
-       }
-       print "<br>\n";
+  print "$date => ";
+  foreach($history["$date"] as $data){
+    print "$data, ";
+  }
+  print "<br>\n";
 }*/
 
 if($DEBUG){
-       $today_results = GetDayResults(565, $category_array, $mysql_link);
-       $yesterday_results = GetDayResults(564, $category_array, $mysql_link);
-       $oldday_results = GetDayResults(563, $category_array, $mysql_link);
-       $percent_difference = CalculateChangeBetweenDays($yesterday_results, 
$today_results, .2);
-       $twoday_difference = CalculateChangeBetweenDays($oldday_results, 
$today_results, .01);
-       $count = CountSignifigantDifferences($percent_difference, 1, 25);
-       $big_changes = getThreeDaySignifigantChanges($today_results, 
$yesterday_results, $oldday_results, $percent_difference, $twoday_difference, 
$category_print_array);
+  $today_results = GetDayResults(565, $category_array, $mysql_link);
+  $yesterday_results = GetDayResults(564, $category_array, $mysql_link);
+  $oldday_results = GetDayResults(563, $category_array, $mysql_link);
+  $percent_difference = CalculateChangeBetweenDays($yesterday_results, 
$today_results, .2);
+  $twoday_difference = CalculateChangeBetweenDays($oldday_results, 
$today_results, .01);
+  $count = CountSignifigantDifferences($percent_difference, 1, 25);
+  $big_changes = getThreeDaySignifigantChanges($today_results, 
$yesterday_results, $oldday_results, $percent_difference, $twoday_difference, 
$category_print_array);
 }
 
 /*foreach ( array_keys($big_changes) as $x){
-       print "$x => ";
-       foreach ($big_changes["$x"] as $y){
-               print "$y, ";
-       }
-       print "<br>\n";
+  print "$x => ";
+  foreach ($big_changes["$x"] as $y){
+    print "$y, ";
+  }
+  print "<br>\n";
 }*/
 
 /*foreach ( array_keys($percent_difference) as $x){
-       print "$x => ";
-       foreach ($percent_difference["$x"] as $y){
-               print "$y, ";
-       }
-       print "<br>\n";
+  print "$x => ";
+  foreach ($percent_difference["$x"] as $y){
+    print "$y, ";
+  }
+  print "<br>\n";
 }*/
 
 
 
 
 if($DEBUG){
-       print "<script type=\"text/javascript\" 
src=\"sorttable.js\"></script>\n";
-       print "<table class=\"sortable\" id=\"multisource_tests\" border='1' 
cellspacing='0' cellpadding='0'>\n";
-       print "\t<tr bgcolor=#FFCC99>\n";
-       print "\t\t<th>index</th>\n";
-       print "\t\t<th>Program</th>\n";
-       print "\t\t<th>Measurement</th>\n";
-       print "\t\t<th>type</th>\n";
-       print "\t\t<th>% Change from yesterday</th>\n";
-       print "\t\t<th>% Change from two days ago</th>\n";
-       print "\t\t<th>Previous day's test value</th>\n";
-       print "\t\t<th>Current day's test value</th>\n";
-       print "\t</tr>\n";
-       print "\t<tr> <td></td> <td></td> <td></td> <td></td> <td></td> 
<td></td> <td></td> <td></td> </tr>\n";
-       foreach ( array_keys($big_changes) as $x){
-               print "\t<tr>";
-               print "<td>$x</td>";
-               foreach ($big_changes["$x"] as $y){
-                       print "<td>$y</td>";
-               }
-               print "</tr>\n";
-       }
-       print "</table>";
+  print "<script type=\"text/javascript\" src=\"sorttable.js\"></script>\n";
+  print "<table class=\"sortable\" id=\"multisource_tests\" border='1' 
cellspacing='0' cellpadding='0'>\n";
+  print "\t<tr bgcolor=#FFCC99>\n";
+  print "\t\t<th>index</th>\n";
+  print "\t\t<th>Program</th>\n";
+  print "\t\t<th>Measurement</th>\n";
+  print "\t\t<th>type</th>\n";
+  print "\t\t<th>% Change from yesterday</th>\n";
+  print "\t\t<th>% Change from two days ago</th>\n";
+  print "\t\t<th>Previous day's test value</th>\n";
+  print "\t\t<th>Current day's test value</th>\n";
+  print "\t</tr>\n";
+  print "\t<tr> <td></td> <td></td> <td></td> <td></td> <td></td> <td></td> 
<td></td> <td></td> </tr>\n";
+  foreach ( array_keys($big_changes) as $x){
+    print "\t<tr>";
+    print "<td>$x</td>";
+    foreach ($big_changes["$x"] as $y){
+      print "<td>$y</td>";
+    }
+    print "</tr>\n";
+  }
+  print "</table>";
 }
 
 



_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits

Reply via email to