diff options
| author | Stefan Boberg <[email protected]> | 2023-05-15 20:27:50 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2023-05-15 20:27:50 +0200 |
| commit | 7414bea09034c8a901a0c3525f1836a6c4eebbe7 (patch) | |
| tree | ab6a10ee86a9ca045292f2f5d11516eb854e1c0c /src | |
| parent | added IoBuffer.mmap test case (diff) | |
| download | zen-7414bea09034c8a901a0c3525f1836a6c4eebbe7.tar.xz zen-7414bea09034c8a901a0c3525f1836a6c4eebbe7.zip | |
brought over minor IoBuffer changes from sb/scrub
no actual code changes, just comments
Diffstat (limited to 'src')
| -rw-r--r-- | src/zencore/include/zencore/iobuffer.h | 2 | ||||
| -rw-r--r-- | src/zencore/iobuffer.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/zencore/include/zencore/iobuffer.h b/src/zencore/include/zencore/iobuffer.h index a39dbf6d6..49f9f9e2c 100644 --- a/src/zencore/include/zencore/iobuffer.h +++ b/src/zencore/include/zencore/iobuffer.h @@ -411,6 +411,8 @@ public: ZENCORE_API static IoBuffer MakeFromFile(const std::filesystem::path& FileName, uint64_t Offset = 0, uint64_t Size = ~0ull); ZENCORE_API static IoBuffer MakeFromTemporaryFile(const std::filesystem::path& FileName); ZENCORE_API static IoBuffer MakeFromFileHandle(void* FileHandle, uint64_t Offset = 0, uint64_t Size = ~0ull); + /** Make sure buffer data is memory resident, but avoid memory mapping data from files + */ ZENCORE_API static IoBuffer ReadFromFileMaybe(IoBuffer& InBuffer); inline static IoBuffer MakeCloneFromMemory(const void* Ptr, size_t Sz) { return IoBuffer(IoBuffer::Clone, Ptr, Sz); } inline static IoBuffer MakeCloneFromMemory(MemoryView Memory) { return IoBuffer(IoBuffer::Clone, Memory.GetData(), Memory.GetSize()); } diff --git a/src/zencore/iobuffer.cpp b/src/zencore/iobuffer.cpp index 6a4b56be6..f0eba80ed 100644 --- a/src/zencore/iobuffer.cpp +++ b/src/zencore/iobuffer.cpp @@ -707,6 +707,7 @@ TEST_CASE("IoBuffer.mmap") } # endif } + #endif } // namespace zen |