mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.pposix: Use mallinfo2() on glibc 2.33, fix #1649

Browse source
This commit is contained in:
Kim Alvefur 2022-01-06 18:56:06 +01:00
parent 8a97d634a4
commit d3bd9f9be5
1 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

17
util-src/pposix.c
View file

@ -728,26 +728,33 @@ static int lc_setenv(lua_State *L) {
#ifdef WITH_MALLINFO #ifdef WITH_MALLINFO
static int lc_meminfo(lua_State *L) { static int lc_meminfo(lua_State *L) {
#if __GLIBC_PREREQ(2, 33)
struct mallinfo2 info = mallinfo2();
#define MALLINFO_T size_t
#else
struct mallinfo info = mallinfo(); struct mallinfo info = mallinfo();
#define MALLINFO_T unsigned
#endif
lua_createtable(L, 0, 5); lua_createtable(L, 0, 5);
/* This is the total size of memory allocated with sbrk by malloc, in bytes. */ /* This is the total size of memory allocated with sbrk by malloc, in bytes. */
lua_pushinteger(L, (unsigned)info.arena); lua_pushinteger(L, (MALLINFO_T)info.arena);
lua_setfield(L, -2, "allocated"); lua_setfield(L, -2, "allocated");
/* This is the total size of memory allocated with mmap, in bytes. */ /* This is the total size of memory allocated with mmap, in bytes. */
lua_pushinteger(L, (unsigned)info.hblkhd); lua_pushinteger(L, (MALLINFO_T)info.hblkhd);
lua_setfield(L, -2, "allocated_mmap"); lua_setfield(L, -2, "allocated_mmap");
/* This is the total size of memory occupied by chunks handed out by malloc. */ /* This is the total size of memory occupied by chunks handed out by malloc. */
lua_pushinteger(L, (unsigned)info.uordblks); lua_pushinteger(L, (MALLINFO_T)info.uordblks);
lua_setfield(L, -2, "used"); lua_setfield(L, -2, "used");
/* This is the total size of memory occupied by free (not in use) chunks. */ /* This is the total size of memory occupied by free (not in use) chunks. */
lua_pushinteger(L, (unsigned)info.fordblks); lua_pushinteger(L, (MALLINFO_T)info.fordblks);
lua_setfield(L, -2, "unused"); lua_setfield(L, -2, "unused");
/* This is the size of the top-most releasable chunk that normally borders the /* This is the size of the top-most releasable chunk that normally borders the
end of the heap (i.e., the high end of the virtual address space's data segment). */ end of the heap (i.e., the high end of the virtual address space's data segment). */
lua_pushinteger(L, (unsigned)info.keepcost); lua_pushinteger(L, (MALLINFO_T)info.keepcost);
lua_setfield(L, -2, "returnable"); lua_setfield(L, -2, "returnable");
return 1; return 1;
} }
#undef MALLINFO_T
#endif #endif
/* /*