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

[Zion] Move to a general IpcMessage object for Ipc.

This commit is contained in:
Drew Galbraith 2023-11-02 23:40:23 -07:00
parent 277b0d3ccc
commit 4c09a9d019
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
zion/lib/message_queue.cpp
View File

@ -11,8 +11,8 @@ glcr::ErrorCode UnboundedMessageQueue::PushBack(
return glcr::UNIMPLEMENTED; return glcr::UNIMPLEMENTED;
} }
auto msg_struct = glcr::MakeShared<Message>(); auto msg_struct = glcr::MakeShared<IpcMessage>();
msg_struct->message = glcr::Array<uint8_t>(message); msg_struct->data = glcr::Array<uint8_t>(message);
if (reply_cap != kZionInvalidCapability) { if (reply_cap != kZionInvalidCapability) {
// FIXME: We're just trusting that capability has the correct permissions. // FIXME: We're just trusting that capability has the correct permissions.
@ -64,7 +64,7 @@ glcr::ErrorCode UnboundedMessageQueue::PopFront(uint64_t* num_bytes,
MutexHolder lock(mutex_); MutexHolder lock(mutex_);
auto next_msg = pending_messages_.PeekFront(); auto next_msg = pending_messages_.PeekFront();
if (next_msg->message.size() > *num_bytes) { if (next_msg->data.size() > *num_bytes) {
return glcr::BUFFER_SIZE; return glcr::BUFFER_SIZE;
} }
if (next_msg->caps.size() > *num_caps) { if (next_msg->caps.size() > *num_caps) {
@ -73,10 +73,10 @@ glcr::ErrorCode UnboundedMessageQueue::PopFront(uint64_t* num_bytes,
next_msg = pending_messages_.PopFront(); next_msg = pending_messages_.PopFront();
*num_bytes = next_msg->message.size(); *num_bytes = next_msg->data.size();
for (uint64_t i = 0; i < *num_bytes; i++) { for (uint64_t i = 0; i < *num_bytes; i++) {
static_cast<uint8_t*>(bytes)[i] = next_msg->message[i]; static_cast<uint8_t*>(bytes)[i] = next_msg->data[i];
} }
auto& proc = gScheduler->CurrentProcess(); auto& proc = gScheduler->CurrentProcess();
@ -98,12 +98,12 @@ glcr::ErrorCode UnboundedMessageQueue::PopFront(uint64_t* num_bytes,
void UnboundedMessageQueue::WriteKernel(uint64_t init, void UnboundedMessageQueue::WriteKernel(uint64_t init,
glcr::RefPtr<Capability> cap) { glcr::RefPtr<Capability> cap) {
// FIXME: Add synchronization here in case it is ever used outside of init. // FIXME: Add synchronization here in case it is ever used outside of init.
auto msg = glcr::MakeShared<Message>(); auto msg = glcr::MakeShared<IpcMessage>();
msg->message = glcr::Array<uint8_t>(sizeof(init)); msg->data = glcr::Array<uint8_t>(sizeof(init));
uint8_t* data = reinterpret_cast<uint8_t*>(&init); uint8_t* data = reinterpret_cast<uint8_t*>(&init);
for (uint8_t i = 0; i < sizeof(init); i++) { for (uint8_t i = 0; i < sizeof(init); i++) {
msg->message[i] = data[i]; msg->data[i] = data[i];
} }
msg->caps.PushBack(cap); msg->caps.PushBack(cap);
@ -117,7 +117,7 @@ glcr::ErrorCode SingleMessageQueue::PushBack(
if (has_written_) { if (has_written_) {
return glcr::FAILED_PRECONDITION; return glcr::FAILED_PRECONDITION;
} }
message_ = message; message_.data = message;
if (reply_port != kZionInvalidCapability) { if (reply_port != kZionInvalidCapability) {
dbgln("Sent a reply port to a single message queue"); dbgln("Sent a reply port to a single message queue");
@ -134,7 +134,7 @@ glcr::ErrorCode SingleMessageQueue::PushBack(
return glcr::CAP_PERMISSION_DENIED; return glcr::CAP_PERMISSION_DENIED;
} }
cap = gScheduler->CurrentProcess().ReleaseCapability(caps[i]); cap = gScheduler->CurrentProcess().ReleaseCapability(caps[i]);
caps_.PushBack(cap); message_.caps.PushBack(cap);
} }
has_written_ = true; has_written_ = true;
@ -167,16 +167,16 @@ glcr::ErrorCode SingleMessageQueue::PopFront(uint64_t* num_bytes, void* bytes,
return glcr::FAILED_PRECONDITION; return glcr::FAILED_PRECONDITION;
} }
if (message_.size() > *num_bytes) { if (message_.data.size() > *num_bytes) {
return glcr::BUFFER_SIZE; return glcr::BUFFER_SIZE;
} }
if (caps_.size() > *num_caps) { if (message_.caps.size() > *num_caps) {
return glcr::BUFFER_SIZE; return glcr::BUFFER_SIZE;
} }
*num_bytes = message_.size(); *num_bytes = message_.data.size();
for (uint64_t i = 0; i < message_.size(); i++) { for (uint64_t i = 0; i < message_.data.size(); i++) {
reinterpret_cast<uint8_t*>(bytes)[i] = message_[i]; reinterpret_cast<uint8_t*>(bytes)[i] = message_.data[i];
} }
if (reply_port != nullptr) { if (reply_port != nullptr) {
@ -184,10 +184,10 @@ glcr::ErrorCode SingleMessageQueue::PopFront(uint64_t* num_bytes, void* bytes,
return glcr::INTERNAL; return glcr::INTERNAL;
} }
*num_caps = 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(caps_.PopFront()); caps[i] = proc.AddExistingCapability(message_.caps.PopFront());
} }
has_read_ = true; has_read_ = true;

20
zion/lib/message_queue.h
View File

@ -12,6 +12,14 @@
#include "include/ztypes.h" #include "include/ztypes.h"
#include "object/mutex.h" #include "object/mutex.h"
struct IpcMessage {
glcr::Array<uint8_t> data;
glcr::LinkedList<glcr::RefPtr<Capability>> caps;
glcr::RefPtr<Capability> reply_cap;
};
class MessageQueue { class MessageQueue {
public: public:
virtual ~MessageQueue() {} virtual ~MessageQueue() {}
@ -52,14 +60,7 @@ class UnboundedMessageQueue : public MessageQueue {
} }
private: private:
struct Message { glcr::LinkedList<glcr::SharedPtr<IpcMessage>> pending_messages_;
glcr::Array<uint8_t> message;
glcr::LinkedList<glcr::RefPtr<Capability>> caps;
glcr::RefPtr<Capability> reply_cap;
};
glcr::LinkedList<glcr::SharedPtr<Message>> pending_messages_;
}; };
class SingleMessageQueue : public MessageQueue { class SingleMessageQueue : public MessageQueue {
@ -83,6 +84,5 @@ class SingleMessageQueue : public MessageQueue {
private: private:
bool has_written_ = false; bool has_written_ = false;
bool has_read_ = false; bool has_read_ = false;
glcr::Array<uint8_t> message_; IpcMessage message_;
glcr::LinkedList<glcr::RefPtr<Capability>> caps_;
}; };