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

Get rid of the type field on zmessage

Browse source
This commit is contained in:
Drew Galbraith 2023-06-17 02:01:21 -07:00
parent 7bd6aa42b0
commit 685070d65e
13 changed files with 35 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zion/object/channel.cpp
View file

@ -34,7 +34,6 @@ z_err_t Channel::Read(ZMessage& msg) {
return Z_ERR_BUFF_SIZE;
}
msg.type = next_msg->type;
msg.num_bytes = next_msg->num_bytes;
for (uint64_t i = 0; i < msg.num_bytes; i++) {
@ -59,7 +58,6 @@ z_err_t Channel::EnqueueMessage(const ZMessage& msg) {
}
auto message = MakeShared<Message>();
message->type = msg.type;
// Copy Message body.
message->num_bytes = msg.num_bytes;

2
zion/object/channel.h
View file

@ -35,8 +35,6 @@ class Channel : public KernelObject {
Mutex mutex_{"channel"};
struct Message {
uint64_t type;
uint64_t num_bytes;
uint8_t* bytes;

4
zion/object/port.cpp
View file

@ -11,7 +11,7 @@ z_err_t Port::Write(const ZMessage& msg) {
}
auto message = MakeShared<Message>();
message->type = msg.type, message->num_bytes = msg.num_bytes;
message->num_bytes = msg.num_bytes;
message->bytes = new uint8_t[msg.num_bytes];
for (uint64_t i = 0; i < msg.num_bytes; i++) {
message->bytes[i] = msg.bytes[i];
@ -54,7 +54,6 @@ z_err_t Port::Read(ZMessage& msg) {
return Z_ERR_BUFF_SIZE;
}
msg.type = next_msg->type;
msg.num_bytes = next_msg->num_bytes;
for (uint64_t i = 0; i < msg.num_bytes; i++) {
@ -76,7 +75,6 @@ void Port::WriteKernel(uint64_t init, RefPtr<Capability> cap) {
MutexHolder h(mutex_);
auto msg = MakeShared<Message>();
msg->type = 0;
msg->bytes = new uint8_t[8];
msg->num_bytes = sizeof(init);

1
zion/object/port.h
View file

@ -30,7 +30,6 @@ class Port : public KernelObject {
private:
struct Message {
uint64_t type;
uint64_t num_bytes;
uint8_t* bytes;