octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Threads do not wait for the server endpoint to call AcceptSession before returning from a ConnectToPort or GetServiceHandle call.

This commit is contained in:
Subv 2016-12-01 10:47:06 -05:00
parent 2eceee3a4c
commit ed210c32b3
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/hle/service/srv.cpp
View File

@ -95,7 +95,8 @@ static void GetServiceHandle(Service::Interface* self) {
auto client_session = std::get<Kernel::SharedPtr<Kernel::ClientSession>>(sessions); auto client_session = std::get<Kernel::SharedPtr<Kernel::ClientSession>>(sessions);
auto server_session = std::get<Kernel::SharedPtr<Kernel::ServerSession>>(sessions); auto server_session = std::get<Kernel::SharedPtr<Kernel::ServerSession>>(sessions);
// TODO(Subv): Wait the current thread until the ServerPort calls AcceptSession. // Note: Threads do not wait for the server endpoint to call
// AcceptSession before returning from this call.
// Add the server session to the port's queue // Add the server session to the port's queue
client_port->AddWaitingSession(server_session); client_port->AddWaitingSession(server_session);

5
src/core/hle/svc.cpp
View File

@ -234,11 +234,12 @@ static ResultCode ConnectToPort(Handle* out_handle, const char* port_name) {
auto client_session = std::get<Kernel::SharedPtr<Kernel::ClientSession>>(sessions); auto client_session = std::get<Kernel::SharedPtr<Kernel::ClientSession>>(sessions);
auto server_session = std::get<Kernel::SharedPtr<Kernel::ServerSession>>(sessions); auto server_session = std::get<Kernel::SharedPtr<Kernel::ServerSession>>(sessions);
// TODO(Subv): Wait the current thread until the ServerPort calls AcceptSession.
// Add the server session to the port's queue // Add the server session to the port's queue
client_port->AddWaitingSession(server_session); client_port->AddWaitingSession(server_session);
// Note: Threads do not wait for the server endpoint to call
// AcceptSession before returning from this call.
// Return the client session // Return the client session
CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(client_session)); CASCADE_RESULT(*out_handle, Kernel::g_handle_table.Create(client_session));
return RESULT_SUCCESS; return RESULT_SUCCESS;