Vantha/0ad
1
1
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix RAM amount detection on BSD and macOS.

Browse Source 
Tested by: @Mastoras
Comments by: @vladislavbelov
Differential Revision: https://code.wildfiregames.com/D4651
This was SVN commit r26888.
This commit is contained in:
Stan 2022-05-17 08:08:14 +00:00
parent d1775169d2
commit 10554eb5b1
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/lib/sysdep/os/bsd/bcpu.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2021 Wildfire Games.
/* Copyright (C) 2022 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -93,8 +93,8 @@ size_t os_cpu_QueryMemorySize()
size_t memorySize = 0;
size_t len = sizeof(memorySize);
// Argh, the API doesn't seem to be const-correct
/*const*/ int mib[2] = { CTL_HW, HW_PHYSMEM };
sysctl(mib, 2, &memorySize, &len, 0, 0);
/*const*/ int mib[2] = { CTL_HW, HW_MEMSIZE };
sysctl(mib, 2, &memorySize, &len, nullptr, 0);
memorySize /= MiB;
return memorySize;
}
@ -106,7 +106,7 @@ size_t os_cpu_MemoryAvailable()
size_t len = sizeof(memoryAvailable);
// Argh, the API doesn't seem to be const-correct
/*const*/ int mib[2] = { CTL_HW, HW_USERMEM };
sysctl(mib, 2, &memoryAvailable, &len, 0, 0);
sysctl(mib, 2, &memoryAvailable, &len, nullptr, 0);
memoryAvailable /= MiB;
return memoryAvailable;
}

8
source/lib/sysdep/os/osx/ocpu.cpp
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2010 Wildfire Games.
/* Copyright (C) 2022 Wildfire Games.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -81,8 +81,8 @@ size_t os_cpu_QueryMemorySize()
size_t memorySize = 0;
size_t len = sizeof(memorySize);
// Argh, the API doesn't seem to be const-correct
/*const*/ int mib[2] = { CTL_HW, HW_PHYSMEM };
sysctl(mib, 2, &memorySize, &len, 0, 0);
/*const*/ int mib[2] = { CTL_HW, HW_MEMSIZE };
sysctl(mib, 2, &memorySize, &len, nullptr, 0);
memorySize /= MiB;
return memorySize;
}
@ -94,7 +94,7 @@ size_t os_cpu_MemoryAvailable()
size_t len = sizeof(memoryAvailable);
// Argh, the API doesn't seem to be const-correct
/*const*/ int mib[2] = { CTL_HW, HW_USERMEM };
sysctl(mib, 2, &memoryAvailable, &len, 0, 0);
sysctl(mib, 2, &memoryAvailable, &len, nullptr, 0);
memoryAvailable /= MiB;
return memoryAvailable;
}