This is an archive of the discontinued LLVM Phabricator instance.

Differential D110317

[Support] Fix mallinfo deprecation warning
AbandonedPublic

Authored by nextsilicon-itay-bookstein on Sep 23 2021, 3:29 AM.

Details

Reviewers
chandlerc
dblaikie
rnk
Summary

mallinfo is deprecated since glibc-2.33, attempt using malloc2
first if available.

Diff Detail

Event Timeline

nextsilicon-itay-bookstein created this revision.Sep 23 2021, 3:29 AM
Herald added subscribers: dexonsmith, hiraditya, mgorny. · View Herald TranscriptSep 23 2021, 3:29 AM
nextsilicon-itay-bookstein requested review of this revision.Sep 23 2021, 3:29 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 23 2021, 3:29 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B125310: Diff 374496.Sep 23 2021, 3:30 AM
nextsilicon-itay-bookstein abandoned this revision.Sep 23 2021, 3:33 AM

Was sure I checked upstream, but I didn't.

Revision Contents

PathSize
llvm/
cmake/
1 line
lib/
Support/
Unix/
8 lines

Diff 374496

llvm/cmake/config-ix.cmake

Show First 20 Lines • Show All 225 Lines • ▼ Show 20 Lines
# past the signal handler after an assertion failure (rdar://29866587). # past the signal handler after an assertion failure (rdar://29866587).
if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE ) if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE )
check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK) check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK)
endif() endif()
set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE") set(CMAKE_REQUIRED_DEFINITIONS "-D_LARGEFILE64_SOURCE")
check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64) check_symbol_exists(lseek64 "sys/types.h;unistd.h" HAVE_LSEEK64)
set(CMAKE_REQUIRED_DEFINITIONS "") set(CMAKE_REQUIRED_DEFINITIONS "")
check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL) check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL)
check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2)
check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO)
check_symbol_exists(malloc_zone_statistics malloc/malloc.h check_symbol_exists(malloc_zone_statistics malloc/malloc.h
HAVE_MALLOC_ZONE_STATISTICS) HAVE_MALLOC_ZONE_STATISTICS)
check_symbol_exists(getrlimit "sys/types.h;sys/time.h;sys/resource.h" HAVE_GETRLIMIT) check_symbol_exists(getrlimit "sys/types.h;sys/time.h;sys/resource.h" HAVE_GETRLIMIT)
check_symbol_exists(posix_spawn spawn.h HAVE_POSIX_SPAWN) check_symbol_exists(posix_spawn spawn.h HAVE_POSIX_SPAWN)
check_symbol_exists(pread unistd.h HAVE_PREAD) check_symbol_exists(pread unistd.h HAVE_PREAD)
check_symbol_exists(sbrk unistd.h HAVE_SBRK) check_symbol_exists(sbrk unistd.h HAVE_SBRK)
check_symbol_exists(strerror string.h HAVE_STRERROR) check_symbol_exists(strerror string.h HAVE_STRERROR)
▲ Show 20 Lines • Show All 436 Lines • Show Last 20 Lines

llvm/lib/Support/Unix/Process.inc

Show All 25 Lines
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif
#if HAVE_SIGNAL_H #if HAVE_SIGNAL_H
#include <signal.h> #include <signal.h>
#endif #endif
#if defined(HAVE_MALLINFO) #if defined(HAVE_MALLINFO2) || defined(HAVE_MALLINFO)
#include <malloc.h> #include <malloc.h>
#endif #endif
#if defined(HAVE_MALLCTL) #if defined(HAVE_MALLCTL)
#include <malloc_np.h> #include <malloc_np.h>
#endif #endif
#ifdef HAVE_MALLOC_MALLOC_H #ifdef HAVE_MALLOC_MALLOC_H
#include <malloc/malloc.h> #include <malloc/malloc.h>
#endif #endif
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines
#endif #endif
if (page_size == -1) if (page_size == -1)
return errorCodeToError(std::error_code(errno, std::generic_category())); return errorCodeToError(std::error_code(errno, std::generic_category()));
return static_cast<unsigned>(page_size); return static_cast<unsigned>(page_size);
} }
size_t Process::GetMallocUsage() { size_t Process::GetMallocUsage() {
#if defined(HAVE_MALLINFO) #if defined(HAVE_MALLINFO2)
struct mallinfo2 mi;
mi = ::mallinfo2();
return mi.uordblks;
#elif defined(HAVE_MALLINFO)
struct mallinfo mi; struct mallinfo mi;
mi = ::mallinfo(); mi = ::mallinfo();
return mi.uordblks; return mi.uordblks;
#elif defined(HAVE_MALLOC_ZONE_STATISTICS) && defined(HAVE_MALLOC_MALLOC_H) #elif defined(HAVE_MALLOC_ZONE_STATISTICS) && defined(HAVE_MALLOC_MALLOC_H)
malloc_statistics_t Stats; malloc_statistics_t Stats;
malloc_zone_statistics(malloc_default_zone(), &Stats); malloc_zone_statistics(malloc_default_zone(), &Stats);
return Stats.size_in_use; // darwin return Stats.size_in_use; // darwin
#elif defined(HAVE_MALLCTL) #elif defined(HAVE_MALLCTL)
▲ Show 20 Lines • Show All 357 Lines • Show Last 20 Lines