cutelyst: Try to optimize the prefork tests (#2703)

* cutelyst: Try to optimize the prefork tests

* cutelyst: Make sure the right config section is loaded with newer version

frameworks/C++/cutelyst/config.sh

@@ -14,6 +14,8 @@ echo UWSGI=${UWSGI}
 echo NGINX=${NGINX}
 echo QT_VERSION_MM=${QT_VERSION_MM}
 echo CUTELYST_EVENT_LOOP_EPOLL=${CUTELYST_EVENT_LOOP_EPOLL}
+echo C_PROCESSES=${C_PROCESSES}
+echo C_THREADS=${C_THREADS}
 echo CPU_AFFINITY=${CPU_AFFINITY}
 
 if [ "${DRIVER}" == "QMYSQL" ]; then
@@ -51,18 +53,18 @@ if [ -n "${UWSGI}" ]; then
   --ini ${CROOT}/config.ini \
   --plugin ${CROOT}/lib/uwsgi/plugins/cutelyst_plugin.so \
   --cutelyst-app ${CROOT}/benchmarks/src/libcutelyst_benchmarks.so \
-  ${PROCESS_OR_THREAD} \
-  ${CPU_COUNT} \
-  ${CPU_AFFINITY} \
+  --processes=${C_PROCESSES} \
+  --threads=${C_THREADS} \
+  --cpu-affinity=${CPU_AFFINITY} \
   --reuse-port \
   &
 else
   ${CROOT}/bin/cutelyst-wsgi \
-  --ini ${CROOT}/config.ini \
+  --ini ${CROOT}/config.ini:uwsgi \
   -a ${CROOT}/benchmarks/src/libcutelyst_benchmarks.so \
-  ${PROCESS_OR_THREAD} \
-  ${CPU_COUNT} \
-  ${CPU_AFFINITY} \
+  --processes=${C_PROCESSES} \
+  --threads=${C_THREADS} \
+  --cpu-affinity=${CPU_AFFINITY} \
   --socket-timeout 0 \
   --reuse-port \
   &

frameworks/C++/cutelyst/setup_pf.sh

@@ -3,7 +3,8 @@
 DRIVER=
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-p
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=$(( (${CPU_COUNT}+1) / 2 ))
+C_THREADS=0
+CPU_AFFINITY=2
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_pf_epoll.sh

@@ -3,8 +3,9 @@
 DRIVER=
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-p
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=$(( (${CPU_COUNT}+1) / 2 ))
+C_THREADS=0
+CPU_AFFINITY=2
 export CUTELYST_EVENT_LOOP_EPOLL=1
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_pf_my.sh

@@ -3,7 +3,8 @@
 DRIVER=QMYSQL
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-p
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=$(( (${CPU_COUNT}+1) / 2 ))
+C_THREADS=0
+CPU_AFFINITY=2
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_pf_my_epoll.sh

@@ -3,8 +3,9 @@
 DRIVER=QMYSQL
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-p
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=$(( (${CPU_COUNT}+1) / 2 ))
+C_THREADS=0
+CPU_AFFINITY=2
 export CUTELYST_EVENT_LOOP_EPOLL=1
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_pf_pg.sh

@@ -3,7 +3,8 @@
 DRIVER=QPSQL
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-p
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=$(( (${CPU_COUNT}+1) / 2 ))
+C_THREADS=0
+CPU_AFFINITY=2
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_pf_pg_epoll.sh

@@ -3,8 +3,9 @@
 DRIVER=QPSQL
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-p
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=$(( (${CPU_COUNT}+1) / 2 ))
+C_THREADS=0
+CPU_AFFINITY=2
 export CUTELYST_EVENT_LOOP_EPOLL=1
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_thread.sh

@@ -3,7 +3,8 @@
 DRIVER=
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-t
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=1
+C_THREADS=${CPU_COUNT}
+CPU_AFFINITY=1
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_thread_epoll.sh

@@ -3,8 +3,9 @@
 DRIVER=
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-t
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=1
+C_THREADS=${CPU_COUNT}
+CPU_AFFINITY=1
 export CUTELYST_EVENT_LOOP_EPOLL=1
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_thread_my.sh

@@ -3,7 +3,8 @@
 DRIVER=QMYSQL
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-t
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=1
+C_THREADS=${CPU_COUNT}
+CPU_AFFINITY=1
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_thread_my_epoll.sh

@@ -3,8 +3,9 @@
 DRIVER=QMYSQL
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-t
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=1
+C_THREADS=${CPU_COUNT}
+CPU_AFFINITY=1
 export CUTELYST_EVENT_LOOP_EPOLL=1
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_thread_pg.sh

@@ -3,7 +3,8 @@
 DRIVER=QPSQL
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-t
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=1
+C_THREADS=${CPU_COUNT}
+CPU_AFFINITY=1
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_thread_pg_epoll.sh

@@ -3,8 +3,9 @@
 DRIVER=QPSQL
 UWSGI=
 NGINX=
-PROCESS_OR_THREAD=-t
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=1
+C_THREADS=${CPU_COUNT}
+CPU_AFFINITY=1
 export CUTELYST_EVENT_LOOP_EPOLL=1
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_uwsgi_nginx.sh

@@ -3,7 +3,8 @@
 DRIVER=
 UWSGI=1
 NGINX=1
-PROCESS_OR_THREAD=-p
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=$(( (${CPU_COUNT}+1) / 2 ))
+C_THREADS=0
+CPU_AFFINITY=2
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_uwsgi_nginx_my.sh

@@ -3,7 +3,8 @@
 DRIVER=QMYSQL
 UWSGI=1
 NGINX=1
-PROCESS_OR_THREAD=-p
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=$(( (${CPU_COUNT}+1) / 2 ))
+C_THREADS=0
+CPU_AFFINITY=2
 
 source ${TROOT}/config.sh

frameworks/C++/cutelyst/setup_uwsgi_nginx_pg.sh

@@ -3,7 +3,8 @@
 DRIVER=QPSQL
 UWSGI=1
 NGINX=1
-PROCESS_OR_THREAD=-p
-CPU_AFFINITY='--cpu-affinity=1'
+C_PROCESSES=$(( (${CPU_COUNT}+1) / 2 ))
+C_THREADS=0
+CPU_AFFINITY=2
 
 source ${TROOT}/config.sh

toolset/setup/linux/frameworks/cutelyst.sh

@@ -2,7 +2,7 @@
 
 fw_installed cutelyst && return 0
 
-CUTELYST_VER=1.6.0-beta6
+CUTELYST_VER=1.6.0-beta7
 QT_VERSION_MM=56
 QT_VERSION_FULL=562-trusty
 CROOT=${IROOT}/cutelyst