-
Notifications
You must be signed in to change notification settings - Fork 0
Pageable Buffer v0 #56
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
3fcaf45
d49e214
c3e3d59
ed3c90f
3b691f9
2d16029
dbc81c4
4ecc675
71e8ad7
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| // Copyright 2025 Autodesk, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| #pragma once | ||
|
|
||
| #include <hvt/api.h> | ||
| #include <hvt/pageableBuffer/pageableMemoryMonitor.h> // Constants | ||
|
|
||
| #include <cstddef> | ||
| #include <filesystem> | ||
| #include <fstream> | ||
| #include <mutex> | ||
| #include <string> | ||
| #include <vector> | ||
|
|
||
| namespace HVT_NS | ||
| { | ||
|
|
||
| class HdBufferPageHandle; | ||
DDoS marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| struct HVT_API HdFreeListEntry | ||
| { | ||
| std::ptrdiff_t offset = 0; | ||
| size_t size = 0; | ||
|
|
||
| HdFreeListEntry() = default; | ||
| HdFreeListEntry(std::ptrdiff_t offset, size_t size) : offset(offset), size(size) {} | ||
| }; | ||
|
|
||
| class HVT_API HdPageFileEntry | ||
| { | ||
| public: | ||
| HdPageFileEntry(const std::string& filename, size_t pageId); | ||
| ~HdPageFileEntry(); | ||
|
|
||
| std::ptrdiff_t FindPageFileGap(size_t size); | ||
| size_t NextOffset() const { return mNextOffset; } | ||
| bool SetNextOffset(std::ptrdiff_t offset); | ||
| void AddFreeListEntry(std::ptrdiff_t offset, size_t size); | ||
| void ConsolidateFreeList(); | ||
|
|
||
| size_t PageFileId() const { return mPageId; } | ||
| size_t SizeLimit() const { return mSizeLimit; } | ||
| const std::string& FileName() const { return mFileName; } | ||
|
|
||
| bool WriteData(std::ptrdiff_t offset, const void* data, size_t size); | ||
| bool ReadData(std::ptrdiff_t offset, void* data, size_t size); | ||
|
|
||
| private: | ||
| const std::string mFileName; | ||
| const size_t mPageId; | ||
| const size_t mSizeLimit; | ||
| std::ptrdiff_t mNextOffset = 0; | ||
| std::vector<HdFreeListEntry> mFreeList; | ||
| bool mFreeListConsolidated = true; | ||
| mutable std::mutex mFileMutex; | ||
| }; | ||
|
|
||
| class HVT_API HdPageFileManager | ||
| { | ||
| public: | ||
| ~HdPageFileManager(); | ||
|
|
||
| std::unique_ptr<HdBufferPageHandle> CreatePageHandle(const void* data, size_t size); | ||
| bool LoadPage(const HdBufferPageHandle& handle, void* data); | ||
| bool UpdatePage(const HdBufferPageHandle& handle, const void* data); | ||
| void DeletePage(const HdBufferPageHandle& handle); | ||
|
|
||
| size_t GetTotalDiskUsage() const; | ||
| void PrintPagerStats() const; | ||
|
|
||
| static constexpr size_t MAX_PAGE_FILE_SIZE = static_cast<size_t>(1.8) * ONE_GiB; | ||
|
|
||
| private: | ||
| // By design, only HdPageableBufferManager can create and hold it. | ||
| HdPageFileManager(std::filesystem::path pageFileDirectory); | ||
|
|
||
| // Disable copy and move | ||
| HdPageFileManager(const HdPageFileManager&) = delete; | ||
| HdPageFileManager(HdPageFileManager&&) = delete; | ||
|
|
||
| HdPageFileEntry* GetCurrentPageFileEntry() const; | ||
| bool CreatePageFile(); | ||
|
|
||
| std::vector<std::unique_ptr<HdPageFileEntry>> mPageFileEntries; | ||
| mutable std::mutex mSyncMutex; | ||
|
|
||
| std::filesystem::path mPageFileDirectory = | ||
| std::filesystem::temp_directory_path() / "hvt_temp_pages"; | ||
|
|
||
| template <typename, typename> | ||
| friend class HdPageableBufferManager; | ||
| }; | ||
|
|
||
| } // namespace HVT_NS | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,221 @@ | ||
| // Copyright 2025 Autodesk, Inc. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| #pragma once | ||
|
|
||
| #include <hvt/api.h> | ||
| #include <hvt/pageableBuffer/pageableConcepts.h> | ||
|
|
||
| #include <pxr/pxr.h> | ||
| #include <pxr/base/tf/span.h> | ||
| #include <pxr/usd/sdf/path.h> | ||
|
|
||
| #include <compare> | ||
| #include <cstddef> | ||
| #include <functional> | ||
| #include <memory> | ||
|
|
||
| namespace HVT_NS | ||
| { | ||
|
|
||
| // Forward declarations | ||
| class HdPageFileManager; | ||
| class HdMemoryMonitor; | ||
|
|
||
| template < | ||
| #if defined(__cpp_concepts) | ||
| HdPagingConcepts::PagingStrategyLike PagingStrategyType, | ||
| HdPagingConcepts::BufferSelectionStrategyLike BufferSelectionStrategyType | ||
| #else | ||
| typename PagingStrategyType, typename BufferSelectionStrategyType | ||
| #endif | ||
| > | ||
| class HdPageableBufferManager; | ||
|
|
||
| enum class HVT_API HdBufferState | ||
| { | ||
| Unknown = 0, ///< Initial state | ||
| SceneBuffer = 1 << 0, ///< Data in the scene | ||
| RendererBuffer = 1 << 1, ///< Data in renderer | ||
| DiskBuffer = 1 << 2, ///< Data in disk | ||
| }; | ||
|
|
||
| enum class HVT_API HdBufferUsage | ||
| { | ||
| Static, ///< Immutable data, will be paged if possible | ||
| Dynamic ///< Mutable data, will be paged if necessary | ||
| }; | ||
|
|
||
| class HVT_API HdBufferPageHandle | ||
| { | ||
| public: | ||
| constexpr HdBufferPageHandle(size_t pageId, size_t size, std::ptrdiff_t offset) noexcept : | ||
| mPageId(pageId), mSize(size), mOffset(offset) | ||
| { | ||
| } | ||
|
|
||
| constexpr size_t PageId() const noexcept { return mPageId; } | ||
| constexpr size_t Size() const noexcept { return mSize; } | ||
| constexpr std::ptrdiff_t Offset() const noexcept { return mOffset; } | ||
| constexpr bool IsValid() const noexcept { return mOffset != static_cast<std::ptrdiff_t>(-1); } | ||
|
|
||
| // Comparison operators | ||
| bool operator!=(const HdBufferPageHandle& other) const noexcept | ||
| { | ||
| return mPageId != other.mPageId || mOffset != other.mOffset || mSize != other.mSize; | ||
| } | ||
|
|
||
| bool operator==(const HdBufferPageHandle& other) const noexcept { return !(*this != other); } | ||
|
|
||
| bool operator<(const HdBufferPageHandle& other) const noexcept | ||
| { | ||
| if (mPageId != other.mPageId) | ||
| return mPageId < other.mPageId; | ||
| if (mOffset != other.mOffset) | ||
| return mOffset < other.mOffset; | ||
| return mSize < other.mSize; | ||
| } | ||
|
|
||
| bool operator>(const HdBufferPageHandle& other) const noexcept { return other < *this; } | ||
|
|
||
| bool operator<=(const HdBufferPageHandle& other) const noexcept { return !(other < *this); } | ||
|
|
||
| bool operator>=(const HdBufferPageHandle& other) const noexcept { return !(*this < other); } | ||
|
|
||
| private: | ||
| const size_t mPageId; | ||
| const size_t mSize; | ||
| const std::ptrdiff_t mOffset; | ||
| }; | ||
|
|
||
| // NOTE: Implementation should maintain data consistency. | ||
| // For example, once data is swapped out to disk, it's immutable. And if user want to READ/WRITE the | ||
| // data in any case, the buffer should be paged back. | ||
| class HVT_API HdPageableBufferBase | ||
| { | ||
| public: | ||
| using DestructionCallback = std::function<void(const PXR_NS::SdfPath&)>; | ||
| virtual ~HdPageableBufferBase(); | ||
|
|
||
| // Resource management between Scene, Renderer and disk. ////////////////// | ||
| // Page: Create new buffer and fill data. Keep the source buffer. | ||
| [[nodiscard]] virtual bool PageToSceneMemory(bool force = false); | ||
| [[nodiscard]] virtual bool PageToRendererMemory(bool force = false); | ||
| [[nodiscard]] virtual bool PageToDisk(bool force = false); | ||
|
|
||
| // Swap: Create new buffer and fill data. Release the source buffer. | ||
| [[nodiscard]] virtual bool SwapSceneToDisk(bool force = false, | ||
| HdBufferState releaseBuffer = static_cast<HdBufferState>( | ||
| static_cast<int>(HdBufferState::SceneBuffer) | | ||
| static_cast<int>(HdBufferState::RendererBuffer))); | ||
| [[nodiscard]] virtual bool SwapRendererToDisk(bool force = false, | ||
| HdBufferState releaseBuffer = static_cast<HdBufferState>( | ||
| static_cast<int>(HdBufferState::SceneBuffer) | | ||
| static_cast<int>(HdBufferState::RendererBuffer))); | ||
| // clang-format off | ||
| [[nodiscard]] virtual bool SwapToSceneMemory(bool force = false, | ||
| HdBufferState releaseBuffer = static_cast<HdBufferState>( | ||
| static_cast<int>(HdBufferState::RendererBuffer) | | ||
| static_cast<int>(HdBufferState::DiskBuffer))); | ||
| [[nodiscard]] virtual bool SwapToRendererMemory(bool force = false, | ||
| HdBufferState releaseBuffer = static_cast<HdBufferState>( | ||
| static_cast<int>(HdBufferState::SceneBuffer) | | ||
| static_cast<int>(HdBufferState::DiskBuffer))); | ||
| // clang-format on | ||
|
|
||
| // Core operation sets: Release. ////////////////////////////////////////// | ||
| // Release: Release the source buffer and update the state. | ||
| virtual void ReleaseSceneBuffer() noexcept; | ||
| virtual void ReleaseRendererBuffer() noexcept; | ||
| virtual void ReleaseDiskPage() noexcept; | ||
|
|
||
| // Get memory as spans for safe access | ||
| [[nodiscard]] virtual PXR_NS::TfSpan<const std::byte> GetSceneMemorySpan() const noexcept; | ||
| [[nodiscard]] virtual PXR_NS::TfSpan<std::byte> GetSceneMemorySpan() noexcept; | ||
| [[nodiscard]] virtual PXR_NS::TfSpan<const std::byte> GetRendererMemorySpan() const noexcept; | ||
| [[nodiscard]] virtual PXR_NS::TfSpan<std::byte> GetRendererMemorySpan() noexcept; | ||
|
|
||
| // Properties | ||
| [[nodiscard]] constexpr const PXR_NS::SdfPath& Path() const noexcept { return mPath; } | ||
| [[nodiscard]] constexpr size_t Size() const noexcept { return mSize; } | ||
| void SetSize(size_t size) noexcept { mSize = size; } | ||
| [[nodiscard]] constexpr HdBufferUsage Usage() const noexcept { return mUsage; } | ||
| [[nodiscard]] constexpr HdBufferState GetBufferState() const noexcept { return mBufferState; } | ||
|
|
||
| [[nodiscard]] constexpr int FrameStamp() const noexcept { return mFrameStamp; } | ||
| void UpdateFrameStamp(int frame) noexcept { mFrameStamp = frame; } | ||
|
|
||
| // Status | ||
| [[nodiscard]] constexpr bool IsOverAge(int currentFrame, int ageLimit) const noexcept | ||
| { | ||
| return (currentFrame - mFrameStamp) > ageLimit; | ||
| } | ||
| [[nodiscard]] bool HasValidDiskBuffer() const noexcept | ||
| { | ||
| return mPageHandle && mPageHandle->IsValid(); | ||
| } | ||
| [[nodiscard]] constexpr bool HasSceneBuffer() const noexcept | ||
| { | ||
| return (static_cast<int>(mBufferState) & static_cast<int>(HdBufferState::SceneBuffer)); | ||
| } | ||
| [[nodiscard]] constexpr bool HasRendererBuffer() const noexcept | ||
| { | ||
| return (static_cast<int>(mBufferState) & static_cast<int>(HdBufferState::RendererBuffer)); | ||
| } | ||
| [[nodiscard]] constexpr bool HasDiskBuffer() const noexcept | ||
| { | ||
| return (static_cast<int>(mBufferState) & static_cast<int>(HdBufferState::DiskBuffer)); | ||
| } | ||
|
|
||
| protected: | ||
| // By design, only HdPageableBufferManager can create buffers. | ||
| HdPageableBufferBase(const PXR_NS::SdfPath& path, size_t size, HdBufferUsage usage, | ||
| const std::unique_ptr<HdPageFileManager>& pageFileManager, | ||
| const std::unique_ptr<HdMemoryMonitor>& memoryMonitor, | ||
| DestructionCallback destructionCallback); | ||
|
|
||
| // Core operation sets: Creation. ///////////////////////////////////////// | ||
| // Create: Create a new buffer and update the state. No data is copied. | ||
| virtual void CreateSceneBuffer(); | ||
| virtual void CreateRendererBuffer(); | ||
|
|
||
| // Helper to create aligned memory span | ||
| template <typename T = std::byte> | ||
| [[nodiscard]] constexpr PXR_NS::TfSpan<T> MakeSpan( | ||
| std::unique_ptr<T[]>& ptr, size_t size) const noexcept | ||
| { | ||
| return ptr ? PXR_NS::TfSpan<T>(ptr.get(), size) : PXR_NS::TfSpan<T> {}; | ||
| } | ||
|
|
||
| template <typename, typename> | ||
| friend class HdPageableBufferManager; | ||
|
|
||
| const PXR_NS::SdfPath mPath; // TODO: really need to hold??? | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can we resolve this TODO before merging?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. All of these
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove them before merging, and for more serious stuff open an issue for later. |
||
| const HdBufferUsage mUsage; | ||
|
|
||
| size_t mSize = 0; | ||
| HdBufferState mBufferState = HdBufferState::Unknown; | ||
| int mFrameStamp = 0; // Frame stamp for age tracking | ||
|
|
||
| // Page handle for disk storage | ||
| std::unique_ptr<HdBufferPageHandle> mPageHandle; | ||
|
|
||
| // Destruction callback to notify BufferManager (and avoid cycle ref) | ||
| DestructionCallback mDestructionCallback; | ||
|
|
||
| // Accessor to PageFileManager & MemoryMonitor | ||
| std::unique_ptr<HdPageFileManager>& mPageFileManager; | ||
| std::unique_ptr<HdMemoryMonitor>& mMemoryMonitor; | ||
| }; | ||
|
|
||
| } // namespace HVT_NS | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Minor: you're not supposed to include project headers with
<>. Instead you use""to prioritize local directories over system directories. You only use it for external dependencies.Same for the other files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, but I changed it for alignment with other modules in hvt. @hodoulp do you have any idea why we use
<>instead of""?