Merge pull request #2612 from rbberger/small_fixes

Use mallinfo2 with glibc >= 2.33
This commit is contained in:
Axel Kohlmeyer
2021-02-19 18:29:17 -05:00
committed by GitHub

View File

@ -1449,8 +1449,13 @@ void Info::get_memory_info(double *meminfo)
meminfo[2] = (double)pmc.PeakWorkingSetSize/1048576.0;
#else
#if defined(__linux__)
#if defined(__GLIBC__) && __GLIBC_PREREQ(2, 33)
struct mallinfo2 mi;
mi = mallinfo2();
#else
struct mallinfo mi;
mi = mallinfo();
#endif
meminfo[1] = (double)mi.uordblks/1048576.0+(double)mi.hblkhd/1048576.0;
#endif
struct rusage ru;