fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-26 15:31:33 +00:00
Code Issues Projects Releases Wiki Activity

Fix for bug 312 (VM bug) backported from master

Browse Source
This commit is contained in:
antirez
2010-09-03 11:43:06 +02:00
parent eaaf62f6a4
commit 7caf0591a7
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
redis.c
View File

@ -9365,7 +9365,15 @@ static void freeIOJob(iojob *j) {
/* Every time a thread finished a Job, it writes a byte into the write side /* Every time a thread finished a Job, it writes a byte into the write side
* of an unix pipe in order to "awake" the main thread, and this function * of an unix pipe in order to "awake" the main thread, and this function
* is called. */ * is called.
*
* Note that this is called both by the event loop, when a I/O thread
* sends a byte in the notification pipe, and is also directly called from
* waitEmptyIOJobsQueue().
*
* In the latter case we don't want to swap more, so we use the
* "privdata" argument setting it to a not NULL value to signal this
* condition. */
static void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata, static void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata,
int mask) int mask)
{ {
@ -9375,6 +9383,8 @@ static void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata,
REDIS_NOTUSED(mask); REDIS_NOTUSED(mask);
REDIS_NOTUSED(privdata); REDIS_NOTUSED(privdata);
if (privdata == NULL) trytoswap = 0; /* check the comments above... */
/* For every byte we read in the read side of the pipe, there is one /* For every byte we read in the read side of the pipe, there is one
* I/O job completed to process. */ * I/O job completed to process. */
while((retval = read(fd,buf,1)) == 1) { while((retval = read(fd,buf,1)) == 1) {
@ -9684,7 +9694,8 @@ static void waitEmptyIOJobsQueue(void) {
io_processed_len = listLength(server.io_processed); io_processed_len = listLength(server.io_processed);
unlockThreadedIO(); unlockThreadedIO();
if (io_processed_len) { if (io_processed_len) {
vmThreadedIOCompletedJob(NULL,server.io_ready_pipe_read,NULL,0); vmThreadedIOCompletedJob(NULL,server.io_ready_pipe_read,
(void*)0xdeadbeef,0);
usleep(1000); /* 1 millisecond */ usleep(1000); /* 1 millisecond */
} else { } else {
usleep(10000); /* 10 milliseconds */ usleep(10000); /* 10 milliseconds */