Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
7caf0591
Commit
7caf0591
authored
Sep 03, 2010
by
antirez
Browse files
Fix for bug 312 (VM bug) backported from master
parent
eaaf62f6
Changes
1
Hide whitespace changes
Inline
Side-by-side
redis.c
View file @
7caf0591
...
@@ -9365,7 +9365,15 @@ static void freeIOJob(iojob *j) {
...
@@ -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,
...
@@ -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) {
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment