Adjust the size of the pipeline ipc buffer to reduce the kernel memor…

…y usage
swoole · Feb 11, 2022 · 459909d · 459909d
1 parent b6e9b14
commit 459909d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/include/swoole_config.h b/include/swoole_config.h
@@ -76,6 +76,7 @@
 #else
 #define SW_IPC_MAX_SIZE 8192  // for IPC, dgram and message-queue max size
 #endif
+#define SW_IPC_BUFFER_MAX_SIZE (256 * 1024)
 #define SW_IPC_BUFFER_SIZE (SW_IPC_MAX_SIZE - sizeof(swoole::DataHead))
 // !!!End.-------------------------------------------------------------------
 
@@ -118,7 +119,6 @@
 #define SW_SESSION_LIST_SIZE (1 * 1024 * 1024)
 
 #define SW_MSGMAX 65536
-#define SW_UNIXSOCK_MAX_BUF_SIZE (2 * 1024 * 1024)
 
 #define SW_DGRAM_HEADER_SIZE 32
 
@@ -166,8 +166,8 @@
 #define SW_USE_EVENTFD                                                                                                 \
     1  // Whether to use eventfd for message notification, Linux 2.6.22 or later is required to support
 
-#define SW_TASK_TMP_PATH_SIZE  256
-#define SW_TASK_TMP_DIR  "/tmp"
+#define SW_TASK_TMP_PATH_SIZE 256
+#define SW_TASK_TMP_DIR "/tmp"
 #define SW_TASK_TMP_FILE "swoole.task.XXXXXX"
 
 #define SW_FILE_CHUNK_SIZE 65536
@@ -194,10 +194,10 @@
 #define SW_DNS_RESOLV_CONF "/etc/resolv.conf"
 
 #define SW_Z_BEST_SPEED 1
-#define SW_COMPRESSION_MIN_LENGTH_DEFAULT  20
+#define SW_COMPRESSION_MIN_LENGTH_DEFAULT 20
 
 #ifndef IOV_MAX
-#define IOV_MAX   16
+#define IOV_MAX 16
 #endif
 
 #define IOV_MAX_ERROR_MSG "The maximum of iov count is %d"

diff --git a/src/server/master.cc b/src/server/master.cc
@@ -1964,7 +1964,7 @@ Connection *Server::add_connection(ListenPort *ls, Socket *_socket, int server_f
 }
 
 void Server::init_ipc_max_size() {
-#ifdef HAVE_KQUEUE
+#ifndef __linux__
     ipc_max_size = SW_IPC_MAX_SIZE;
 #else
     int bufsize;
@@ -1974,7 +1974,7 @@ void Server::init_ipc_max_size() {
     if (workers[0].pipe_master->get_option(SOL_SOCKET, SO_SNDBUF, &bufsize) != 0) {
         bufsize = SW_IPC_MAX_SIZE;
     }
-    ipc_max_size = bufsize - SW_DGRAM_HEADER_SIZE;
+    ipc_max_size = SW_MIN(bufsize, SW_IPC_BUFFER_MAX_SIZE) - SW_DGRAM_HEADER_SIZE;
 #endif
 }
 

diff --git a/src/server/process.cc b/src/server/process.cc
@@ -70,7 +70,6 @@ bool ProcessFactory::start() {
     }
 
     SW_LOOP_N(server_->worker_num) {
-        int kernel_buffer_size = SW_UNIXSOCK_MAX_BUF_SIZE;
         auto _sock = new UnixSocket(true, SOCK_DGRAM);
         if (!_sock->ready()) {
             delete _sock;
@@ -80,10 +79,6 @@ bool ProcessFactory::start() {
         pipes.emplace_back(_sock);
         server_->workers[i].pipe_master = _sock->get_socket(true);
         server_->workers[i].pipe_worker = _sock->get_socket(false);
-
-        server_->workers[i].pipe_master->set_send_buffer_size(kernel_buffer_size);
-        server_->workers[i].pipe_worker->set_send_buffer_size(kernel_buffer_size);
-
         server_->workers[i].pipe_object = _sock;
         server_->store_pipe_fd(server_->workers[i].pipe_object);
     }