diff options
| author | gdkchan <gab.dark.100@gmail.com> | 2020-09-22 01:50:40 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 14:50:40 +1000 |
| commit | 6c9565693fd87ae1af81ed63b5fbdde2a5dbecb8 (patch) | |
| tree | f7d87a5e4aff1b3f0b446bbcc710fcb89ffc288f /Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs | |
| parent | 5dd6f41ff456c2d9a72d9e6d88c4be851bac1f96 (diff) | |
IPC refactor part 1: Use explicit separate threads to process requests (#1447)
* Changes to allow explicit management of service threads
* Remove now unused code
* Remove ThreadCounter, its no longer needed
* Allow and use separate server per service, also fix exit issues
* New policy change: PTC version now uses PR number
Diffstat (limited to 'Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs')
| -rw-r--r-- | Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs | 54 |
1 files changed, 1 insertions, 53 deletions
diff --git a/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs b/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs index 715cb96a..c1e7026b 100644 --- a/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs +++ b/Ryujinx.HLE/HOS/Kernel/SupervisorCall/Syscall.cs @@ -2,14 +2,12 @@ using Ryujinx.Common.Logging; using Ryujinx.Cpu; using Ryujinx.HLE.Exceptions; -using Ryujinx.HLE.HOS.Ipc; using Ryujinx.HLE.HOS.Kernel.Common; using Ryujinx.HLE.HOS.Kernel.Ipc; using Ryujinx.HLE.HOS.Kernel.Memory; using Ryujinx.HLE.HOS.Kernel.Process; using Ryujinx.HLE.HOS.Kernel.Threading; using System; -using System.Threading; namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall { @@ -26,29 +24,6 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall // IPC - private struct HleIpcMessage - { - public KProcess Process { get; } - public KThread Thread { get; } - public KClientSession Session { get; } - public IpcMessage Message { get; } - public long MessagePtr { get; } - - public HleIpcMessage( - KProcess process, - KThread thread, - KClientSession session, - IpcMessage message, - long messagePtr) - { - Process = process; - Thread = thread; - Session = session; - Message = message; - MessagePtr = messagePtr; - } - } - public KernelResult ConnectToNamedPort(ulong namePtr, out int handle) { handle = 0; @@ -135,16 +110,7 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall currentThread.Reschedule(ThreadSchedState.Paused); - IpcMessage message = new IpcMessage(messageData, (long)messagePtr); - - ThreadPool.QueueUserWorkItem(ProcessIpcRequest, new HleIpcMessage( - process, - currentThread, - clientSession, - message, - (long)messagePtr)); - - _context.ThreadCounter.AddCount(); + clientSession.Service.Server.PushMessage(_device, currentThread, clientSession, messagePtr, messageSize); _context.CriticalSection.Leave(); @@ -158,24 +124,6 @@ namespace Ryujinx.HLE.HOS.Kernel.SupervisorCall } } - private void ProcessIpcRequest(object state) - { - HleIpcMessage ipcMessage = (HleIpcMessage)state; - - ipcMessage.Thread.ObjSyncResult = IpcHandler.IpcCall( - _device, - ipcMessage.Process, - ipcMessage.Process.CpuMemory, - ipcMessage.Thread, - ipcMessage.Session, - ipcMessage.Message, - ipcMessage.MessagePtr); - - _context.ThreadCounter.Signal(); - - ipcMessage.Thread.Reschedule(ThreadSchedState.Running); - } - private KernelResult SendSyncRequest(int handle) { KProcess currentProcess = _context.Scheduler.GetCurrentProcess(); |
