aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.HLE/HOS/Services/Am
diff options
context:
space:
mode:
authorgdkchan <gab.dark.100@gmail.com>2018-09-18 20:36:43 -0300
committerGitHub <noreply@github.com>2018-09-18 20:36:43 -0300
commitb8133c19971c7a2026af803003fafedbdb70488e (patch)
tree84f4630e897ccd3f77b86051241a22a6cf45193d /Ryujinx.HLE/HOS/Services/Am
parent33e2810ef36fe0cf613aecd4c609f425aed02539 (diff)
Thread scheduler rewrite (#393)
* Started to rewrite the thread scheduler * Add a single core-like scheduling mode, enabled by default * Clear exclusive monitor on context switch * Add SetThreadActivity, misc fixes * Implement WaitForAddress and SignalToAddress svcs, misc fixes * Misc fixes (on SetActivity and Arbiter), other tweaks * Rebased * Add missing null check * Rename multicore key on config, fix UpdatePriorityInheritance * Make scheduling data MLQs private * nit: Ordering
Diffstat (limited to 'Ryujinx.HLE/HOS/Services/Am')
-rw-r--r--Ryujinx.HLE/HOS/Services/Am/IApplicationProxy.cs4
-rw-r--r--Ryujinx.HLE/HOS/Services/Am/ICommonStateGetter.cs4
-rw-r--r--Ryujinx.HLE/HOS/Services/Am/IHomeMenuFunctions.cs4
-rw-r--r--Ryujinx.HLE/HOS/Services/Am/ILibraryAppletAccessor.cs6
-rw-r--r--Ryujinx.HLE/HOS/Services/Am/ILibraryAppletCreator.cs2
-rw-r--r--Ryujinx.HLE/HOS/Services/Am/ISelfController.cs6
-rw-r--r--Ryujinx.HLE/HOS/Services/Am/ISystemAppletProxy.cs6
7 files changed, 16 insertions, 16 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Am/IApplicationProxy.cs b/Ryujinx.HLE/HOS/Services/Am/IApplicationProxy.cs
index 4003f151..2aaeda78 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IApplicationProxy.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IApplicationProxy.cs
@@ -26,14 +26,14 @@ namespace Ryujinx.HLE.HOS.Services.Am
public long GetCommonStateGetter(ServiceCtx Context)
{
- MakeObject(Context, new ICommonStateGetter());
+ MakeObject(Context, new ICommonStateGetter(Context.Device.System));
return 0;
}
public long GetSelfController(ServiceCtx Context)
{
- MakeObject(Context, new ISelfController());
+ MakeObject(Context, new ISelfController(Context.Device.System));
return 0;
}
diff --git a/Ryujinx.HLE/HOS/Services/Am/ICommonStateGetter.cs b/Ryujinx.HLE/HOS/Services/Am/ICommonStateGetter.cs
index 3cdfbbdb..72049d6f 100644
--- a/Ryujinx.HLE/HOS/Services/Am/ICommonStateGetter.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/ICommonStateGetter.cs
@@ -15,7 +15,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
private KEvent DisplayResolutionChangeEvent;
- public ICommonStateGetter()
+ public ICommonStateGetter(Horizon System)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
@@ -29,7 +29,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
{ 61, GetDefaultDisplayResolutionChangeEvent }
};
- DisplayResolutionChangeEvent = new KEvent();
+ DisplayResolutionChangeEvent = new KEvent(System);
}
public long GetEventHandle(ServiceCtx Context)
diff --git a/Ryujinx.HLE/HOS/Services/Am/IHomeMenuFunctions.cs b/Ryujinx.HLE/HOS/Services/Am/IHomeMenuFunctions.cs
index 95028ca0..0c271796 100644
--- a/Ryujinx.HLE/HOS/Services/Am/IHomeMenuFunctions.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/IHomeMenuFunctions.cs
@@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
private KEvent ChannelEvent;
- public IHomeMenuFunctions()
+ public IHomeMenuFunctions(Horizon System)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
@@ -22,7 +22,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
};
//ToDo: Signal this Event somewhere in future.
- ChannelEvent = new KEvent();
+ ChannelEvent = new KEvent(System);
}
public long RequestToGetForeground(ServiceCtx Context)
diff --git a/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletAccessor.cs b/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletAccessor.cs
index e099ec64..a9de3ebd 100644
--- a/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletAccessor.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletAccessor.cs
@@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
private KEvent StateChangedEvent;
- public ILibraryAppletAccessor()
+ public ILibraryAppletAccessor(Horizon System)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
@@ -24,12 +24,12 @@ namespace Ryujinx.HLE.HOS.Services.Am
{ 101, PopOutData }
};
- StateChangedEvent = new KEvent();
+ StateChangedEvent = new KEvent(System);
}
public long GetAppletStateChangedEvent(ServiceCtx Context)
{
- StateChangedEvent.WaitEvent.Set();
+ StateChangedEvent.Signal();
int Handle = Context.Process.HandleTable.OpenHandle(StateChangedEvent);
diff --git a/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletCreator.cs b/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletCreator.cs
index 065574c7..5535a43c 100644
--- a/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletCreator.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/ILibraryAppletCreator.cs
@@ -20,7 +20,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
public long CreateLibraryApplet(ServiceCtx Context)
{
- MakeObject(Context, new ILibraryAppletAccessor());
+ MakeObject(Context, new ILibraryAppletAccessor(Context.Device.System));
return 0;
}
diff --git a/Ryujinx.HLE/HOS/Services/Am/ISelfController.cs b/Ryujinx.HLE/HOS/Services/Am/ISelfController.cs
index ccd96e0d..fe882273 100644
--- a/Ryujinx.HLE/HOS/Services/Am/ISelfController.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/ISelfController.cs
@@ -13,7 +13,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
private KEvent LaunchableEvent;
- public ISelfController()
+ public ISelfController(Horizon System)
{
m_Commands = new Dictionary<int, ServiceProcessRequest>()
{
@@ -31,7 +31,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
{ 50, SetHandlesRequestToDisplay }
};
- LaunchableEvent = new KEvent();
+ LaunchableEvent = new KEvent(System);
}
public long Exit(ServiceCtx Context)
@@ -57,7 +57,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
public long GetLibraryAppletLaunchableEvent(ServiceCtx Context)
{
- LaunchableEvent.WaitEvent.Set();
+ LaunchableEvent.Signal();
int Handle = Context.Process.HandleTable.OpenHandle(LaunchableEvent);
diff --git a/Ryujinx.HLE/HOS/Services/Am/ISystemAppletProxy.cs b/Ryujinx.HLE/HOS/Services/Am/ISystemAppletProxy.cs
index c08d4018..85e11e0f 100644
--- a/Ryujinx.HLE/HOS/Services/Am/ISystemAppletProxy.cs
+++ b/Ryujinx.HLE/HOS/Services/Am/ISystemAppletProxy.cs
@@ -28,14 +28,14 @@ namespace Ryujinx.HLE.HOS.Services.Am
public long GetCommonStateGetter(ServiceCtx Context)
{
- MakeObject(Context, new ICommonStateGetter());
+ MakeObject(Context, new ICommonStateGetter(Context.Device.System));
return 0;
}
public long GetSelfController(ServiceCtx Context)
{
- MakeObject(Context, new ISelfController());
+ MakeObject(Context, new ISelfController(Context.Device.System));
return 0;
}
@@ -70,7 +70,7 @@ namespace Ryujinx.HLE.HOS.Services.Am
public long GetHomeMenuFunctions(ServiceCtx Context)
{
- MakeObject(Context, new IHomeMenuFunctions());
+ MakeObject(Context, new IHomeMenuFunctions(Context.Device.System));
return 0;
}