Revert "v2.0 initial commit"

This reverts commit 5660d41.

Author: myaaghubi

base/_functions.sh

@@ -20,7 +20,7 @@ benchmark () {
         return 1
     fi
 
-    config_wrk="wrk -t${threads} -c${connections} -d${duration}s"
+    config_wrk="wrk -t50 -c1000 -d60s"
 
     # is it wsl!?
     # if you're using wsl, it's necessary to put -R (--rate)
@@ -38,10 +38,9 @@ benchmark () {
     config_wrk="$config_wrk '$url' > '$output_wrk'"
     eval $config_wrk
 
-    rps=`grep "Requests/sec:" "$output_wrk" | tr -cd '0-9.'`
+    rps=`grep "Requests/sec:" "$output_wrk" | tr -dc '0-9.'`
 
-    echo "rps: "
-    numfmt --g "$rps"
+    numfmt --g "$rps rps"
 
     # to make a small gap between the WRK and CURL
     sleep 1
@@ -52,12 +51,12 @@ benchmark () {
     # The for (( expr ; expr ; expr )) syntax is not available in sh, so:
     while [ $i -lt $count ]
     do
-        curl -sS "$url" > "$output"
+        curl "$url" > "$output"
         t=`tail -1 "$output" | cut -f 2 -d ':'`
-        total=`php ./libs/sum_ms.php $t $total`
+        total=`php ./base/sum_ms.php $t $total`
         i=$(( $i + 1 ))
     done
-    time=`php ./libs/avg_ms.php $total $count`
+    time=`php ./base/avg_ms.php $total $count`
 
 
     # get memory and file
@@ -70,6 +69,7 @@ benchmark () {
     grep "Document Length:" "$output_wrk" >> "$check_file"
     grep "Failed requests:" "$output_wrk" >> "$check_file"
     grep 'Hello World!' "$output" >> "$check_file"
+    echo "---" >> "$check_file"
 
     # check errors
     touch "$error_file"

libs/avg_ms.php renamed to base/avg_ms.php

@@ -2,8 +2,8 @@
 
 cd `dirname $0`
 . ./_functions.sh
-. ../benchmark.config
 
+base="$1"
 bm_name=`basename $0 .sh`
 
 results_file="output/results.$bm_name.log"
@@ -22,57 +22,13 @@ mv "$url_file" "$url_file.old"
 phpv=`php -r 'echo phpversion();'`
 echo "/------- PHP $phpv -------/"
 
-for fw in `echo $param_targets`
+for fw in `echo $targets`
 do
     if [ -d "$fw" ]; then
-        echo "/------- $fw -------/"
-
-        # read -p "Continue to $fw (y/n)?" choice
-        # case "$choice" in
-        #   y|Y ) echo "yes";;
-        #   n|N ) echo "no";;
-        #   * ) echo "invalid";;
-        # esac
-        # if [ "$choice" = "n" ] || [ "$choice" = "N" ]; then
-        #     continue
-        # fi
-
-        if [ "$param_clean" = true ]; then
-            bash clean.sh
-            bash setup.sh "$fw"
-        fi
-
-        # read -p "Continue to benchmark (y/n)?" choice
-        # case "$choice" in
-        #   y|Y ) echo "yes";;
-        #   * ) echo "invalid";;
-        # esac
-        # if [ "$choice" = "n" ] || [ "$choice" = "N" ]; then
-        #     continue
-        # fi
-
-        # reset the opcache
+        echo "/------- $fw: benchmarking -------/"
+        echo "$fw/_benchmark/hello_world.sh"
         php ./libs/reset_opcache.php
-
-        if [ "$param_restart_apache" = true ]; then
-            echo 'systemctl restart apache2'
-            sudo systemctl restart apache2
-        fi
-
-        if [ "$param_restart_nginx" = true ]; then
-            echo 'systemctl restart nginx'
-            sudo systemctl restart nginx
-        fi
-        
-        # a small gap between composer, reset_opcache, webserver restarted and benchmark
-        sleep 2
-        
-        # get the hello world link
         . "$fw/_benchmark/hello_world.sh"
-
-        echo "/------- $fw: benchmarking -------/"
-
-        # run the benchmark
         benchmark "$fw" "$url"
     fi
 done

base/hello_world.sh

@@ -1,74 +1,27 @@
 #!/bin/sh
 
-if [ ! `which php` ]; then
-    echo "php not found."
-    exit 1;
-fi
-
 if [ ! `which wrk` ]; then
-    echo "WRK not found."
+    echo "wrk not found."
     exit 1;
 fi
 
 if [ ! `which curl` ]; then
-    echo "CURL not found."
+    echo "curl not found."
     exit 1;
 fi
 
-function showHelp()
-{
-   cat << HEREDOC
-
-    Usage: bash benchmark.sh [-c] [-rapache] [-t pure-php laravel-10]
+base="http://127.0.0.1/php-frameworks-bench"
 
-    Optional Arguments:
-        -c, --clean NUM            Clean all frameworks and install the target framework -fresh install- before benchmark.
-        -h, --help                 Show this help message and exit
-        -rapache, --restart-apache Restart apache "sudo systemctl restart apache2" before each benchmark.
-        -rnginx, --restart-nginx   Restart apache "sudo systemctl restart nginx" before each benchmark.
-        -t, --targets              Specify your target frameworks for benchmarking.
-
-HEREDOC
-} 
-
-. ./list.sh
-export param_targets="$list"
-export param_clean=false
-export param_restart_apache=false
-export param_restart_nginx=false
-
-insputs=" ${@%/}"
-IFS=';'
-params=(`php ./libs/strreplace.php " -" ";-" " ${insputs}"`)
+if [ $# -eq 0 ]; then
+    # include frameworks list
+    . ./list.sh
+    export targets="$list"
+else
+    export targets="${@%/}"
+fi
 
-for option in "${params[@]}"
-do
-	case "$option" in
-        -c|--clean)
-            param_clean=true
-            ;;
-        -rapache|--restart-apache)
-            param_restart_apache=true
-            ;;
-        -rnginx|--restart-nginx)
-            param_restart_nginx=true
-            ;;
-        -t*|--targets*)
-            arg_=${option//--targets /}
-            arg_=${arg_//-t /}
-            param_targets="$arg_"
-            ;;
-        -h|--help)
-            showHelp;
-            ;;
-        " ")
-            ;;
-        *)
-            echo "${option} not available"
-            ;;
-    esac
-done
+cd base
 
-sh ./base/hello_world.sh 
+sh hello_world.sh "$base"
 
-php ./libs/show_results_table.php
+php ../bin/show_results_table.php

base/show_fw_array.sh

@@ -87,7 +87,7 @@
 <hr>
 
 <footer>
-    <p style="text-align: right">This page is a part of <a href="https://github.com/myaaghubi/PHP-Frameworks-Bench">PHP-Frameworks-Bench</a>.</p>
+    <p style="text-align: right">This page is a part of <a href="https://github.com/myaghobi/php-frameworks-bench">php-frameworks-bench</a>.</p>
 </footer>
 </body>
 </html>