drew/acadia
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Refactor error types and error reporting

Browse source
This commit is contained in:
Drew Galbraith 2023-06-07 08:50:08 -07:00
parent 81b925eea0
commit a5c4d40575
8 changed files with 137 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

14
zion/object/channel.cpp
View file

@ -10,18 +10,18 @@ Pair<RefPtr<Channel>, RefPtr<Channel>> Channel::CreateChannelPair() {
return {c1, c2};
}
uint64_t Channel::Write(const ZMessage& msg) {
z_err_t Channel::Write(const ZMessage& msg) {
return peer_->EnqueueMessage(msg);
}
uint64_t Channel::Read(ZMessage& msg) {
z_err_t Channel::Read(ZMessage& msg) {
if (pending_messages_.size() == 0) {
dbgln("Unimplemented add blocking.");
return ZE_UNIMPLEMENTED;
return Z_ERR_UNIMPLEMENTED;
}
Message next_msg = pending_messages_.PeekFront();
if (next_msg.num_bytes > msg.num_bytes) {
return ZE_BUFF_SIZE;
return Z_ERR_BUFF_SIZE;
}
msg.type = next_msg.type;
@ -37,15 +37,15 @@ uint64_t Channel::Read(ZMessage& msg) {
return Z_OK;
}
uint64_t Channel::EnqueueMessage(const ZMessage& msg) {
z_err_t Channel::EnqueueMessage(const ZMessage& msg) {
if (msg.num_caps > 0) {
dbgln("Unimplemented passing caps on channel");
return ZE_UNIMPLEMENTED;
return Z_ERR_UNIMPLEMENTED;
}
if (msg.num_bytes > 0x1000) {
dbgln("Large message size unimplemented: %x", msg.num_bytes);
return ZE_INVALID;
return Z_ERR_INVALID;
}
Message message{

7
zion/object/channel.h
View file

@ -1,6 +1,7 @@
#pragma once
#include "capability/capability.h"
#include "include/zerrors.h"
#include "lib/linked_list.h"
#include "lib/pair.h"
#include "lib/ref_ptr.h"
@ -13,8 +14,8 @@ class Channel : public KernelObject {
RefPtr<Channel> peer() { return peer_; }
uint64_t Write(const ZMessage& msg);
uint64_t Read(ZMessage& msg);
z_err_t Write(const ZMessage& msg);
z_err_t Read(ZMessage& msg);
private:
// FIXME: We will likely never close the channel based on this
@ -36,5 +37,5 @@ class Channel : public KernelObject {
Channel() {}
void SetPeer(const RefPtr<Channel>& peer) { peer_ = peer; }
uint64_t EnqueueMessage(const ZMessage& msg);
z_err_t EnqueueMessage(const ZMessage& msg);
};