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
b3a86b82
Commit
b3a86b82
authored
Feb 15, 2012
by
antirez
Browse files
Fixed a few broken stuff introduced while merging issue #327 related code in 2.4
parent
31f9f987
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/redis.c
View file @
b3a86b82
...
@@ -1564,9 +1564,9 @@ int freeMemoryIfNeeded(void) {
...
@@ -1564,9 +1564,9 @@ int freeMemoryIfNeeded(void) {
mem_used
-=
obuf_bytes
;
mem_used
-=
obuf_bytes
;
}
}
}
}
if
(
server
.
a
of_state
!=
REDIS_AOF_OFF
)
{
if
(
server
.
a
ppendonly
)
{
mem_used
-=
sdslen
(
server
.
aof
_
buf
);
mem_used
-=
sdslen
(
server
.
aofbuf
);
mem_used
-=
sdslen
(
server
.
aof_
rewrite
_
buf
);
mem_used
-=
sdslen
(
server
.
bg
rewritebuf
);
}
}
/* Check if we are over the memory limit. */
/* Check if we are over the memory limit. */
...
...
src/redis.h
View file @
b3a86b82
...
@@ -716,6 +716,7 @@ void getClientsMaxBuffers(unsigned long *longest_output_list,
...
@@ -716,6 +716,7 @@ void getClientsMaxBuffers(unsigned long *longest_output_list,
sds
getClientInfoString
(
redisClient
*
client
);
sds
getClientInfoString
(
redisClient
*
client
);
sds
getAllClientsInfoString
(
void
);
sds
getAllClientsInfoString
(
void
);
void
rewriteClientCommandVector
(
redisClient
*
c
,
int
argc
,
...);
void
rewriteClientCommandVector
(
redisClient
*
c
,
int
argc
,
...);
unsigned
long
getClientOutputBufferMemoryUsage
(
redisClient
*
c
);
void
flushSlavesOutputBuffers
(
void
);
void
flushSlavesOutputBuffers
(
void
);
#ifdef __GNUC__
#ifdef __GNUC__
...
...
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