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

[Yunq] Fix bug in logging reply errors.

This commit is contained in:
Drew Galbraith 2023-10-25 20:40:39 -07:00
parent 3e4fdfee84
commit b85af8d0f8
6 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/denali/lib/denali/denali.yunq.server.cpp
View File

@ -68,7 +68,7 @@ void DenaliServerBase::ServerThread() {
reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr()); reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr());
} }
if (reply_err != glcr::OK) { if (reply_err != glcr::OK) {
dbgln("Error in reply: %x", recv_err); dbgln("Error in reply: %x", reply_err);
} }
} }

2
sys/yellowstone/lib/yellowstone/yellowstone.yunq.server.cpp
View File

@ -68,7 +68,7 @@ void YellowstoneServerBase::ServerThread() {
reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr()); reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr());
} }
if (reply_err != glcr::OK) { if (reply_err != glcr::OK) {
dbgln("Error in reply: %x", recv_err); dbgln("Error in reply: %x", reply_err);
} }
} }

4
yunq/example.yunq.client.cpp
View File

@ -16,12 +16,12 @@ glcr::ErrorCode VFSClient::open(const OpenFileRequest& request, File& response)
buffer_.WriteAt<uint32_t>(0, kSentinel); buffer_.WriteAt<uint32_t>(0, kSentinel);
buffer_.WriteAt<uint64_t>(8, 0); buffer_.WriteAt<uint64_t>(8, 0);
cap_buffer_.Reset();
uint64_t length = request.SerializeToBytes(buffer_, /*offset=*/16, cap_buffer_); uint64_t length = request.SerializeToBytes(buffer_, /*offset=*/16, cap_buffer_);
buffer_.WriteAt<uint32_t>(4, 16 + length); buffer_.WriteAt<uint32_t>(4, 16 + length);
z_cap_t reply_port_cap; z_cap_t reply_port_cap;
// FIXME: We need to be able to send capabilities via endpoint call. RET_ERR(ZEndpointSend(endpoint_, 16 + length, buffer_.RawPtr(), cap_buffer_.UsedSlots(), cap_buffer_.RawPtr(), &reply_port_cap));
RET_ERR(ZEndpointSend(endpoint_, 16 + length, buffer_.RawPtr(), &reply_port_cap));
// FIXME: Add a way to zero out the first buffer. // FIXME: Add a way to zero out the first buffer.
RET_ERR(ZReplyPortRecv(reply_port_cap, &buffer_size, buffer_.RawPtr(), &cap_size, cap_buffer_.RawPtr())); RET_ERR(ZReplyPortRecv(reply_port_cap, &buffer_size, buffer_.RawPtr(), &cap_size, cap_buffer_.RawPtr()));

14
yunq/example.yunq.server.cpp
View File

@ -42,14 +42,15 @@ Thread VFSServerBase::RunServer() {
void VFSServerBase::ServerThread() { void VFSServerBase::ServerThread() {
glcr::ByteBuffer recv_buffer(0x1000); glcr::ByteBuffer recv_buffer(0x1000);
glcr::CapBuffer recv_cap(0x10);
glcr::ByteBuffer resp_buffer(0x1000); glcr::ByteBuffer resp_buffer(0x1000);
uint64_t resp_cap_size = 0x10; glcr::CapBuffer resp_cap(0x10);
glcr::CapBuffer resp_cap(resp_cap_size);
z_cap_t reply_port_cap; z_cap_t reply_port_cap;
while (true) { while (true) {
uint64_t recv_cap_size = 0x10;
uint64_t recv_buf_size = 0x1000; uint64_t recv_buf_size = 0x1000;
glcr::ErrorCode recv_err = ZEndpointRecv(endpoint_, &recv_buf_size, recv_buffer.RawPtr(), &reply_port_cap); glcr::ErrorCode recv_err = ZEndpointRecv(endpoint_, &recv_buf_size, recv_buffer.RawPtr(), &recv_cap_size, recv_cap.RawPtr(), &reply_port_cap);
if (recv_err != glcr::OK) { if (recv_err != glcr::OK) {
dbgln("Error in receive: %x", recv_err); dbgln("Error in receive: %x", recv_err);
continue; continue;
@ -58,7 +59,7 @@ void VFSServerBase::ServerThread() {
uint64_t resp_length = 0; uint64_t resp_length = 0;
glcr::ErrorCode reply_err = glcr::OK; glcr::ErrorCode reply_err = glcr::OK;
glcr::ErrorCode err = HandleRequest(recv_buffer, resp_buffer, resp_length, resp_cap); glcr::ErrorCode err = HandleRequest(recv_buffer, recv_cap, resp_buffer, resp_length, resp_cap);
if (err != glcr::OK) { if (err != glcr::OK) {
WriteError(resp_buffer, err); WriteError(resp_buffer, err);
reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize, resp_buffer.RawPtr(), 0, nullptr); reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize, resp_buffer.RawPtr(), 0, nullptr);
@ -67,13 +68,14 @@ void VFSServerBase::ServerThread() {
reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr()); reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr());
} }
if (reply_err != glcr::OK) { if (reply_err != glcr::OK) {
dbgln("Error in reply: %x", recv_err); dbgln("Error in reply: %x", reply_err);
} }
} }
} }
glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request, glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
const glcr::CapBuffer& req_caps,
glcr::ByteBuffer& response, uint64_t& resp_length, glcr::ByteBuffer& response, uint64_t& resp_length,
glcr::CapBuffer& resp_caps) { glcr::CapBuffer& resp_caps) {
if (request.At<uint32_t>(0) != kSentinel) { if (request.At<uint32_t>(0) != kSentinel) {
@ -87,7 +89,7 @@ glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
OpenFileRequest yunq_request; OpenFileRequest yunq_request;
File yunq_response; File yunq_response;
yunq_request.ParseFromBytes(request, kHeaderSize); yunq_request.ParseFromBytes(request, kHeaderSize, req_caps);
RET_ERR(Handleopen(yunq_request, yunq_response)); RET_ERR(Handleopen(yunq_request, yunq_response));

4
yunq/example.yunq.server.h
View File

@ -30,8 +30,8 @@ class VFSServerBase {
friend void VFSServerBaseThreadBootstrap(void*); friend void VFSServerBaseThreadBootstrap(void*);
void ServerThread(); void ServerThread();
[[nodiscard]] glcr::ErrorCode HandleRequest(const glcr::ByteBuffer& request, glcr::ByteBuffer& response, [[nodiscard]] glcr::ErrorCode HandleRequest(const glcr::ByteBuffer& request, const glcr::CapBuffer& req_caps,
uint64_t& resp_length, glcr::ByteBuffer& response, uint64_t& resp_length,
glcr::CapBuffer& resp_caps); glcr::CapBuffer& resp_caps);
}; };

2
yunq/server.cpp.jinja
View File

@ -68,7 +68,7 @@ void {{interface.name}}ServerBase::ServerThread() {
reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr()); reply_err = ZReplyPortSend(reply_port_cap, kHeaderSize + resp_length, resp_buffer.RawPtr(), resp_cap.UsedSlots(), resp_cap.RawPtr());
} }
if (reply_err != glcr::OK) { if (reply_err != glcr::OK) {
dbgln("Error in reply: %x", recv_err); dbgln("Error in reply: %x", reply_err);
} }
} }