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

[Yunq] Return status in server code.

Browse source
This commit is contained in:
Drew Galbraith 2023-12-01 10:23:54 -08:00
parent 3eba0bd9d8
commit 700f3f94cb
20 changed files with 166 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

34
sys/victoriafalls/lib/victoriafalls/victoriafalls.yunq.server.cpp
View file

@ -73,9 +73,9 @@ void VFSServerBase::ServerThread() {
glcr::ErrorCode reply_err = glcr::OK;
resp_cap.Reset();
glcr::ErrorCode err = HandleRequest(recv_buffer, recv_cap, resp_buffer, resp_length, resp_cap);
if (err != glcr::OK) {
WriteError(resp_buffer, err);
glcr::Status err = HandleRequest(recv_buffer, recv_cap, resp_buffer, resp_length, resp_cap);
if (!err) {
WriteError(resp_buffer, err.code());
reply_err = static_cast<glcr::ErrorCode>(ZReplyPortSend(reply_port_cap, kHeaderSize, resp_buffer.RawPtr(), 0, nullptr));
} else {
WriteHeader(resp_buffer, resp_length);
@ -88,12 +88,12 @@ void VFSServerBase::ServerThread() {
}
glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
const glcr::CapBuffer& req_caps,
glcr::ByteBuffer& response, uint64_t& resp_length,
glcr::CapBuffer& resp_caps) {
glcr::Status VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
const glcr::CapBuffer& req_caps,
glcr::ByteBuffer& response, uint64_t& resp_length,
glcr::CapBuffer& resp_caps) {
if (request.At<uint32_t>(0) != kSentinel) {
return glcr::INVALID_ARGUMENT;
return glcr::InvalidArgument("Request Not Valid");
}
uint64_t method_select = request.At<uint64_t>(8);
@ -104,10 +104,7 @@ glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
OpenFileRequest yunq_request;
// TODO: Return status.
auto status = yunq_request.ParseFromBytes(request, kHeaderSize, req_caps);
if (!status) {
return status.code();
}
RETURN_ERROR(yunq_request.ParseFromBytes(request, kHeaderSize, req_caps));
@ -115,7 +112,7 @@ glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
RET_ERR(HandleOpenFile(yunq_request, yunq_response));
RETURN_ERROR(HandleOpenFile(yunq_request, yunq_response));
@ -128,10 +125,7 @@ glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
GetDirectoryRequest yunq_request;
// TODO: Return status.
auto status = yunq_request.ParseFromBytes(request, kHeaderSize, req_caps);
if (!status) {
return status.code();
}
RETURN_ERROR(yunq_request.ParseFromBytes(request, kHeaderSize, req_caps));
@ -139,7 +133,7 @@ glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
RET_ERR(HandleGetDirectory(yunq_request, yunq_response));
RETURN_ERROR(HandleGetDirectory(yunq_request, yunq_response));
@ -148,10 +142,10 @@ glcr::ErrorCode VFSServerBase::HandleRequest(const glcr::ByteBuffer& request,
break;
}
default: {
return glcr::UNIMPLEMENTED;
return glcr::Unimplemented("Method unimplemented by server.");
}
}
return glcr::OK;
return glcr::Status::Ok();
}

11
sys/victoriafalls/lib/victoriafalls/victoriafalls.yunq.server.h
View file

@ -2,6 +2,7 @@
#pragma once
#include <glacier/status/error_or.h>
#include <glacier/status/status.h>
#include <mammoth/proc/thread.h>
#include <ztypes.h>
@ -26,11 +27,11 @@ class VFSServerBase {
[[nodiscard]] virtual glcr::ErrorCode HandleOpenFile(const OpenFileRequest&, OpenFileResponse&) = 0;
[[nodiscard]] virtual glcr::Status HandleOpenFile(const OpenFileRequest&, OpenFileResponse&) = 0;
[[nodiscard]] virtual glcr::ErrorCode HandleGetDirectory(const GetDirectoryRequest&, Directory&) = 0;
[[nodiscard]] virtual glcr::Status HandleGetDirectory(const GetDirectoryRequest&, Directory&) = 0;
@ -40,9 +41,9 @@ class VFSServerBase {
friend void VFSServerBaseThreadBootstrap(void*);
void ServerThread();
[[nodiscard]] glcr::ErrorCode HandleRequest(const glcr::ByteBuffer& request, const glcr::CapBuffer& req_caps,
glcr::ByteBuffer& response, uint64_t& resp_length,
glcr::CapBuffer& resp_caps);
[[nodiscard]] glcr::Status HandleRequest(const glcr::ByteBuffer& request, const glcr::CapBuffer& req_caps,
glcr::ByteBuffer& response, uint64_t& resp_length,
glcr::CapBuffer& resp_caps);
};

31
sys/victoriafalls/victoriafalls_server.cpp
View file

@ -11,13 +11,13 @@ glcr::ErrorOr<glcr::UniquePtr<VFSServer>> VFSServer::Create(
return glcr::UniquePtr<VFSServer>(new VFSServer(endpoint_cap, driver));
}
glcr::ErrorCode VFSServer::HandleOpenFile(const OpenFileRequest& request,
OpenFileResponse& response) {
glcr::Status VFSServer::HandleOpenFile(const OpenFileRequest& request,
OpenFileResponse& response) {
auto path_tokens = glcr::StrSplit(request.path(), '/');
// Require all paths to be absolute rather than relative.
// If the path starts with '/' then the first token will be empty.
if (path_tokens.at(0) != "") {
return glcr::INVALID_ARGUMENT;
return glcr::InvalidArgument("Open file supports only absolute paths.");
}
ASSIGN_OR_RETURN(auto files, driver_.ReadDirectory(2));
@ -31,9 +31,8 @@ glcr::ErrorCode VFSServer::HandleOpenFile(const OpenFileRequest& request,
}
}
if (!found_token) {
dbgln("Directory '{}' not found.",
glcr::String(path_tokens.at(i)).cstr());
return glcr::NOT_FOUND;
return glcr::NotFound(glcr::StrFormat("Directory '{}' not found.",
glcr::String(path_tokens.at(i))));
}
}
@ -48,8 +47,9 @@ glcr::ErrorCode VFSServer::HandleOpenFile(const OpenFileRequest& request,
}
}
if (!region) {
dbgln("File '{}' not found.",
glcr::String(path_tokens.at(path_tokens.size() - 1)).cstr());
return glcr::NotFound(
glcr::StrFormat("File '{}' not found.",
glcr::String(path_tokens.at(path_tokens.size() - 1))));
}
response.set_path(request.path());
@ -61,15 +61,15 @@ glcr::ErrorCode VFSServer::HandleOpenFile(const OpenFileRequest& request,
ASSIGN_OR_RETURN(Inode * inode, driver_.GetInode(inode_num));
// FIXME: This technically only sets the lower 32 bits.
response.set_size(inode->size);
return glcr::OK;
return glcr::Status::Ok();
}
glcr::ErrorCode VFSServer::HandleGetDirectory(
const GetDirectoryRequest& request, Directory& response) {
glcr::Status VFSServer::HandleGetDirectory(const GetDirectoryRequest& request,
Directory& response) {
auto path_tokens = glcr::StrSplit(request.path(), '/');
if (path_tokens.at(0) != "") {
return glcr::INVALID_ARGUMENT;
return glcr::InvalidArgument("Get Directory only supports absolute path.");
}
// If there is a trailing slash we can get rid of the empty string.
@ -88,9 +88,8 @@ glcr::ErrorCode VFSServer::HandleGetDirectory(
}
}
if (!found_token) {
dbgln("Directory '{}' not found.",
glcr::String(path_tokens.at(i)).cstr());
return glcr::NOT_FOUND;
return glcr::NotFound(glcr::StrFormat("Directory '{}' not found.",
glcr::String(path_tokens.at(i))));
}
}
@ -106,5 +105,5 @@ glcr::ErrorCode VFSServer::HandleGetDirectory(
response.set_filenames(filelist.ToString());
return glcr::OK;
return glcr::Status::Ok();
}

8
sys/victoriafalls/victoriafalls_server.h
View file

@ -9,11 +9,11 @@ class VFSServer : public VFSServerBase {
public:
static glcr::ErrorOr<glcr::UniquePtr<VFSServer>> Create(Ext2Driver& driver);
glcr::ErrorCode HandleOpenFile(const OpenFileRequest&,
OpenFileResponse&) override;
glcr::Status HandleOpenFile(const OpenFileRequest&,
OpenFileResponse&) override;
glcr::ErrorCode HandleGetDirectory(const GetDirectoryRequest&,
Directory&) override;
glcr::Status HandleGetDirectory(const GetDirectoryRequest&,
Directory&) override;
private:
// FIXME: Don't store this as a reference.