mirror of
https://github.com/ryujinx-mirror/ryujinx.git
synced 2024-12-23 06:45:44 +00:00
misc: memory: Migrate from OutOfMemoryException to SystemException entirely (#5399)
Fix a regression with address space allocation while providing more information about the context of the exception.
This commit is contained in:
parent
f6ada8d169
commit
9860bfb2cd
4 changed files with 12 additions and 12 deletions
|
@ -199,7 +199,7 @@ namespace Ryujinx.Cpu
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
catch (OutOfMemoryException)
|
catch (SystemException)
|
||||||
{
|
{
|
||||||
baseMemory?.Dispose();
|
baseMemory?.Dispose();
|
||||||
mirrorMemory?.Dispose();
|
mirrorMemory?.Dispose();
|
||||||
|
|
|
@ -31,7 +31,7 @@ namespace Ryujinx.Memory
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="size">Size of the memory block in bytes</param>
|
/// <param name="size">Size of the memory block in bytes</param>
|
||||||
/// <param name="flags">Flags that controls memory block memory allocation</param>
|
/// <param name="flags">Flags that controls memory block memory allocation</param>
|
||||||
/// <exception cref="OutOfMemoryException">Throw when there's no enough memory to allocate the requested size</exception>
|
/// <exception cref="SystemException">Throw when there's an error while allocating the requested size</exception>
|
||||||
/// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception>
|
/// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception>
|
||||||
public MemoryBlock(ulong size, MemoryAllocationFlags flags = MemoryAllocationFlags.None)
|
public MemoryBlock(ulong size, MemoryAllocationFlags flags = MemoryAllocationFlags.None)
|
||||||
{
|
{
|
||||||
|
@ -66,7 +66,7 @@ namespace Ryujinx.Memory
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="size">Size of the memory block in bytes</param>
|
/// <param name="size">Size of the memory block in bytes</param>
|
||||||
/// <param name="sharedMemory">Shared memory to use as backing storage for this block</param>
|
/// <param name="sharedMemory">Shared memory to use as backing storage for this block</param>
|
||||||
/// <exception cref="OutOfMemoryException">Throw when there's no enough address space left to map the shared memory</exception>
|
/// <exception cref="SystemException">Throw when there's an error while mapping the shared memory</exception>
|
||||||
/// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception>
|
/// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception>
|
||||||
private MemoryBlock(ulong size, IntPtr sharedMemory)
|
private MemoryBlock(ulong size, IntPtr sharedMemory)
|
||||||
{
|
{
|
||||||
|
@ -82,7 +82,7 @@ namespace Ryujinx.Memory
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>A new memory block that shares storage with this one</returns>
|
/// <returns>A new memory block that shares storage with this one</returns>
|
||||||
/// <exception cref="NotSupportedException">Throw when the current memory block does not support mirroring</exception>
|
/// <exception cref="NotSupportedException">Throw when the current memory block does not support mirroring</exception>
|
||||||
/// <exception cref="OutOfMemoryException">Throw when there's no enough address space left to map the shared memory</exception>
|
/// <exception cref="SystemException">Throw when there's an error while mapping the shared memory</exception>
|
||||||
/// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception>
|
/// <exception cref="PlatformNotSupportedException">Throw when the current platform is not supported</exception>
|
||||||
public MemoryBlock CreateMirror()
|
public MemoryBlock CreateMirror()
|
||||||
{
|
{
|
||||||
|
|
|
@ -147,12 +147,12 @@ namespace Ryujinx.Memory
|
||||||
fd = shm_open((IntPtr)pMemName, 0x2 | 0x200 | 0x800 | 0x400, 384); // O_RDWR | O_CREAT | O_EXCL | O_TRUNC, 0600
|
fd = shm_open((IntPtr)pMemName, 0x2 | 0x200 | 0x800 | 0x400, 384); // O_RDWR | O_CREAT | O_EXCL | O_TRUNC, 0600
|
||||||
if (fd == -1)
|
if (fd == -1)
|
||||||
{
|
{
|
||||||
throw new OutOfMemoryException();
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (shm_unlink((IntPtr)pMemName) != 0)
|
if (shm_unlink((IntPtr)pMemName) != 0)
|
||||||
{
|
{
|
||||||
throw new OutOfMemoryException();
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -165,22 +165,22 @@ namespace Ryujinx.Memory
|
||||||
fd = mkstemp((IntPtr)pFileName);
|
fd = mkstemp((IntPtr)pFileName);
|
||||||
if (fd == -1)
|
if (fd == -1)
|
||||||
{
|
{
|
||||||
throw new OutOfMemoryException();
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (unlink((IntPtr)pFileName) != 0)
|
if (unlink((IntPtr)pFileName) != 0)
|
||||||
{
|
{
|
||||||
throw new OutOfMemoryException();
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ftruncate(fd, (IntPtr)size) != 0)
|
if (ftruncate(fd, (IntPtr)size) != 0)
|
||||||
{
|
{
|
||||||
throw new OutOfMemoryException();
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
return (IntPtr)fd;
|
return fd;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void DestroySharedMemory(IntPtr handle)
|
public static void DestroySharedMemory(IntPtr handle)
|
||||||
|
|
|
@ -114,7 +114,7 @@ namespace Ryujinx.Memory
|
||||||
|
|
||||||
if (handle == IntPtr.Zero)
|
if (handle == IntPtr.Zero)
|
||||||
{
|
{
|
||||||
throw new OutOfMemoryException();
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
return handle;
|
return handle;
|
||||||
|
@ -134,7 +134,7 @@ namespace Ryujinx.Memory
|
||||||
|
|
||||||
if (ptr == IntPtr.Zero)
|
if (ptr == IntPtr.Zero)
|
||||||
{
|
{
|
||||||
throw new OutOfMemoryException();
|
throw new SystemException(Marshal.GetLastPInvokeErrorMessage());
|
||||||
}
|
}
|
||||||
|
|
||||||
return ptr;
|
return ptr;
|
||||||
|
|
Loading…
Reference in a new issue