caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-24 00:59:02 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Threaded IO: use main thread to handle write work

Browse Source
This commit is contained in:
zhaozhao.zz 2019-05-21 11:37:13 +08:00
parent fd0ee469ab
commit 8b33975944
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/networking.c
View File

@ -2525,7 +2525,7 @@ pthread_mutex_t io_threads_mutex[IO_THREADS_MAX_NUM];
_Atomic unsigned long io_threads_pending[IO_THREADS_MAX_NUM]; _Atomic unsigned long io_threads_pending[IO_THREADS_MAX_NUM];
int io_threads_active; /* Are the threads currently spinning waiting I/O? */ int io_threads_active; /* Are the threads currently spinning waiting I/O? */
int io_threads_op; /* IO_THREADS_OP_WRITE or IO_THREADS_OP_READ. */ int io_threads_op; /* IO_THREADS_OP_WRITE or IO_THREADS_OP_READ. */
list *io_threads_list[IO_THREADS_MAX_NUM]; list *io_threads_list[IO_THREADS_MAX_NUM+1];
void *IOThreadMain(void *myid) { void *IOThreadMain(void *myid) {
/* The ID is the thread number (from 0 to server.iothreads_num-1), and is /* The ID is the thread number (from 0 to server.iothreads_num-1), and is
@ -2598,6 +2598,7 @@ void initThreadedIO(void) {
} }
io_threads[i] = tid; io_threads[i] = tid;
} }
io_threads_list[server.io_threads_num] = listCreate();
} }
void startThreadedIO(void) { void startThreadedIO(void) {
@ -2669,7 +2670,7 @@ int handleClientsWithPendingWritesUsingThreads(void) {
while((ln = listNext(&li))) { while((ln = listNext(&li))) {
client *c = listNodeValue(ln); client *c = listNodeValue(ln);
c->flags &= ~CLIENT_PENDING_WRITE; c->flags &= ~CLIENT_PENDING_WRITE;
int target_id = item_id % server.io_threads_num; int target_id = item_id % (server.io_threads_num+1);
listAddNodeTail(io_threads_list[target_id],c); listAddNodeTail(io_threads_list[target_id],c);
item_id++; item_id++;
} }
@ -2682,6 +2683,13 @@ int handleClientsWithPendingWritesUsingThreads(void) {
io_threads_pending[j] = count; io_threads_pending[j] = count;
} }
listRewind(io_threads_list[server.io_threads_num],&li);
while((ln = listNext(&li))) {
client *c = listNodeValue(ln);
writeToClient(c->fd,c,0);
}
listEmpty(io_threads_list[server.io_threads_num]);
/* Wait for all threads to end their work. */ /* Wait for all threads to end their work. */
while(1) { while(1) {
unsigned long pending = 0; unsigned long pending = 0;