mirror of
https://github.com/fluencelabs/redis
synced 2025-03-17 16:10:50 +00:00
Fix for bug 312, yet to verify in a couple of minutes...
This commit is contained in:
parent
09252fc4f3
commit
c1ae36aea8
15
src/vm.c
15
src/vm.c
@ -548,7 +548,15 @@ void freeIOJob(iojob *j) {
|
||||
|
||||
/* 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
|
||||
* 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. */
|
||||
void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata,
|
||||
int mask)
|
||||
{
|
||||
@ -558,6 +566,8 @@ void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata,
|
||||
REDIS_NOTUSED(mask);
|
||||
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
|
||||
* I/O job completed to process. */
|
||||
while((retval = read(fd,buf,1)) == 1) {
|
||||
@ -869,7 +879,8 @@ void waitEmptyIOJobsQueue(void) {
|
||||
io_processed_len = listLength(server.io_processed);
|
||||
unlockThreadedIO();
|
||||
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 */
|
||||
} else {
|
||||
usleep(10000); /* 10 milliseconds */
|
||||
|
Loading…
x
Reference in New Issue
Block a user