This commit is contained in:
Igor Pavlov
2021-07-22 23:00:14 +01:00
committed by Kornel
parent 4a960640a3
commit 585698650f
619 changed files with 34904 additions and 10859 deletions

View File

@@ -2,15 +2,27 @@
#include "StdAfx.h"
#include "../Common/MyWindows.h"
#ifndef _WIN32
#include <unistd.h>
#ifdef __APPLE__
#include <sys/sysctl.h>
#else
#include <sys/sysinfo.h>
#endif
#endif
#include "../Common/Defs.h"
// #include "../Common/MyWindows.h"
// #include "../../C/CpuArch.h"
#include "System.h"
namespace NWindows {
namespace NSystem {
#ifdef _WIN32
UInt32 CountAffinity(DWORD_PTR mask)
{
UInt32 num = 0;
@@ -19,8 +31,6 @@ UInt32 CountAffinity(DWORD_PTR mask)
return num;
}
#ifdef _WIN32
BOOL CProcessAffinity::Get()
{
#ifndef UNDER_CE
@@ -52,9 +62,45 @@ UInt32 GetNumberOfProcessors()
#else
BOOL CProcessAffinity::Get()
{
numSysThreads = GetNumberOfProcessors();
/*
numSysThreads = 8;
for (unsigned i = 0; i < numSysThreads; i++)
CpuSet_Set(&cpu_set, i);
return TRUE;
*/
#ifdef _7ZIP_AFFINITY_SUPPORTED
// numSysThreads = sysconf(_SC_NPROCESSORS_ONLN); // The number of processors currently online
if (sched_getaffinity(0, sizeof(cpu_set), &cpu_set) != 0)
return FALSE;
return TRUE;
#else
// cpu_set = ((CCpuSet)1 << (numSysThreads)) - 1;
return TRUE;
// errno = ENOSYS;
// return FALSE;
#endif
}
UInt32 GetNumberOfProcessors()
{
#ifndef _7ZIP_ST
long n = sysconf(_SC_NPROCESSORS_CONF); // The number of processors configured
if (n < 1)
n = 1;
return (UInt32)n;
#else
return 1;
#endif
}
#endif
@@ -87,17 +133,13 @@ typedef struct _MY_MEMORYSTATUSEX {
typedef BOOL (WINAPI *GlobalMemoryStatusExP)(MY_LPMEMORYSTATUSEX lpBuffer);
#endif
#endif
#endif // !UNDER_CE
bool GetRamSize(UInt64 &size)
{
size = (UInt64)(sizeof(size_t)) << 29;
#ifdef _WIN32
#ifndef UNDER_CE
MY_MEMORYSTATUSEX stat;
stat.dwLength = sizeof(stat);
@@ -114,7 +156,7 @@ bool GetRamSize(UInt64 &size)
#ifndef UNDER_CE
GlobalMemoryStatusExP globalMemoryStatusEx = (GlobalMemoryStatusExP)
::GetProcAddress(::GetModuleHandle(TEXT("kernel32.dll")), "GlobalMemoryStatusEx");
(void *)::GetProcAddress(::GetModuleHandleA("kernel32.dll"), "GlobalMemoryStatusEx");
if (globalMemoryStatusEx && globalMemoryStatusEx(&stat))
{
size = MyMin(stat.ullTotalVirtual, stat.ullTotalPhys);
@@ -129,14 +171,61 @@ bool GetRamSize(UInt64 &size)
size = MyMin(stat2.dwTotalVirtual, stat2.dwTotalPhys);
return true;
}
#endif
}
#else
// POSIX
// #include <stdio.h>
bool GetRamSize(UInt64 &size)
{
size = (UInt64)(sizeof(size_t)) << 29;
#ifdef __APPLE__
#ifdef HW_MEMSIZE
uint64_t val = 0; // support 2Gb+ RAM
int mib[2] = { CTL_HW, HW_MEMSIZE };
#elif defined(HW_PHYSMEM64)
uint64_t val = 0; // support 2Gb+ RAM
int mib[2] = { CTL_HW, HW_PHYSMEM64 };
#else
unsigned int val = 0; // For old system
int mib[2] = { CTL_HW, HW_PHYSMEM };
#endif // HW_MEMSIZE
size_t size_sys = sizeof(val);
sysctl(mib, 2, &val, &size_sys, NULL, 0);
if (val)
size = val;
#elif defined(_AIX)
// fixme
#else
return false;
struct sysinfo info;
if (::sysinfo(&info) != 0)
return false;
size = (UInt64)info.mem_unit * info.totalram;
const UInt64 kLimit = (UInt64)1 << (sizeof(size_t) * 8 - 1);
if (size > kLimit)
size = kLimit;
/*
printf("\n mem_unit = %lld", (UInt64)info.mem_unit);
printf("\n totalram = %lld", (UInt64)info.totalram);
printf("\n freeram = %lld", (UInt64)info.freeram);
*/
#endif
return true;
}
#endif
}}