citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

rpc: send ending packet in Server instead of UDPServer 

udp_server might not be created due to error (occupied port etc.), in which case its destructor and thread-ending call chain will not be excuted in Server::Stop. However, the ending packet still need to be send no matter udp is on or not, so move it to Server::Stop
This commit is contained in:
Weiyi Wang 2019-03-04 11:05:07 -05:00
parent 5f80075c31
commit 870579d38f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/rpc/server.cpp
View File

@ -25,6 +25,7 @@ void Server::Start() {
void Server::Stop() { void Server::Stop() {
udp_server.reset(); udp_server.reset();
NewRequestCallback(nullptr); // Notify the RPC server to end
} }
void Server::NewRequestCallback(std::unique_ptr<RPC::Packet> new_request) { void Server::NewRequestCallback(std::unique_ptr<RPC::Packet> new_request) {

5
src/core/rpc/udp_server.cpp
View File

@ -20,10 +20,7 @@ public:
new_request_callback(std::move(new_request_callback)) { new_request_callback(std::move(new_request_callback)) {
StartReceive(); StartReceive();
worker_thread = std::thread([this] { worker_thread = std::thread([this] { io_context.run(); });
io_context.run();
this->new_request_callback(nullptr);
});
} }
~Impl() { ~Impl() {