Fixes with multiple results

myaaghubi · myaaghubi · commit e2c81ebc1888 · 2023-08-11T22:18:34.000+03:30
diff --git a/index.php b/index.php
@@ -4,24 +4,49 @@
 <head>
     <meta charset="UTF-8">
     <title>PHP Frameworks Bench</title>
+</head>
+
+<body style="max-width: 1200px; margin:0 auto; padding: 15px 30px">
+    <h1>PHP Frameworks Bench</h1>
+
     <script>
         <?php
+        ini_set('display_errors', '1');
+        ini_set('display_startup_errors', '1');
+        error_reporting(E_ALL);
+
+        $target = $_GET['t'] ?? null;
+
         $dataLabels = [];
         $dataRPS = [];
         $dataMemory = [];
         $dataTime = [];
         $dataFile = [];
 
+        $dataCompRPS = [];
+        $dataCompMemory = [];
+
+        $data = [];
+
         $resultsDirs = glob("./output/*", GLOB_ONLYDIR);
 
         rsort($resultsDirs);
-        
-        $resultsDir = @$resultsDirs[0].'/results.log';
+
+        $resultsDir = @$resultsDirs[0] ;
+
+        if ($target!==null && file_exists('./output/' . $target)) {
+            $resultsDir = './output/' . $target;
+        }
+
+        $resultsDatetime = "";
+        if (preg_match("/output\/(\S+)/", @$resultsDir, $match)) {
+            $resultsDatetime = @$match[1];
+        }
 
         if (file_exists($resultsDir)) {
             Parse_Results: {
                 require __DIR__ . '/libs/parse_results.php';
-                $results = parse_results($resultsDir);
+                $results = parse_results($resultsDir . '/results.log');
             }
 
             foreach ($results as $fw => $params) {
@@ -30,6 +55,17 @@
                 $dataMemory[] = $params['memory'];
                 $dataTime[] = $params['time'];
                 $dataFile[] = $params['file'];
+
+                if (empty($resultsDirs[1]))
+                    continue;
+
+                if (!empty($results2[$fw])) {
+                    $dataCompRPS[] = $results2[$fw]['rps'];
+                    $dataCompMemory[] = $results2[$fw]['memory'];
+                } else {
+                    $dataCompRPS[] = 0;
+                    $dataCompMemory[] = 0;
+                }
             }
         }
 
@@ -39,13 +75,11 @@
         const dataMemory = [" . implode(",", $dataMemory) . "];
         const dataTime = [" . implode(",", $dataTime) . "];
         const dataFile = [" . implode(",", $dataFile) . "];
+
+        const resultsDatetime = '$resultsDatetime';
         ";
         ?>
     </script>
-</head>
-
-<body style="max-width: 1200px; margin:0 auto; padding: 15px 30px">
-    <h1>PHP Frameworks Bench</h1>
 
     <?php
     if (!file_exists($resultsDir)) {
@@ -58,8 +92,12 @@
         </ul>
     <?php
     } else {
-        if (preg_match("/output\/(\S+)\/results.log/", @$resultsDir, $match)) {
-            echo "<h4>" .  @$match[1] . "</h4>";
+        echo "<h4>" .  @$match[1] . "</h4>";
+
+        foreach ($resultsDirs as $res) {
+            if (preg_match("/output\/(\S+)/", @$res, $match)) {
+                echo "<a href='index.php?t=" .  @$match[1] . "'>" . $match[1] . "</a> | ";
+            }
         }
     ?>
         <br>
@@ -77,7 +115,7 @@
 
     <ul>
         <?php
-        $urls = file(__DIR__ . '/output/urls.log');
+        $urls = file($resultsDir . '/urls.log');
         foreach ($urls as $url) {
             $url_array = explode('/', $url);
             // to make it shorter
diff --git a/libs/app.js b/libs/app.js
@@ -40,11 +40,19 @@ var fileChart = document.getElementById("fileChart");
 
 new Chart(rpsChart, {
   type: "bar",
+  options: {
+    plugins: {
+      title: {
+        display: true,
+        text: 'Requests Per Second (RPS)'
+      },
+    }
+  },
   data: {
     labels: dataLabels,
     datasets: [
       {
-        label: "Requests Per Second (RPS)",
+        label: resultsDatetime,
         data: dataRPS,
         backgroundColor: COLORS,
       },
@@ -54,11 +62,19 @@ new Chart(rpsChart, {
 
 new Chart(memoryChart, {
   type: "bar",
+  options: {
+    plugins: {
+      title: {
+        display: true,
+        text: 'Memory Peak (MB)'
+      },
+    }
+  },
   data: {
     labels: dataLabels,
     datasets: [
       {
-        label: "Memory Peak (MB)",
+        label: resultsDatetime,
         data: dataMemory,
         backgroundColor: COLORS,
       },
@@ -68,11 +84,19 @@ new Chart(memoryChart, {
 
 new Chart(timeChart, {
   type: "bar",
+  options: {
+    plugins: {
+      title: {
+        display: true,
+        text: 'Execution Time (ms)'
+      },
+    }
+  },
   data: {
     labels: dataLabels,
     datasets: [
       {
-        label: "Execution Time (ms)",
+        label: resultsDatetime,
         data: dataTime,
         backgroundColor: COLORS,
       },
@@ -82,11 +106,19 @@ new Chart(timeChart, {
 
 new Chart(fileChart, {
   type: "bar",
+  options: {
+    plugins: {
+      title: {
+        display: true,
+        text: 'Included Files'
+      },
+    }
+  },
   data: {
     labels: dataLabels,
     datasets: [
       {
-        label: "Included Files",
+        label: resultsDatetime,
         data: dataFile,
         backgroundColor: COLORS,
       },
