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
d9fac6c0
Commit
d9fac6c0
authored
Mar 04, 2011
by
antirez
Browse files
possible fix for a failed assertion introduced with the latest diskstore speedup fix
parent
0b537972
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/dscache.c
View file @
d9fac6c0
...
@@ -325,8 +325,12 @@ void freeIOJob(iojob *j) {
...
@@ -325,8 +325,12 @@ void freeIOJob(iojob *j) {
* 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.
*
*
* If privdata != NULL the function will try to put more jobs in the queue
* If privdata == NULL the function will try to put more jobs in the queue
* of IO jobs to process as more room is made. */
* of IO jobs to process as more room is made. privdata is equal to NULL
* when the function is called from the event loop, so we want to push
* more IO jobs in the queue. Instead when the function is called by
* other functions that want to create a write-barrier to avoid race
* conditions we don't push new jobs in the queue. */
void
vmThreadedIOCompletedJob
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
void
vmThreadedIOCompletedJob
(
aeEventLoop
*
el
,
int
fd
,
void
*
privdata
,
int
mask
)
int
mask
)
{
{
...
@@ -392,7 +396,7 @@ void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata,
...
@@ -392,7 +396,7 @@ void vmThreadedIOCompletedJob(aeEventLoop *el, int fd, void *privdata,
freeIOJob
(
j
);
freeIOJob
(
j
);
}
}
processed
++
;
processed
++
;
if
(
privdata
!
=
NULL
)
cacheScheduleIOPushJobs
(
0
);
if
(
privdata
=
=
NULL
)
cacheScheduleIOPushJobs
(
0
);
if
(
processed
==
toprocess
)
return
;
if
(
processed
==
toprocess
)
return
;
}
}
if
(
retval
<
0
&&
errno
!=
EAGAIN
)
{
if
(
retval
<
0
&&
errno
!=
EAGAIN
)
{
...
...
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