This is an archive of the discontinued LLVM Phabricator instance.

Differential D119856

[Support] Use posix_madvise() if available
ClosedPublic

Authored by nikic on Feb 15 2022, 9:17 AM.

Details

Reviewers
joerg
ro
MaskRay
Commits
rGb66b3247f598: [Support] Use posix_madvise() if available
Summary

This is a followup to D119695 using the suggestion by @joerg. Rather than manually declaring madvise() on __sun__, this uses posix_madvise() if available, which does get declared properly on Illumos.

Diff Detail

Event Timeline

nikic created this revision.Feb 15 2022, 9:17 AM
Herald added subscribers: dexonsmith, hiraditya, fedor.sergeev, krytarowski. · View Herald TranscriptFeb 15 2022, 9:17 AM
nikic requested review of this revision.Feb 15 2022, 9:17 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 15 2022, 9:17 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
MaskRay accepted this revision.Feb 15 2022, 9:18 AM

Looks great!

This revision is now accepted and ready to land.Feb 15 2022, 9:18 AM
Harbormaster completed remote builds in B149730: Diff 408909.Feb 15 2022, 10:19 AM
This revision was landed with ongoing or failed builds.Feb 16 2022, 12:36 AM
Closed by commit rGb66b3247f598: [Support] Use posix_madvise() if available (authored by nikic). · Explain Why
This revision was automatically updated to reflect the committed changes.
nikic added a commit: rGb66b3247f598: [Support] Use posix_madvise() if available.

Revision Contents

PathSize
llvm/
lib/
Support/
Unix/
14 lines

Diff 409163

llvm/lib/Support/Unix/Path.inc

Show First 20 Lines • Show All 112 Lines • ▼ Show 20 Lines
#if defined(__NetBSD__) || defined(__DragonFly__) || defined(__GNU__) || \ #if defined(__NetBSD__) || defined(__DragonFly__) || defined(__GNU__) || \
defined(__MVS__) defined(__MVS__)
#define STATVFS_F_FLAG(vfs) (vfs).f_flag #define STATVFS_F_FLAG(vfs) (vfs).f_flag
#else #else
#define STATVFS_F_FLAG(vfs) (vfs).f_flags #define STATVFS_F_FLAG(vfs) (vfs).f_flags
#endif #endif
#if defined(__sun__) && defined(__svr4__)
// The madvise() declaration on Illumos cannot be made visible if _XOPEN_SOURCE
// is defined. This declaration is also compatible with Solaris 11.4.
extern "C" int madvise(void *, size_t, int);
#endif
using namespace llvm; using namespace llvm;
namespace llvm { namespace llvm {
namespace sys { namespace sys {
namespace fs { namespace fs {
const file_t kInvalidFile = -1; const file_t kInvalidFile = -1;
▲ Show 20 Lines • Show All 740 Lines • ▼ Show 20 Lines
void mapped_file_region::unmapImpl() { void mapped_file_region::unmapImpl() {
if (Mapping) if (Mapping)
::munmap(Mapping, Size); ::munmap(Mapping, Size);
} }
void mapped_file_region::dontNeedImpl() { void mapped_file_region::dontNeedImpl() {
assert(Mode == mapped_file_region::readonly); assert(Mode == mapped_file_region::readonly);
if (!Mapping)
return;
#if defined(__MVS__) || defined(_AIX) #if defined(__MVS__) || defined(_AIX)
// If we don't have madvise, or it isn't beneficial, treat this as a no-op. // If we don't have madvise, or it isn't beneficial, treat this as a no-op.
return; #elif defined(POSIX_MADV_DONTNEED)
::posix_madvise(Mapping, Size, POSIX_MADV_DONTNEED);
#else #else
if (Mapping)
::madvise(Mapping, Size, MADV_DONTNEED); ::madvise(Mapping, Size, MADV_DONTNEED);
#endif #endif
} }
int mapped_file_region::alignment() { int mapped_file_region::alignment() {
return Process::getPageSizeEstimate(); return Process::getPageSizeEstimate();
} }
std::error_code detail::directory_iterator_construct(detail::DirIterState &it, std::error_code detail::directory_iterator_construct(detail::DirIterState &it,
▲ Show 20 Lines • Show All 612 Lines • Show Last 20 Lines