Added tests, improved server stats_file, fix core-tests

swoole · Oct 8, 2021 · 73372ad · 73372ad
1 parent bf393fb
commit 73372ad
Show file tree

Hide file tree

Showing 7 changed files with 1,194 additions and 51 deletions.
diff --git a/ext-src/php_swoole_library.h b/ext-src/php_swoole_library.h
diff --git a/src/memory/fixed_pool.cc b/src/memory/fixed_pool.cc
@@ -82,13 +82,13 @@ FixedPool::FixedPool(uint32_t slice_size, void *memory, size_t size, bool shared
     impl = (FixedPoolImpl*) memory;
     memory = (char*) memory + sizeof(*impl);
     sw_memset_zero(impl, sizeof(*impl));
+    impl->shared = shared;
+    impl->slice_size = slice_size;
+    impl->size = size - sizeof(*impl);
     uint32_t slice_num = impl->size / (slice_size + sizeof(FixedPoolSlice));
     if (slice_num < 2) {
         throw Exception(SW_ERROR_INVALID_PARAMS);
     }
-    impl->shared = shared;
-    impl->slice_size = slice_size;
-    impl->size = size - sizeof(*impl);
     impl->slice_num = slice_num;
     impl->memory = memory;
     impl->allocated = false;

diff --git a/tests/include/functions.php b/tests/include/functions.php
@@ -798,4 +798,9 @@ function swoole_get_variance($avg, $array, $is_swatch = false)
 function swoole_get_average($array)
 {
     return array_sum($array) / count($array);
-}
+}
+
+function assert_server_stats($stats) {
+    Assert::keyExists($stats, 'connection_num');
+    Assert::keyExists($stats, 'request_count');
+}
diff --git a/tests/swoole_server/stats_file.phpt b/tests/swoole_server/stats_file.phpt
@@ -9,9 +9,12 @@ require __DIR__ . '/../include/bootstrap.php';
 use function Swoole\Coroutine\run;
 
 const STATS_FILE = __DIR__ . '/stats.log';
-if (is_file(STATS_FILE)) {
-    unlink(STATS_FILE);
-}
+$rm_fn = function () {
+    if (is_file(STATS_FILE)) {
+        unlink(STATS_FILE);
+    }
+};
+$rm_fn();
 
 $pm = new ProcessManager;
 $pm->initFreePorts(1);
@@ -59,5 +62,6 @@ $pm->childFunc = function () use ($pm) {
 
 $pm->childFirst();
 $pm->run();
+$rm_fn();
 ?>
 --EXPECT--
diff --git a/tests/swoole_server/stats_file_json.phpt b/tests/swoole_server/stats_file_json.phpt
@@ -0,0 +1,62 @@
+--TEST--
+swoole_server: stats_file [json]
+--SKIPIF--
+<?php require  __DIR__ . '/../include/skipif.inc'; ?>
+--FILE--
+<?php
+require __DIR__ . '/../include/bootstrap.php';
+
+use function Swoole\Coroutine\run;
+
+const STATS_FILE = __DIR__ . '/stats.json';
+$rm_fn = function () {
+    if (is_file(STATS_FILE)) {
+        unlink(STATS_FILE);
+    }
+};
+$rm_fn();
+
+$pm = new ProcessManager;
+$pm->initFreePorts(1);
+
+$pm->parentFunc = function ($pid) use ($pm) {
+    run(function () use ($pm, $pid) {
+        httpRequest('http://127.0.0.1:' . $pm->getFreePort(0));
+        for ($i = 0; $i < 4; ++$i) {
+            Co::sleep(0.5);
+            $content = @file_get_contents(STATS_FILE);
+            if ('' != $content) {
+                $stats = json_decode($content, true);
+                assert_server_stats($stats);
+                break;
+            }
+        }
+    });
+    echo "\n";
+    $pm->kill();
+};
+
+$pm->childFunc = function () use ($pm) {
+    $mode = SERVER_MODE_RANDOM;
+    $worker_num = rand(1, 4);
+    phpt_var_dump("mode: $mode\nworker_num: $worker_num\n");
+    $server = new Swoole\Http\Server('127.0.0.1', $pm->getFreePort(0), $mode);
+    $server->set([
+        'stats_file' => STATS_FILE,
+        'log_file' => DEV_NULL,
+        'worker_num' => $worker_num,
+    ]);
+    $server->on('ManagerStart', function ($serv) use ($pm) {
+        $pm->wakeup();
+    });
+    $server->on('request', function ($request, $response) {
+        $response->end("<h1>Hello Swoole. #" . rand(1000, 9999) . "</h1>");
+    });
+    $server->start();
+};
+
+$pm->childFirst();
+$pm->run();
+$rm_fn();
+?>
+--EXPECT--
diff --git a/tests/swoole_server/stats_file_php.phpt b/tests/swoole_server/stats_file_php.phpt
@@ -0,0 +1,65 @@
+--TEST--
+swoole_server: stats_file [php]
+--SKIPIF--
+<?php require  __DIR__ . '/../include/skipif.inc'; ?>
+--FILE--
+<?php
+require __DIR__ . '/../include/bootstrap.php';
+
+use function Swoole\Coroutine\run;
+
+const STATS_FILE = __DIR__ . '/stats.php';
+$rm_fn = function () {
+    if (is_file(STATS_FILE)) {
+        unlink(STATS_FILE);
+    }
+};
+$rm_fn();
+
+$pm = new ProcessManager;
+$pm->initFreePorts(1);
+
+$pm->parentFunc = function ($pid) use ($pm) {
+    run(function () use ($pm, $pid) {
+        httpRequest('http://127.0.0.1:' . $pm->getFreePort(0));
+        for ($i = 0; $i < 4; ++$i) {
+            Co::sleep(0.5);
+            if (!is_file(STATS_FILE)) {
+                continue;
+            }
+            $stats = include STATS_FILE;
+            if (empty($stats)) {
+                assert_server_stats($stats);
+                break;
+            }
+        }
+    });
+    echo "\n";
+    $pm->kill();
+};
+
+$pm->childFunc = function () use ($pm) {
+    $mode = SERVER_MODE_RANDOM;
+    $worker_num = rand(1, 4);
+    phpt_var_dump("mode: $mode\nworker_num: $worker_num\n");
+    $server = new Swoole\Http\Server('127.0.0.1', $pm->getFreePort(0), $mode);
+    $server->set([
+        'stats_file' => STATS_FILE,
+        'log_file' => DEV_NULL,
+        'worker_num' => $worker_num,
+    ]);
+    $server->on('ManagerStart', function ($serv) use ($pm) {
+        $pm->wakeup();
+    });
+    $server->on('request', function ($request, $response) {
+        $response->end("<h1>Hello Swoole. #" . rand(1000, 9999) . "</h1>");
+    });
+    $server->start();
+};
+
+$pm->childFirst();
+$pm->run();
+
+$rm_fn();
+?>
+--EXPECT--
diff --git a/tools/build-library.php b/tools/build-library.php
@@ -85,6 +85,7 @@
     # <core for Process> #
     'core/Process/Manager.php',
     # <core for Server> #
+    'core/Server/Admin.php',
     'core/Server/Helper.php',
     # <core for functions> #
     'core/Coroutine/functions.php',