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
92e28228
Commit
92e28228
authored
Nov 02, 2010
by
antirez
Browse files
zmalloc functions to get RSS and fragmentation refactored into two separated functions
parent
21dbc649
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/zmalloc.c
View file @
92e28228
...
...
@@ -183,7 +183,15 @@ void zmalloc_enable_thread_safeness(void) {
zmalloc_thread_safe
=
1
;
}
/* Fragmentation = RSS / allocated-bytes */
/* Get the RSS information in an OS-specific way.
*
* WARNING: the function zmalloc_get_rss() is not designed to be fast
* and may not be called in the busy loops where Redis tries to release
* memory expiring or swapping out objects.
*
* For this kind of "fast RSS reporting" usages use instead the
* function RedisEstimateRSS() that is a much faster (and less precise)
* version of the funciton. */
#if defined(HAVE_PROCFS)
#include <unistd.h>
...
...
@@ -191,8 +199,7 @@ void zmalloc_enable_thread_safeness(void) {
#include <sys/stat.h>
#include <fcntl.h>
float
zmalloc_get_fragmentation_ratio
(
void
)
{
size_t
allocated
=
zmalloc_used_memory
();
size_t
zmalloc_get_rss
(
void
)
{
int
page
=
sysconf
(
_SC_PAGESIZE
);
size_t
rss
;
char
buf
[
4096
];
...
...
@@ -221,7 +228,7 @@ float zmalloc_get_fragmentation_ratio(void) {
rss
=
strtoll
(
p
,
NULL
,
10
);
rss
*=
page
;
return
(
float
)
rss
/
allocated
;
return
rss
;
}
#elif defined(HAVE_TASKINFO)
#include <unistd.h>
...
...
@@ -232,7 +239,7 @@ float zmalloc_get_fragmentation_ratio(void) {
#include <mach/task.h>
#include <mach/mach_init.h>
floa
t
zmalloc_get_
fragmentation_ratio
(
void
)
{
size_
t
zmalloc_get_
rss
(
void
)
{
task_t
task
=
MACH_PORT_NULL
;
struct
task_basic_info
t_info
;
mach_msg_type_number_t
t_info_count
=
TASK_BASIC_INFO_COUNT
;
...
...
@@ -241,10 +248,20 @@ float zmalloc_get_fragmentation_ratio(void) {
return
0
;
task_info
(
task
,
TASK_BASIC_INFO
,
(
task_info_t
)
&
t_info
,
&
t_info_count
);
return
(
float
)
t_info
.
resident_size
/
zmalloc_used_memory
()
;
return
t_info
.
resident_size
;
}
#else
float
zmalloc_get_fragmentation_ratio
(
void
)
{
return
0
;
float
zmalloc_get_rss
(
void
)
{
/* If we can't get the RSS in an OS-specific way for this system just
* return the memory usage we estimated in zmalloc()..
*
* Fragmentation will appear to be always 1 (no fragmentation)
* of course... */
return
zmalloc_used_memory
();
}
#endif
/* Fragmentation = RSS / allocated-bytes */
float
zmalloc_get_fragmentation_ratio
(
void
)
{
return
(
float
)
zmalloc_get_rss
()
/
zmalloc_used_memory
();
}
src/zmalloc.h
View file @
92e28228
...
...
@@ -39,5 +39,6 @@ char *zstrdup(const char *s);
size_t
zmalloc_used_memory
(
void
);
void
zmalloc_enable_thread_safeness
(
void
);
float
zmalloc_get_fragmentation_ratio
(
void
);
size_t
zmalloc_get_rss
(
void
);
#endif
/* _ZMALLOC_H */
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