adding new tests

Author: devnexen

sapi/fpm/config.m4

@@ -356,6 +356,8 @@ if test "$PHP_FPM" != "no"; then
   AC_CHECK_HEADER([priv.h], [AC_CHECK_FUNCS([setpflags])])
   AC_CHECK_HEADER([sys/times.h], [AC_CHECK_FUNCS([times])])
   AC_CHECK_HEADER([port.h], [AC_CHECK_FUNCS([port_create])])
+  AC_CHECK_HEADER([sched.h], [AC_CHECK_FUNCS([sched_setaffinity])])
+  AC_CHECK_HEADER([sys/cpuset.h], [AC_CHECK_FUNCS([cpuset_setaffinity])])
 
   PHP_ARG_WITH([fpm-user],,
     [AS_HELP_STRING([[--with-fpm-user[=USER]]],

sapi/fpm/fpm/fpm_unix.c

@@ -37,9 +37,9 @@
 #include <selinux/selinux.h>
 #endif
 
-#if defined(HAVE_SCHED_H)
+#if defined(HAVE_SCHED_SETAFFINITY)
 #include <sched.h>
-#elif defined(HAVE_SYS_CPUSET_H)
+#elif defined(HAVE_CPUSETAFFINITY)
 #include <sys/cpuset.h>
 typedef cpuset_t cpu_set_t;
 #endif

sapi/fpm/tests/cpuaffinity-fail2.phpt

@@ -0,0 +1,42 @@
+--TEST--
+FPM: cpu affinity test
+--SKIPIF--
+<?php include "skipif.inc";
+
+if (!str_contains(PHP_OS, 'Linux') && !str_contains(PHP_OS, 'FreeBSD')) {
+    die('skipped supported only on Linux and FreeBSD');
+}
+?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+[global]
+process.cpu_list = MYcpuListIs1024-2048
+error_log = {{FILE:LOG}}
+pid = {{FILE:PID}}
+[unconfined]
+listen = {{ADDR:IPv4}}
+pm = dynamic
+pm.max_children = 1
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 1
+EOT;
+
+$tester = new FPM\Tester($cfg);
+$tester->start();
+$tester->expectLogError("FPM initialization failed");
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

sapi/fpm/tests/cpuaffinity-fail3.phpt

@@ -0,0 +1,42 @@
+--TEST--
+FPM: cpu affinity test
+--SKIPIF--
+<?php include "skipif.inc";
+
+if (!str_contains(PHP_OS, 'Linux') && !str_contains(PHP_OS, 'FreeBSD')) {
+    die('skipped supported only on Linux and FreeBSD');
+}
+?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+[global]
+process.cpu_list = 12de-34ad
+error_log = {{FILE:LOG}}
+pid = {{FILE:PID}}
+[unconfined]
+listen = {{ADDR:IPv4}}
+pm = dynamic
+pm.max_children = 1
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 1
+EOT;
+
+$tester = new FPM\Tester($cfg);
+$tester->start();
+$tester->expectLogError("FPM initialization failed");
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>

sapi/fpm/tests/cpuaffinity-multi.phpt

@@ -0,0 +1,48 @@
+--TEST--
+FPM: cpu affinity test
+--SKIPIF--
+<?php include "skipif.inc";
+
+if (!str_contains(PHP_OS, 'Linux') && !str_contains(PHP_OS, 'FreeBSD')) {
+    die('skipped supported only on Linux and FreeBSD');
+}
+
+if (FPM\Tester::getCores() < 4) {
+    die('skipped supported only on multicores environments');
+}
+?>
+--FILE--
+<?php
+
+require_once "tester.inc";
+
+$cfg = <<<EOT
+[global]
+error_log = {{FILE:LOG}}
+pid = {{FILE:PID}}
+[unconfined]
+listen = {{ADDR:IPv4}}
+pm = dynamic
+pm.max_children = 1
+pm.start_servers = 1
+pm.min_spare_servers = 1
+pm.max_spare_servers = 1
+process.cpu_list = 1,2-3,4
+EOT;
+
+$tester = new FPM\Tester($cfg);
+$tester->start();
+$tester->expectLogStartNotices();
+$tester->terminate();
+$tester->expectLogTerminatingNotices();
+$tester->close();
+
+?>
+Done
+--EXPECT--
+Done
+--CLEAN--
+<?php
+require_once "tester.inc";
+FPM\Tester::clean();
+?>