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

[Yunq] Reset cap buffers between server uses.

This commit is contained in:
Drew Galbraith 2023-10-25 20:46:36 -07:00
parent b85af8d0f8
commit 0dbafbfa66
5 changed files with 10 additions and 0 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

@ -50,6 +50,7 @@ void DenaliServerBase::ServerThread() {
while (true) { while (true) {
uint64_t recv_cap_size = 0x10; uint64_t recv_cap_size = 0x10;
uint64_t recv_buf_size = 0x1000; uint64_t recv_buf_size = 0x1000;
recv_cap.Reset();
glcr::ErrorCode recv_err = ZEndpointRecv(endpoint_, &recv_buf_size, recv_buffer.RawPtr(), &recv_cap_size, recv_cap.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);
@ -59,6 +60,7 @@ void DenaliServerBase::ServerThread() {
uint64_t resp_length = 0; uint64_t resp_length = 0;
glcr::ErrorCode reply_err = glcr::OK; glcr::ErrorCode reply_err = glcr::OK;
resp_cap.Reset();
glcr::ErrorCode err = HandleRequest(recv_buffer, recv_cap, 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);

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

@ -50,6 +50,7 @@ void YellowstoneServerBase::ServerThread() {
while (true) { while (true) {
uint64_t recv_cap_size = 0x10; uint64_t recv_cap_size = 0x10;
uint64_t recv_buf_size = 0x1000; uint64_t recv_buf_size = 0x1000;
recv_cap.Reset();
glcr::ErrorCode recv_err = ZEndpointRecv(endpoint_, &recv_buf_size, recv_buffer.RawPtr(), &recv_cap_size, recv_cap.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);
@ -59,6 +60,7 @@ void YellowstoneServerBase::ServerThread() {
uint64_t resp_length = 0; uint64_t resp_length = 0;
glcr::ErrorCode reply_err = glcr::OK; glcr::ErrorCode reply_err = glcr::OK;
resp_cap.Reset();
glcr::ErrorCode err = HandleRequest(recv_buffer, recv_cap, 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);

2
sys/yellowstone/yellowstone_server.cpp
View File

@ -48,6 +48,7 @@ glcr::ErrorCode YellowstoneServer::HandleGetAhciInfo(const Empty&,
AhciInfo& info) { AhciInfo& info) {
info.set_ahci_region(pci_reader_.GetAhciVmmo()); info.set_ahci_region(pci_reader_.GetAhciVmmo());
info.set_region_length(kPcieConfigurationSize); info.set_region_length(kPcieConfigurationSize);
dbgln("Resp ahci");
return glcr::OK; return glcr::OK;
} }
@ -58,6 +59,7 @@ glcr::ErrorCode YellowstoneServer::HandleGetDenali(const Empty&,
info.set_denali_endpoint(new_denali); info.set_denali_endpoint(new_denali);
info.set_device_id(device_id_); info.set_device_id(device_id_);
info.set_lba_offset(lba_offset_); info.set_lba_offset(lba_offset_);
dbgln("Resp denali");
return glcr::OK; return glcr::OK;
} }

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

@ -50,6 +50,7 @@ void VFSServerBase::ServerThread() {
while (true) { while (true) {
uint64_t recv_cap_size = 0x10; uint64_t recv_cap_size = 0x10;
uint64_t recv_buf_size = 0x1000; uint64_t recv_buf_size = 0x1000;
recv_cap.Reset();
glcr::ErrorCode recv_err = ZEndpointRecv(endpoint_, &recv_buf_size, recv_buffer.RawPtr(), &recv_cap_size, recv_cap.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);
@ -59,6 +60,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;
resp_cap.Reset();
glcr::ErrorCode err = HandleRequest(recv_buffer, recv_cap, 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);

2
yunq/server.cpp.jinja
View File

@ -50,6 +50,7 @@ void {{interface.name}}ServerBase::ServerThread() {
while (true) { while (true) {
uint64_t recv_cap_size = 0x10; uint64_t recv_cap_size = 0x10;
uint64_t recv_buf_size = 0x1000; uint64_t recv_buf_size = 0x1000;
recv_cap.Reset();
glcr::ErrorCode recv_err = ZEndpointRecv(endpoint_, &recv_buf_size, recv_buffer.RawPtr(), &recv_cap_size, recv_cap.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);
@ -59,6 +60,7 @@ void {{interface.name}}ServerBase::ServerThread() {
uint64_t resp_length = 0; uint64_t resp_length = 0;
glcr::ErrorCode reply_err = glcr::OK; glcr::ErrorCode reply_err = glcr::OK;
resp_cap.Reset();
glcr::ErrorCode err = HandleRequest(recv_buffer, recv_cap, 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);