Fixed GH-5671

Author: matyhtf

src/server/reactor_thread.cc

@@ -33,6 +33,7 @@ static int ReactorThread_onWrite(Reactor *reactor, Event *ev);
 static int ReactorThread_onPacketReceived(Reactor *reactor, Event *event);
 static int ReactorThread_onClose(Reactor *reactor, Event *event);
 static void ReactorThread_resume_data_receiving(Timer *timer, TimerNode *tnode);
+static void ReactorThread_heartbeat_check(Timer *timer, TimerNode *tnode);
 
 #ifdef SW_USE_OPENSSL
 static inline ReturnCode ReactorThread_verify_ssl_state(Reactor *reactor, ListenPort *port, Socket *_socket) {
@@ -652,6 +653,27 @@ static int ReactorThread_onWrite(Reactor *reactor, Event *ev) {
     return SW_OK;
 }
 
+static void ReactorThread_heartbeat_check(Timer *timer, TimerNode *tnode) {
+    double now = microtime();
+    Reactor *reactor = (Reactor *) tnode->data;
+    Server *serv = (Server *) reactor->ptr;
+    ReactorThread *thread = serv->get_thread(reactor->id);
+
+    serv->foreach_connection([=](Connection *conn) {
+        SessionId session_id = conn->session_id;
+        if (session_id <= 0) {
+            return;
+        }
+        if (conn->reactor_id != reactor->id) {
+            return;
+        }
+        if (serv->is_healthy_connection(now, conn)) {
+            return;
+        }
+        thread->close_connection(reactor, session_id);
+    });
+}
+
 /**
  * [master]
  */
@@ -705,7 +727,12 @@ int Server::start_reactor_threads() {
      * heartbeat thread
      */
     if (heartbeat_check_interval >= 1) {
-        start_heartbeat_thread();
+        if (single_thread) {
+            heartbeat_timer = swoole_timer_add(
+                (long) (heartbeat_check_interval * 1000), true, ReactorThread_heartbeat_check, reactor);
+        } else {
+            start_heartbeat_thread();
+        }
     }
 
     return start_master_thread(reactor);

tests/swoole_server/single_thread/heartbeat.phpt

@@ -0,0 +1,38 @@
+--TEST--
+swoole_server/single_thread: heartbeat
+--SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc';
+?>
+--FILE--
+<?php
+require __DIR__ . '/../../include/bootstrap.php';
+
+$pm = new SwooleTest\ProcessManager;
+$pm->parentFunc = function ($pid) use ($pm) {
+    Assert::isEmpty(@file_get_contents('http://127.0.0.1:' . $pm->getFreePort() . '/'));
+    $pm->kill();
+};
+
+$pm->childFunc = function () use ($pm) {
+    $http = new Swoole\Http\Server('0.0.0.0', $pm->getFreePort(), SWOOLE_PROCESS);
+    $http->set([
+        'single_thread' => true,
+        'worker_num' => 1,
+        'heartbeat_idle_time' => 1,
+        'heartbeat_check_interval' => 1,
+    ]);
+    $http->on('WorkerStart', function (Swoole\Http\Server $serv) use ($pm) {
+        $pm->wakeup();
+    });
+    $http->on('Request', function ($request, $response) use ($http) {
+        sleep(3);
+        Assert::false($response->end('hello'));
+        Assert::eq($http->getLastError(), SWOOLE_ERROR_SESSION_NOT_EXIST);
+    });
+    $http->start();
+};
+
+$pm->childFirst();
+$pm->run();
+?>
+--EXPECT--

tests/swoole_server/single_thread/large_packet.phpt

@@ -1,5 +1,5 @@
 --TEST--
-swoole_server/length: package_length_func
+swoole_server/single_thread: large packet
 --SKIPIF--
 <?php require __DIR__ . '/../../include/skipif.inc';
 ?>

tests/swoole_server/single_thread/user_setting.phpt

@@ -0,0 +1,61 @@
+--TEST--
+swoole_server/single_thread: package_length_func
+--SKIPIF--
+<?php require __DIR__ . '/../../include/skipif.inc';
+?>
+--FILE--
+<?php
+require __DIR__ . '/../../include/bootstrap.php';
+
+$pm = new SwooleTest\ProcessManager;
+$pm->parentFunc = function ($pid) use ($pm) {
+    $url = 'http://127.0.0.1:' . $pm->getFreePort() . '/';
+    $filePath = tempnam('/tmp', 'swoole_test_');
+    $rdata = random_bytes(1024 * 1024);
+    file_put_contents($filePath, $rdata);
+    $ch = curl_init();
+
+    curl_setopt($ch, CURLOPT_URL, $url);
+    curl_setopt($ch, CURLOPT_POST, true);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($ch, CURLOPT_HTTPHEADER, [
+        'Accept: text/html',
+        'Content-Type: multipart/form-data'
+    ]);
+    curl_setopt($ch, CURLOPT_POSTFIELDS, [
+        'file' => new CURLFile($filePath, 'text/html')
+    ]);
+    $response = curl_exec($ch);
+    if (curl_errno($ch)) {
+        echo 'ERROR: ' . curl_error($ch);
+    } else {
+        Assert::eq($response, md5($rdata));
+    }
+    curl_close($ch);
+    unlink($filePath);
+    $pm->kill();
+};
+
+$pm->childFunc = function () use ($pm) {
+    $http = new Swoole\Http\Server('0.0.0.0', $pm->getFreePort(), SWOOLE_PROCESS);
+    $http->set([
+        'single_thread' => true,
+        'worker_num' => 1,
+        'user'  => 'www-data',
+        'group' => 'www-data',
+        'heartbeat_idle_time'      => 600,
+        'heartbeat_check_interval' => 30,
+    ]);
+    $http->on('WorkerStart', function (Swoole\Http\Server $serv) use ($pm) {
+        $pm->wakeup();
+    });
+    $http->on('Request', function ($request, $response) {
+        $response->end(md5_file($request->files['file']['tmp_name']));
+    });
+    $http->start();
+};
+
+$pm->childFirst();
+$pm->run();
+?>
+--EXPECT--