Dp redblack#5103
Merged
LeStarch merged 9 commits intonasa:develfrom May 6, 2026
Merged
Conversation
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| this->m_xmitInProgress = false; | ||
| return nullptr; | ||
| // Build file name based on the found entry | ||
| this->m_currXmitFileName.format(DP_FILENAME_FORMAT, this->m_directories[entry.dir].toChar(), entry.record.get_id(), |
| entry.record.get_tSec(), entry.record.get_tSub()); | ||
| this->log_ACTIVITY_LO_SendingProduct(this->m_currXmitFileName, static_cast<U32>(entry.record.get_size()), | ||
| entry.record.get_priority()); | ||
| Svc::SendFileResponse resp = this->fileOut_out(0, this->m_currXmitFileName, this->m_currXmitFileName, 0, 0); |
| } else { | ||
| this->m_currentNode = this->m_currentNode->parent; | ||
| } | ||
| // Get the entry |
| bool DpCatalog::insertEntry(DpStateEntry& entry) { | ||
| // Insert into the RedBlackTreeSet | ||
| // The tree maintains sorting by priority, time, and ID via DpStateEntry comparison operators | ||
| Fw::Success status = this->m_dpCatalog.insert(entry); |
| this->m_currentNode = this->m_currentNode->parent; | ||
| } | ||
| // Get the entry | ||
| entry = *iter; |
| this->m_currentNode = this->m_currentNode->parent; | ||
| } | ||
| // Get the entry | ||
| entry = *iter; |
| // start back at the top | ||
| if (this->m_currentNode == nullptr) { | ||
| this->m_currentNode = this->m_dpTree; | ||
| bool DpCatalog::findNextEntry(DpStateEntry& entry) { |
LeStarch
requested changes
May 5, 2026
LeStarch
previously approved these changes
May 5, 2026
Collaborator
|
Note: there are some failing seeds. I am collecting them in issue #5104 |
Comment out the random seed initialization for tests.
LeStarch
approved these changes
May 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Change Description
Switches the tree data structure from the local binary tree to the F Prime Red-Black tree.
Rationale
Consolidate the data structure so we don't have to maintain or understand multiple implementations.
Testing/Review Recommendations
Unit tests pass, need to double-check them for coverage.
Future Work
Various other features once this is in place.
AI Usage (see policy)
Claude was used to update the data structure and usage, and to update unit tests.