gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Threaded IO: process read queue before stopping threads.

Browse Source
This commit is contained in:
antirez 2019-03-31 22:06:00 +02:00
parent 63a0ffd36a
commit 8d7d2be24f
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/networking.c
View File

@ -2590,8 +2590,13 @@ void startThreadedIO(void) {
} }
void stopThreadedIO(void) { void stopThreadedIO(void) {
/* We may have still clients with pending reads when this function
* is called: handle them before stopping the threads. */
handleClientsWithPendingReadsUsingThreads();
if (tio_debug) printf("E"); fflush(stdout); if (tio_debug) printf("E"); fflush(stdout);
if (tio_debug) printf("--- STOPPING THREADED IO ---\n"); if (tio_debug) printf("--- STOPPING THREADED IO [R%d] [W%d] ---\n",
(int) listLength(server.clients_pending_read),
(int) listLength(server.clients_pending_write));
serverAssert(io_threads_active == 1); serverAssert(io_threads_active == 1);
for (int j = 0; j < server.io_threads_num; j++) for (int j = 0; j < server.io_threads_num; j++)
pthread_mutex_lock(&io_threads_mutex[j]); pthread_mutex_lock(&io_threads_mutex[j]);