Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-13 12:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

avoid potentially expensive mallinfo() call if result won't be used

Browse source
This commit is contained in:
Vern Paxson 2024-03-10 12:40:30 -07:00 • committed by Tim Wojtulewicz
parent 5402f22d48
commit f88862f6ce
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/util.cc
View file

@ -2182,13 +2182,14 @@ void get_memory_usage(uint64_t* total, uint64_t* malloced) {
uint64_t ret_total; uint64_t ret_total;
#if defined(HAVE_MALLINFO2) || defined(HAVE_MALLINFO) #if defined(HAVE_MALLINFO2) || defined(HAVE_MALLINFO)
if ( malloced ) {
#ifdef HAVE_MALLINFO2 #ifdef HAVE_MALLINFO2
struct mallinfo2 mi = mallinfo2(); struct mallinfo2 mi = mallinfo2();
#else #else
struct mallinfo mi = mallinfo(); struct mallinfo mi = mallinfo();
#endif #endif
if ( malloced )
*malloced = mi.uordblks; *malloced = mi.uordblks;
}
#endif #endif
#ifdef HAVE_DARWIN #ifdef HAVE_DARWIN
@ -2207,6 +2208,8 @@ void get_memory_usage(uint64_t* total, uint64_t* malloced) {
ret_total = r.ru_maxrss * 1024; ret_total = r.ru_maxrss * 1024;
if ( malloced ) if ( malloced )
// This will overwrite any mallinfo[2] value from above, should
// be restructured to avoid unnecessary work.
*malloced = r.ru_ixrss * 1024; *malloced = r.ru_ixrss * 1024;
#endif #endif