Skip to content

Implement Os::Queue::setRegistry #4648

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.

Sign up for GitHub

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

Open
jsmith212 wants to merge 3 commits into
base: devel
Choose a base branch
from
Open

Implement Os::Queue::setRegistry #4648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a365e21
fix(Os::Queue): implement Os::Queue::setRegistry
Jan 24, 2026
9a3cfd8
Merge branch 'devel' into fix/implement-os-queue-setregistry
jsmith212 Jan 28, 2026
c31552f
Add conditional compilation of registry to unit tests
jsmith212 Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions Os/Queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,11 @@
return s_mutex;
}

#if FW_QUEUE_REGISTRATION
void Queue::setRegistry(QueueRegistry* registry) {
ScopeLock lock(Queue::getStaticMutex());
Queue::s_queueRegistry = registry;
}
#endif

} // namespace Os
13 changes: 13 additions & 0 deletions Os/test/ut/queue/CommonTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@ U64 Tester::QueueMessage::order_counter = 0;

PriorityCompare const Tester::QueueMessageComparer::HELPER = PriorityCompare();

Tester::Tester() {
#if FW_QUEUE_REGISTRATION
Os::Queue::setRegistry(this);
#endif
}

Os::QueueInterface::Status Tester::shadow_create(FwSizeType depth, FwSizeType messageSize) {
Os::QueueInterface::Status status = Os::QueueInterface::ALREADY_CREATED;
if (not this->shadow.created) {
Expand Down Expand Up @@ -110,6 +116,10 @@ void Tester::shadow_receive_unblock() {
this->shadow.receive_block.priority = nullptr;
}

void Tester::registerQueue(Os::Queue* q) {
this->m_all_queues.push_back(q);
}

} // namespace Queue
} // namespace Test
} // namespace Os
Expand Down Expand Up @@ -229,6 +239,9 @@ TEST(BasicRules, Create) {
create_rule.action(tester);
// Repetitive create
create_rule.action(tester);
#if FW_QUEUE_REGISTRATION
EXPECT_GT(tester.m_all_queues.size(), 0) << "No queues were registered.";
#endif
}

TEST(BasicRules, Send) {
Expand Down
9 changes: 7 additions & 2 deletions Os/test/ut/queue/RulesHeaders.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ namespace Queue {

constexpr FwSizeType DEPTH_BOUND = 100000;

struct Tester {
struct Tester : public Os::QueueRegistry {
public:
//! Constructor
Tester() = default;
Tester();
virtual ~Tester() { queue.teardown(); };

struct QueueMessage {
Expand Down Expand Up @@ -72,6 +72,7 @@ struct Tester {
};
QueueState shadow;
Os::Queue queue;
std::vector<Os::Queue*> m_all_queues;

//! Shadow is created
bool is_shadow_created() const {
Expand Down Expand Up @@ -119,6 +120,10 @@ struct Tester {
//! Complete a previous blocking queue receive
void shadow_receive_unblock();


//! Register a queue with the registry
void registerQueue(Os::Queue* q) override;

public:
#include "QueueRules.hpp"
};
Expand Down
Loading