diff --git a/libc/shared/rpc.h b/libc/shared/rpc.h index 3f586744377d..91dd8f9ad6aa 100644 --- a/libc/shared/rpc.h +++ b/libc/shared/rpc.h @@ -44,9 +44,9 @@ namespace rpc { /// Generic codes that can be used whem implementing the server. enum Status { - SUCCESS = 0x0, - ERROR = 0x1000, - UNHANDLED_OPCODE = 0x1001, + RPC_SUCCESS = 0x0, + RPC_ERROR = 0x1000, + RPC_UNHANDLED_OPCODE = 0x1001, }; /// A fixed size channel used to communicate between the RPC client and server. diff --git a/libc/utils/gpu/loader/Loader.h b/libc/utils/gpu/loader/Loader.h index 0d683832855e..8e86f6396932 100644 --- a/libc/utils/gpu/loader/Loader.h +++ b/libc/utils/gpu/loader/Loader.h @@ -113,7 +113,7 @@ inline uint32_t handle_server(rpc::Server &server, uint32_t index, return 0; index = port->get_index() + 1; - int status = rpc::SUCCESS; + int status = rpc::RPC_SUCCESS; switch (port->get_opcode()) { case RPC_TEST_INCREMENT: { port->recv_and_send([](rpc::Buffer *buffer, uint32_t) { @@ -186,7 +186,7 @@ inline uint32_t handle_server(rpc::Server &server, uint32_t index, } // Handle all of the `libc` specific opcodes. - if (status != rpc::SUCCESS) + if (status != rpc::RPC_SUCCESS) handle_error("Error handling RPC server"); port->close(); diff --git a/libc/utils/gpu/server/rpc_server.cpp b/libc/utils/gpu/server/rpc_server.cpp index f724c5c82c42..1faee531fa20 100644 --- a/libc/utils/gpu/server/rpc_server.cpp +++ b/libc/utils/gpu/server/rpc_server.cpp @@ -437,10 +437,10 @@ rpc::Status handle_port_impl(rpc::Server::Port &port) { break; } default: - return rpc::UNHANDLED_OPCODE; + return rpc::RPC_UNHANDLED_OPCODE; } - return rpc::SUCCESS; + return rpc::RPC_SUCCESS; } namespace rpc { @@ -455,7 +455,7 @@ rpc::Status handle_libc_opcodes(rpc::Server::Port &port, uint32_t num_lanes) { case 64: return handle_port_impl<64>(port); default: - return rpc::ERROR; + return rpc::RPC_ERROR; } } } // namespace rpc diff --git a/offload/plugins-nextgen/common/src/RPC.cpp b/offload/plugins-nextgen/common/src/RPC.cpp index 66f98e68dc44..f20c8f7bcc5c 100644 --- a/offload/plugins-nextgen/common/src/RPC.cpp +++ b/offload/plugins-nextgen/common/src/RPC.cpp @@ -56,10 +56,10 @@ rpc::Status handle_offload_opcodes(plugin::GenericDeviceTy &Device, break; } default: - return rpc::UNHANDLED_OPCODE; + return rpc::RPC_UNHANDLED_OPCODE; break; } - return rpc::SUCCESS; + return rpc::RPC_SUCCESS; } static rpc::Status handle_offload_opcodes(plugin::GenericDeviceTy &Device, @@ -72,7 +72,7 @@ static rpc::Status handle_offload_opcodes(plugin::GenericDeviceTy &Device, else if (NumLanes == 64) return handle_offload_opcodes<64>(Device, Port); else - return rpc::ERROR; + return rpc::RPC_ERROR; } RPCServerTy::RPCServerTy(plugin::GenericPluginTy &Plugin) @@ -125,12 +125,12 @@ Error RPCServerTy::runServer(plugin::GenericDeviceTy &Device) { // Let the `libc` library handle any other unhandled opcodes. #ifdef LIBOMPTARGET_RPC_SUPPORT - if (Status == rpc::UNHANDLED_OPCODE) + if (Status == rpc::RPC_UNHANDLED_OPCODE) Status = handle_libc_opcodes(*Port, Device.getWarpSize()); #endif Port->close(); - if (Status != rpc::SUCCESS) + if (Status != rpc::RPC_SUCCESS) return createStringError("RPC server given invalid opcode!"); return Error::success();