Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpiutil] Update MappedFileRegion MapMode enum to all caps

Browse Source
This commit is contained in:
Peter Johnson
2026-03-16 23:58:55 -07:00
parent c5e32652f9
commit 410c11994e
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wpiutil/src/main/native/cpp/MappedFileRegion.cpp
View File

@@ -39,8 +39,8 @@ MappedFileRegion::MappedFileRegion(fs::file_t f, uint64_t length,
}
HANDLE fileMappingHandle = ::CreateFileMappingW(
f, 0, mapMode == kReadOnly ? PAGE_READONLY : PAGE_READWRITE, length >> 32,
length & 0xffffffff, 0);
f, 0, mapMode == MapMode::READ_ONLY ? PAGE_READONLY : PAGE_READWRITE,
length >> 32, length & 0xffffffff, 0);
if (fileMappingHandle == nullptr) {
ec = wpi::util::mapWindowsError(GetLastError());
return;
@@ -48,13 +48,13 @@ MappedFileRegion::MappedFileRegion(fs::file_t f, uint64_t length,
DWORD dwDesiredAccess = 0;
switch (mapMode) {
case kReadOnly:
case MapMode::READ_ONLY:
dwDesiredAccess = FILE_MAP_READ;
break;
case kReadWrite:
case MapMode::READ_WRITE:
dwDesiredAccess = FILE_MAP_WRITE;
break;
case kPriv:
case MapMode::PRIV:
dwDesiredAccess = FILE_MAP_WRITE | FILE_MAP_COPY;
break;
}
@@ -80,10 +80,10 @@ MappedFileRegion::MappedFileRegion(fs::file_t f, uint64_t length,
return;
}
#else
m_mapping =
::mmap(nullptr, length,
mapMode == kReadOnly ? PROT_READ : (PROT_READ | PROT_WRITE),
mapMode == kPriv ? MAP_PRIVATE : MAP_SHARED, f, offset);
m_mapping = ::mmap(
nullptr, length,
mapMode == MapMode::READ_ONLY ? PROT_READ : (PROT_READ | PROT_WRITE),
mapMode == MapMode::PRIV ? MAP_PRIVATE : MAP_SHARED, f, offset);
if (m_mapping == MAP_FAILED) {
ec = std::error_code(errno, std::generic_category());
m_mapping = nullptr;

8
wpiutil/src/main/native/include/wpi/util/MappedFileRegion.hpp
View File

@@ -22,10 +22,10 @@ namespace wpi::util {
class MappedFileRegion {
public:
enum MapMode {
kReadOnly, ///< May only access map via const_data as read only.
kReadWrite, ///< May access map via data and modify it. Written to path.
kPriv ///< May modify via data, but changes are lost on destruction.
enum class MapMode {
READ_ONLY, ///< May only access map via const_data as read only.
READ_WRITE, ///< May access map via data and modify it. Written to path.
PRIV ///< May modify via data, but changes are lost on destruction.
};
MappedFileRegion() = default;

12
wpiutil/src/main/native/thirdparty/llvm/cpp/llvm/MemoryBuffer.cpp vendored
View File

@@ -172,14 +172,14 @@ std::unique_ptr<MemoryBuffer> MemoryBuffer::GetFileSlice(
namespace {
template <typename MB>
constexpr auto kMapMode = MappedFileRegion::kReadOnly;
constexpr auto MAP_MODE = MappedFileRegion::MapMode::READ_ONLY;
template <>
constexpr auto kMapMode<MemoryBuffer> = MappedFileRegion::kReadOnly;
constexpr auto MAP_MODE<MemoryBuffer> = MappedFileRegion::MapMode::READ_ONLY;
template <>
constexpr auto kMapMode<WritableMemoryBuffer> = MappedFileRegion::kPriv;
constexpr auto MAP_MODE<WritableMemoryBuffer> = MappedFileRegion::MapMode::PRIV;
template <>
constexpr auto kMapMode<WriteThroughMemoryBuffer> =
MappedFileRegion::kReadWrite;
constexpr auto MAP_MODE<WriteThroughMemoryBuffer> =
MappedFileRegion::MapMode::READ_WRITE;
/// Memory maps a file descriptor using MappedFileRegion.
///
@@ -204,7 +204,7 @@ class MemoryBufferMMapFile : public MB {
MemoryBufferMMapFile(fs::file_t f, uint64_t len, uint64_t offset,
std::error_code& ec)
: m_mfr(f, getLegalMapSize(len, offset), getLegalMapOffset(offset),
kMapMode<MB>, ec) {
MAP_MODE<MB>, ec) {
if (!ec) {
const uint8_t* Start = getStart(len, offset);
MemoryBuffer::Init(Start, Start + len);