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
e5b5f9a2
Unverified
Commit
e5b5f9a2
authored
Dec 02, 2019
by
Salvatore Sanfilippo
Committed by
GitHub
Dec 02, 2019
Browse files
Merge pull request #6384 from devnexen/apple_smaps_impl
Getting region date per process in Darwin
parents
ce7ec725
5a8a0050
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/zmalloc.c
View file @
e5b5f9a2
...
@@ -427,7 +427,28 @@ size_t zmalloc_get_smap_bytes_by_field(char *field, long pid) {
...
@@ -427,7 +427,28 @@ size_t zmalloc_get_smap_bytes_by_field(char *field, long pid) {
return
bytes
;
return
bytes
;
}
}
#else
#else
/* Get sum of the specified field from libproc api call.
* As there are per page value basis we need to convert
* them accordingly.
*
* Note that AnonHugePages is a no-op as THP feature
* is not supported in this platform
*/
size_t
zmalloc_get_smap_bytes_by_field
(
char
*
field
,
long
pid
)
{
size_t
zmalloc_get_smap_bytes_by_field
(
char
*
field
,
long
pid
)
{
#if defined(__APPLE__)
struct
proc_regioninfo
pri
;
if
(
proc_pidinfo
(
pid
,
PROC_PIDREGIONINFO
,
0
,
&
pri
,
PROC_PIDREGIONINFO_SIZE
)
==
PROC_PIDREGIONINFO_SIZE
)
{
if
(
!
strcmp
(
field
,
"Private_Dirty:"
))
{
return
(
size_t
)
pri
.
pri_pages_dirtied
*
4096
;
}
else
if
(
!
strcmp
(
field
,
"Rss:"
))
{
return
(
size_t
)
pri
.
pri_pages_resident
*
4096
;
}
else
if
(
!
strcmp
(
field
,
"AnonHugePages:"
))
{
return
0
;
}
}
return
0
;
#endif
((
void
)
field
);
((
void
)
field
);
((
void
)
pid
);
((
void
)
pid
);
return
0
;
return
0
;
...
...
src/zmalloc.h
View file @
e5b5f9a2
...
@@ -57,6 +57,7 @@
...
@@ -57,6 +57,7 @@
#elif defined(__APPLE__)
#elif defined(__APPLE__)
#include <malloc/malloc.h>
#include <malloc/malloc.h>
#include <libproc.h>
#define HAVE_MALLOC_SIZE 1
#define HAVE_MALLOC_SIZE 1
#define zmalloc_size(p) malloc_size(p)
#define zmalloc_size(p) malloc_size(p)
#endif
#endif
...
...
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