Optimize code

Author: matyhtf

ext-src/php_swoole_library.h

@@ -2,7 +2,7 @@
  * Generated by build-library.php, Please DO NOT modify!
  */
 
-/* $Id: b591f704aaab92336e8906d2584b7030fde90e87 */
+/* $Id: e07037baef45ea64d334257e203fe2ca82914c93 */
 
 static const char* swoole_library_source_constants =
     "\n"
@@ -618,7 +618,7 @@ static const char* swoole_library_source_core_string_object =
     "    /**\n"
     "     * @return static\n"
     "     */\n"
-    "    public function substr(int $offset, ?int $length = null): self\n"
+    "    public function substr(int $offset, ?int $length = null)\n"
     "    {\n"
     "        return new static(substr($this->string, ...func_get_args()));\n"
     "    }\n"
@@ -693,7 +693,7 @@ static const char* swoole_library_source_core_string_object =
     "     */\n"
     "    public function chunkSplit(int $chunkLength = 76, string $chunkEnd = ''): self\n"
     "    {\n"
-    "        return new static(chunk_split($this->string, $chunkLength, $chunkEnd));\n"
+    "        return new static(chunk_split($this->string, ...func_get_args()));\n"
     "    }\n"
     "\n"
     "    public function chunk(int $splitLength = 1): ArrayObject\n"

ext-src/swoole_server.cc

@@ -1872,8 +1872,8 @@ void php_swoole_server_onClose(Server *serv, DataHead *info) {
     }
     if (conn->websocket_status != WEBSOCKET_STATUS_ACTIVE) {
         ListenPort *port = serv->get_port_by_server_fd(info->server_fd);
-        if (port && port->open_websocket_protocol
-                && php_swoole_server_isset_callback(serv, port, SW_SERVER_CB_onDisconnect)) {
+        if (port && port->open_websocket_protocol &&
+            php_swoole_server_isset_callback(serv, port, SW_SERVER_CB_onDisconnect)) {
             fci_cache = php_swoole_server_get_fci_cache(serv, info->server_fd, SW_SERVER_CB_onDisconnect);
         }
     }
@@ -3078,11 +3078,15 @@ static PHP_METHOD(swoole_server, heartbeat) {
         if (conn->protect || conn->last_recv_time == 0 || conn->last_recv_time > checktime) {
             return;
         }
+        SessionId session_id = conn->session_id;
+        if (session_id <= 0) {
+            return;
+        }
         if (close_connection) {
             conn->close_force = 1;
-            serv->close(conn->fd, false);
+            serv->close(session_id, false);
         }
-        add_next_index_long(return_value, conn->session_id);
+        add_next_index_long(return_value, session_id);
     });
 }
 
@@ -3713,7 +3717,11 @@ static PHP_METHOD(swoole_server, getClientList) {
         swTrace("maxfd=%d, fd=%d, find_count=%ld, start_fd=%ld", serv_max_fd, fd, find_count, start_session_id);
         Connection *conn = serv->get_connection_for_iterator(fd);
         if (conn) {
-            add_next_index_long(return_value, conn->session_id);
+            SessionId session_id = conn->session_id;
+            if (session_id <= 0) {
+                continue;
+            }
+            add_next_index_long(return_value, session_id);
             find_count--;
         }
         // finish fetch
@@ -3931,10 +3939,12 @@ static PHP_METHOD(swoole_connection_iterator, valid) {
         if (!conn) {
             continue;
         }
-        if (iterator->port && (iterator->port->get_fd() < 0 || conn->server_fd != iterator->port->get_fd())) {
+        SessionId session_id = conn->session_id;
+        if (session_id <= 0 ||
+            (iterator->port && (iterator->port->get_fd() < 0 || conn->server_fd != iterator->port->get_fd()))) {
             continue;
         }
-        iterator->session_id = conn->session_id;
+        iterator->session_id = session_id;
         iterator->current_fd = fd;
         iterator->index++;
         RETURN_TRUE;

include/swoole_server.h

@@ -1158,7 +1158,7 @@ class Server {
 
     inline Connection *get_connection_for_iterator(int fd) {
         Connection *conn = get_connection(fd);
-        if (conn && conn->active && !conn->closed && conn->session_id > 0) {
+        if (conn && conn->active && !conn->closed) {
 #ifdef SW_USE_OPENSSL
             if (conn->ssl && !conn->ssl_ready) {
                 return nullptr;

src/server/reactor_thread.cc

@@ -1091,11 +1091,15 @@ void Server::start_heartbeat_thread() {
                 if (conn->protect || conn->last_recv_time == 0 || conn->last_recv_time > checktime) {
                     return;
                 }
+                SessionId session_id = conn->session_id;
+                if (session_id <= 0) {
+                    return;
+                }
                 DataHead ev{};
                 ev.type = SW_SERVER_EVENT_CLOSE_FORCE;
                 // convert fd to session_id, in order to verify the connection before the force close connection
-                ev.fd = conn->session_id;
-                Socket *_pipe_sock = get_reactor_thread_pipe(conn->session_id, conn->reactor_id);
+                ev.fd = session_id;
+                Socket *_pipe_sock = get_reactor_thread_pipe(session_id, conn->reactor_id);
                 _pipe_sock->send_blocking((void *) &ev, sizeof(ev));
             });
             sleep(heartbeat_check_interval);