Merge bcbe589964 into 6ab899f621

src/ARMeilleure/Translation/Cache/JitCache.cs

@@ -52,7 +52,7 @@ namespace ARMeilleure.Translation.Cache
                     return;
                 }
 
-                var firstRegion = new ReservedRegion(allocator, CacheSize);
+                ReservedRegion firstRegion = new(allocator, CacheSize);
                 _jitRegions.Add(firstRegion);
                 _activeRegionIndex = 0;
 
@@ -124,7 +124,7 @@ namespace ARMeilleure.Translation.Cache
             {
                 Debug.Assert(_initialized);
 
-                foreach (var region in _jitRegions)
+                foreach (ReservedRegion region in _jitRegions)
                 {
                     if (pointer.ToInt64() < region.Pointer.ToInt64() ||
                         pointer.ToInt64() >= (region.Pointer + CacheSize).ToInt64())
@@ -224,7 +224,7 @@ namespace ARMeilleure.Translation.Cache
         {
             lock (_lock)
             {
-                foreach (var region in _jitRegions)
+                foreach (ReservedRegion _ in _jitRegions)
                 {
                     int index = _cacheEntries.BinarySearch(new CacheEntry(offset, 0, default));
 

src/ARMeilleure/Translation/PTC/PtcProfiler.cs

@@ -144,17 +144,15 @@ namespace ARMeilleure.Translation.PTC
 
         public List<ulong> GetBlacklistedFunctions()
         {
-            List<ulong> funcs = new List<ulong>();
+            List<ulong> funcs = [];
 
-            foreach (var profiledFunc in ProfiledFuncs)
+            foreach ((ulong ptr, FuncProfile funcProfile) in ProfiledFuncs)
             {
-                if (profiledFunc.Value.Blacklist)
-                {
-                    if (!funcs.Contains(profiledFunc.Key))
-                    {
-                        funcs.Add(profiledFunc.Key);
-                    }
-                }
+                if (!funcProfile.Blacklist)
+                    continue;
+
+                if (!funcs.Contains(ptr)) 
+                    funcs.Add(ptr);
             }
 
             return funcs;

src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs

@@ -48,7 +48,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
                     return;
                 }
 
-                var firstRegion = new ReservedRegion(allocator, CacheSize);
+                ReservedRegion firstRegion = new(allocator, CacheSize);
                 _jitRegions.Add(firstRegion);
                 _activeRegionIndex = 0;
 
@@ -104,7 +104,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             {
                 Debug.Assert(_initialized);
 
-                foreach (var region in _jitRegions)
+                foreach (ReservedRegion region in _jitRegions)
                 {
                     if (pointer.ToInt64() < region.Pointer.ToInt64() ||
                         pointer.ToInt64() >= (region.Pointer + CacheSize).ToInt64())
@@ -160,7 +160,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             }
 
             int exhaustedRegion = _activeRegionIndex;
-            var newRegion = new ReservedRegion(_jitRegions[0].Allocator, CacheSize);
+            ReservedRegion newRegion = new(_jitRegions[0].Allocator, CacheSize);
             _jitRegions.Add(newRegion);
             _activeRegionIndex = _jitRegions.Count - 1;
             

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs

@@ -110,24 +110,10 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
             _broadcastAddress = config.ProxyIp | (~config.ProxySubnetMask);
         }
 
-        public async Task<ushort> NatPunch()
+        private async Task<ushort> NatPunchForDevice(NatDevice device)
         {
-            NatDiscoverer discoverer = new();
-            CancellationTokenSource cts = new(5000);
-
-            NatDevice device;
-
-            try
-            {
-                device = await discoverer.DiscoverDeviceAsync(PortMapper.Upnp, cts);
-            }
-            catch (NatDeviceNotFoundException)
-            {
-                return 0;
-            }
-
+            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Attempting to map port using {device.ToString()}");
             _publicPort = PublicPortBase;
-
             for (int i = 0; i < PublicPortRange; i++)
             {
                 try
@@ -138,12 +124,14 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
 
                     break;
                 }
-                catch (MappingException)
+                catch (MappingException ex)
                 {
+                    Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Failed to map port {_publicPort}: {ex.Message}");
                     _publicPort++;
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
+                    Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Failed to map port {_publicPort}: {ex.GetType().Name}: {ex.Message}");
                     return 0;
                 }
 
@@ -155,17 +143,52 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
 
             if (_publicPort != 0)
             {
+                _natDevice = device;
                 _ = Executor.ExecuteAfterDelayAsync(
-                    PortLeaseRenew.Seconds(), 
+                    PortLeaseRenew.Seconds(),
                     _disposedCancellation.Token,
                     RefreshLease);
             }
 
-            _natDevice = device;
-
             return _publicPort;
         }
 
+        public async Task<ushort> NatPunch()
+        {
+            NatDiscoverer discoverer = new();
+            CancellationTokenSource cts = new(500);
+
+            NatDevice[] devices;
+
+            try
+            {
+                devices = (await discoverer.DiscoverDevicesAsync(PortMapper.Upnp, cts)).ToArray();
+            }
+            catch (Exception ex)
+            {
+                Logger.Error?.PrintMsg(LogClass.ServiceLdn, $"Failed to discover UPnP devices: {ex.Message}");
+                return 0;
+            }
+
+            if (devices.Length == 0)
+            {
+                Logger.Error?.PrintMsg(LogClass.ServiceLdn, "No UPnP devices found.");
+                return 0;
+            }
+
+            foreach (var device in devices)
+            {
+                ushort port = await NatPunchForDevice(device);
+                if (port != 0)
+                {
+                    return port;
+                }
+            }
+            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Failed to map port using any device");
+            _publicPort = 0;
+            return 0;
+        }
+
         // Proxy handlers
 
         private void RouteMessage(P2pProxySession sender, ref ProxyInfo info, Action<P2pProxySession> action)

src/Ryujinx/Utilities/PlayReport/Specs.cs

@@ -152,7 +152,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
         {
             List<MessagePackObject> packedObjects = [];
-            foreach (var reportKey in ReportKeys)
+            foreach (string reportKey in ReportKeys)
             {
                 if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
                 {
@@ -176,7 +176,7 @@ namespace Ryujinx.Ava.Utilities.PlayReport
         public override bool GetData(Horizon.Prepo.Types.PlayReport playReport, out object result)
         {
             Dictionary<string, MessagePackObject> packedObjects = [];
-            foreach (var reportKey in ReportKeys)
+            foreach (string reportKey in ReportKeys)
             {
                 if (!playReport.ReportData.AsDictionary().TryGetValue(reportKey, out MessagePackObject valuePackObject))
                     continue;