Compare commits

..

1 commit

Author SHA1 Message Date
Goodfeat
97c675d6d5 Merge branch 'master_skipUserPrMg' into 'master'
Added skip setting "profile management users"

See merge request ryubing/ryujinx!9
2025-03-23 03:52:42 +00:00
2 changed files with 11 additions and 34 deletions

View file

@ -1,10 +1,8 @@
using Gommon;
using Ryujinx.Common.Logging; using Ryujinx.Common.Logging;
using Ryujinx.HLE.Exceptions; using Ryujinx.HLE.Exceptions;
using Ryujinx.HLE.HOS.Ipc; using Ryujinx.HLE.HOS.Ipc;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Reflection; using System.Reflection;
@ -23,42 +21,21 @@ namespace Ryujinx.HLE.HOS.Services
private int _selfId; private int _selfId;
private bool _isDomain; private bool _isDomain;
public IpcService(ServerBase server = null, bool registerTipc = false) public IpcService(ServerBase server = null)
{ {
Stopwatch sw = Stopwatch.StartNew(); CmifCommands = GetType().Assembly.GetTypes()
.Where(type => type == GetType())
CmifCommands = GetType() .SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public)
.SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandCmifAttribute>() .SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandCmifAttribute>()
.Select(command => (command.Id, methodInfo))) .Select(command => (command.Id, methodInfo)))
.ToDictionary(command => command.Id, command => command.methodInfo); .ToDictionary(command => command.Id, command => command.methodInfo);
sw.Stop(); TipcCommands = GetType().Assembly.GetTypes()
.Where(type => type == GetType())
Logger.Debug?.Print( .SelectMany(type => type.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public))
LogClass.Emulation, .SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandTipcAttribute>()
$"{CmifCommands.Count} Cmif commands loaded in {sw.ElapsedTicks} ticks ({Stopwatch.Frequency} tps).", .Select(command => (command.Id, methodInfo)))
GetType().AsPrettyString() .ToDictionary(command => command.Id, command => command.methodInfo);
);
if (registerTipc)
{
sw.Start();
TipcCommands = GetType()
.GetMethods(BindingFlags.Instance | BindingFlags.Static | BindingFlags.Public)
.SelectMany(methodInfo => methodInfo.GetCustomAttributes<CommandTipcAttribute>()
.Select(command => (command.Id, methodInfo)))
.ToDictionary(command => command.Id, command => command.methodInfo);
sw.Stop();
Logger.Debug?.Print(
LogClass.Emulation,
$"{TipcCommands.Count} Tipc commands loaded in {sw.ElapsedTicks} ticks ({Stopwatch.Frequency} tps).",
GetType().AsPrettyString()
);
}
Server = server; Server = server;

View file

@ -21,7 +21,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm
private bool _isInitialized; private bool _isInitialized;
public IUserInterface(KernelContext context, SmRegistry registry) : base(registerTipc: true) public IUserInterface(KernelContext context, SmRegistry registry)
{ {
_commonServer = new ServerBase(context, "CommonServer"); _commonServer = new ServerBase(context, "CommonServer");
_registry = registry; _registry = registry;