drew
/
acadia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[Zion] Store IPC capabilities in a vector rather than list.

This commit is contained in:
Drew Galbraith 2023-11-02 23:44:15 -07:00
parent 4c09a9d019
commit 59f147193a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zion/lib/message_queue.cpp
View File

@ -20,6 +20,7 @@ glcr::ErrorCode UnboundedMessageQueue::PushBack(
gScheduler->CurrentProcess().ReleaseCapability(reply_cap); gScheduler->CurrentProcess().ReleaseCapability(reply_cap);
} }
msg_struct->caps.Resize(caps.size());
for (uint64_t i = 0; i < caps.size(); i++) { for (uint64_t i = 0; i < caps.size(); i++) {
// FIXME: This would feel safer closer to the relevant syscall. // FIXME: This would feel safer closer to the relevant syscall.
// FIXME: Race conditions on get->check->release here. Would be better to // FIXME: Race conditions on get->check->release here. Would be better to
@ -90,7 +91,7 @@ glcr::ErrorCode UnboundedMessageQueue::PopFront(uint64_t* num_bytes,
*num_caps = next_msg->caps.size(); *num_caps = next_msg->caps.size();
for (uint64_t i = 0; i < *num_caps; i++) { for (uint64_t i = 0; i < *num_caps; i++) {
caps[i] = proc.AddExistingCapability(next_msg->caps.PopFront()); caps[i] = proc.AddExistingCapability(next_msg->caps[i]);
} }
return glcr::OK; return glcr::OK;
} }
@ -124,6 +125,7 @@ glcr::ErrorCode SingleMessageQueue::PushBack(
return glcr::INTERNAL; return glcr::INTERNAL;
} }
message_.caps.Resize(caps.size());
for (uint64_t i = 0; i < caps.size(); i++) { for (uint64_t i = 0; i < caps.size(); i++) {
// FIXME: This would feel safer closer to the relevant syscall. // FIXME: This would feel safer closer to the relevant syscall.
auto cap = gScheduler->CurrentProcess().GetCapability(caps[i]); auto cap = gScheduler->CurrentProcess().GetCapability(caps[i]);
@ -187,7 +189,7 @@ glcr::ErrorCode SingleMessageQueue::PopFront(uint64_t* num_bytes, void* bytes,
*num_caps = message_.caps.size(); *num_caps = message_.caps.size();
auto& proc = gScheduler->CurrentProcess(); auto& proc = gScheduler->CurrentProcess();
for (uint64_t i = 0; i < *num_caps; i++) { for (uint64_t i = 0; i < *num_caps; i++) {
caps[i] = proc.AddExistingCapability(message_.caps.PopFront()); caps[i] = proc.AddExistingCapability(message_.caps[i]);
} }
has_read_ = true; has_read_ = true;

3
zion/lib/message_queue.h
View File

@ -4,6 +4,7 @@
#include <glacier/container/array_view.h> #include <glacier/container/array_view.h>
#include <glacier/container/intrusive_list.h> #include <glacier/container/intrusive_list.h>
#include <glacier/container/linked_list.h> #include <glacier/container/linked_list.h>
#include <glacier/container/vector.h>
#include <glacier/memory/ref_ptr.h> #include <glacier/memory/ref_ptr.h>
#include <glacier/memory/shared_ptr.h> #include <glacier/memory/shared_ptr.h>
#include <glacier/status/error.h> #include <glacier/status/error.h>
@ -15,7 +16,7 @@
struct IpcMessage { struct IpcMessage {
glcr::Array<uint8_t> data; glcr::Array<uint8_t> data;
glcr::LinkedList<glcr::RefPtr<Capability>> caps; glcr::Vector<glcr::RefPtr<Capability>> caps;
glcr::RefPtr<Capability> reply_cap; glcr::RefPtr<Capability> reply_cap;
}; };