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

Further polishing and cleanup in preparation for merge.

Browse source
This commit is contained in:
Robin Sommer 2014-07-12 18:12:09 -07:00
parent aeb8e71e8c
commit 9616cd8e61
15 changed files with 79 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/util.cc
View file

@ -1626,7 +1626,6 @@ void get_memory_usage(unsigned int* total, unsigned int* malloced)
unsigned int ret_total;
#ifdef HAVE_MALLINFO
// For memory, getrusage() gives bogus results on Linux. Grmpf.
struct mallinfo mi = mallinfo();
if ( malloced )
@ -1637,7 +1636,7 @@ void get_memory_usage(unsigned int* total, unsigned int* malloced)
struct rusage r;
getrusage(RUSAGE_SELF, &r);
// At least on FreeBSD it's in KB.
// In KB.
ret_total = r.ru_maxrss * 1024;
if ( total )