openharmony/ark_runtime_core
1
0
Fork 0
mirror of https://github.com/openharmony/ark_runtime_core.git synced 2026-07-18 10:18:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

!56 replace deprecated libc API mallinfo with mallinfo2

Browse Source 
Merge pull request !56 from stesen/master
This commit is contained in:
openharmony_ci
2022-01-04 01:37:15 +00:00
committed by Gitee
parent dcb7313cb2 b16d1e5b01
commit 9a6794b08f
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libpandabase/os/unix/mem.cpp
+14 -1
View File
@@ -260,14 +260,27 @@ size_t GetNativeBytesFromMallinfo()
LOG(INFO, RUNTIME) << "Get native bytes from mallinfo with ASAN or TSAN. Return default value";
#else
#if defined(__GLIBC__) || defined(PANDA_TARGET_MOBILE)
struct mallinfo info = mallinfo();
// For GLIBC, uordblks is total size of space which is allocated by malloc
// For MOBILE_LIBC, uordblks is total size of space which is allocated by malloc or mmap called by malloc for
// non-small allocations
#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 33
struct mallinfo2 info = mallinfo2();
mallinfo_bytes = info.uordblks;
#else
struct mallinfo info = mallinfo();
mallinfo_bytes = static_cast<unsigned int>(info.uordblks);
#endif // __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 33
#if defined(__GLIBC__)
// For GLIBC, hblkhd is total size of space which is allocated by mmap called by malloc for non-small allocations
#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 33
mallinfo_bytes += info.hblkhd;
#else
mallinfo_bytes += static_cast<unsigned int>(info.hblkhd);
#endif // __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 33
#endif // __GLIBC__
#else
mallinfo_bytes = DEFAULT_NATIVE_BYTES_FROM_MALLINFO;