#ifdef WIN32
#include <windows.h>
+#include <winbase.h>
#else
#include <unistd.h>
#endif
cvar_t developer_memory = {0, "developer_memory", "0", "prints debugging information about memory allocations"};
cvar_t developer_memorydebug = {0, "developer_memorydebug", "0", "enables memory corruption checks (very slow)"};
+cvar_t sys_memsize_physical = {CVAR_READONLY, "sys_memsize_physical", "", "physical memory size in MB (or empty if unknown)"};
+cvar_t sys_memsize_virtual = {CVAR_READONLY, "sys_memsize_virtual", "", "virtual memory size in MB (or empty if unknown)"};
static mempool_t *poolchain = NULL;
void *Mem_ExpandableArray_AllocRecordAtIndex(memexpandablearray_t *l, size_t index)
{
size_t j;
- if (index == l->numarrays)
+ if (index >= l->numarrays)
{
if (l->numarrays == l->maxarrays)
{
char* Mem_strdup (mempool_t *pool, const char* s)
{
char* p;
- size_t sz = strlen (s) + 1;
- if (s == NULL) return NULL;
+ size_t sz;
+ if (s == NULL)
+ return NULL;
+ sz = strlen (s) + 1;
p = (char*)Mem_Alloc (pool, sz);
strlcpy (p, s, sz);
return p;
{
static union {unsigned short s;unsigned char b[2];} u;
u.s = 0x100;
- mem_bigendian = u.b[0];
+ mem_bigendian = u.b[0] != 0;
sentinel_seed = rand();
poolchain = NULL;
Cmd_AddCommand ("memlist", MemList_f, "prints memory pool information (or if used as memlist 5 lists individual allocations of 5K or larger, 0 lists all allocations)");
Cvar_RegisterVariable (&developer_memory);
Cvar_RegisterVariable (&developer_memorydebug);
+ Cvar_RegisterVariable (&sys_memsize_physical);
+ Cvar_RegisterVariable (&sys_memsize_virtual);
+
+#if defined(WIN32)
+#ifdef _WIN64
+ {
+ MEMORYSTATUSEX status;
+ // first guess
+ Cvar_SetValueQuick(&sys_memsize_virtual, 8388608);
+ // then improve
+ status.dwLength = sizeof(status);
+ if(GlobalMemoryStatusEx(&status))
+ {
+ Cvar_SetValueQuick(&sys_memsize_physical, status.ullTotalPhys / 1048576.0);
+ Cvar_SetValueQuick(&sys_memsize_virtual, min(sys_memsize_virtual.value, status.ullTotalVirtual / 1048576.0));
+ }
+ }
+#else
+ {
+ MEMORYSTATUS status;
+ // first guess
+ Cvar_SetValueQuick(&sys_memsize_virtual, 2048);
+ // then improve
+ status.dwLength = sizeof(status);
+ GlobalMemoryStatus(&status);
+ Cvar_SetValueQuick(&sys_memsize_physical, status.dwTotalPhys / 1048576.0);
+ Cvar_SetValueQuick(&sys_memsize_virtual, min(sys_memsize_virtual.value, status.dwTotalVirtual / 1048576.0));
+ }
+#endif
+#else
+ {
+ // first guess
+ Cvar_SetValueQuick(&sys_memsize_virtual, (sizeof(void*) == 4) ? 2048 : 268435456);
+ // then improve
+ {
+ // Linux, and BSD with linprocfs mounted
+ FILE *f = fopen("/proc/meminfo", "r");
+ if(f)
+ {
+ static char buf[1024];
+ while(fgets(buf, sizeof(buf), f))
+ {
+ const char *p = buf;
+ if(!COM_ParseToken_Console(&p))
+ continue;
+ if(!strcmp(com_token, "MemTotal:"))
+ {
+ if(!COM_ParseToken_Console(&p))
+ continue;
+ Cvar_SetValueQuick(&sys_memsize_physical, atof(com_token) / 1024.0);
+ }
+ if(!strcmp(com_token, "SwapTotal:"))
+ {
+ if(!COM_ParseToken_Console(&p))
+ continue;
+ Cvar_SetValueQuick(&sys_memsize_virtual, min(sys_memsize_virtual.value , atof(com_token) / 1024.0 + sys_memsize_physical.value));
+ }
+ }
+ fclose(f);
+ }
+ }
+ }
+#endif
}