NOISSUE add implementations of system query functions
* system memory size in bytes * system architecture is 64bit? * CPU architecture is 64bit?
This commit is contained in:
		@@ -8,4 +8,10 @@ namespace Sys
 | 
			
		||||
 * @return os       A QString with the name and version of the operating system.
 | 
			
		||||
 */
 | 
			
		||||
QString getSystemInfo();
 | 
			
		||||
 | 
			
		||||
uint64_t getSystemRam();
 | 
			
		||||
 | 
			
		||||
bool isSystem64bit();
 | 
			
		||||
 | 
			
		||||
bool isCPU64bit();
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
#include "sys.h"
 | 
			
		||||
 | 
			
		||||
// FIXME: replace with our version...
 | 
			
		||||
QString Sys::getSystemInfo()
 | 
			
		||||
{
 | 
			
		||||
	QSysInfo::MacVersion version = QSysInfo::macVersion();
 | 
			
		||||
@@ -116,3 +117,31 @@ QString Sys::getSystemInfo()
 | 
			
		||||
	}
 | 
			
		||||
	return os;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#include <sys/sysctl.h>
 | 
			
		||||
 | 
			
		||||
uint64_t Sys::getSystemRam()
 | 
			
		||||
{
 | 
			
		||||
	uint64_t memsize;
 | 
			
		||||
	size_t memsizesize = sizeof(memsize);
 | 
			
		||||
	if(!sysctlbyname("hw.memsize", &memsize, &memsizesize, NULL, 0))
 | 
			
		||||
	{
 | 
			
		||||
		return memsize;
 | 
			
		||||
	}
 | 
			
		||||
	else
 | 
			
		||||
	{
 | 
			
		||||
		return 0;
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool Sys::isCPU64bit()
 | 
			
		||||
{
 | 
			
		||||
	// not even going to pretend I'm going to support anything else
 | 
			
		||||
	return true;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool Sys::isSystem64bit()
 | 
			
		||||
{
 | 
			
		||||
	// yep. maybe when we have 128bit CPUs on consumer devices.
 | 
			
		||||
	return true;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
#include "sys.h"
 | 
			
		||||
 | 
			
		||||
#include <sys/utsname.h>
 | 
			
		||||
#include <fstream>
 | 
			
		||||
 | 
			
		||||
QString Sys::getSystemInfo()
 | 
			
		||||
{
 | 
			
		||||
@@ -11,3 +12,38 @@ QString Sys::getSystemInfo()
 | 
			
		||||
 | 
			
		||||
	return system + "; " + release;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint64_t Sys::getSystemRam()
 | 
			
		||||
{
 | 
			
		||||
	std::string token;
 | 
			
		||||
	std::ifstream file("/proc/meminfo");
 | 
			
		||||
	while(file >> token)
 | 
			
		||||
	{
 | 
			
		||||
		if(token == "MemTotal:")
 | 
			
		||||
		{
 | 
			
		||||
			uint64_t mem;
 | 
			
		||||
			if(file >> mem)
 | 
			
		||||
			{
 | 
			
		||||
				return mem * 1024ull;
 | 
			
		||||
			}
 | 
			
		||||
			else
 | 
			
		||||
			{
 | 
			
		||||
				return 0;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		// ignore rest of the line
 | 
			
		||||
		file.ignore(std::numeric_limits<std::streamsize>::max(), '\n');
 | 
			
		||||
	}
 | 
			
		||||
	return 0; // nothing found
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool Sys::isCPU64bit()
 | 
			
		||||
{
 | 
			
		||||
	return isSystem64bit();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool Sys::isSystem64bit()
 | 
			
		||||
{
 | 
			
		||||
	// kernel build arch on linux
 | 
			
		||||
	return QSysInfo::currentCpuArchitecture() == "x86_64";
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,6 @@
 | 
			
		||||
#include "sys.h"
 | 
			
		||||
 | 
			
		||||
// FIXME: replace with our version...
 | 
			
		||||
QString Sys::getSystemInfo()
 | 
			
		||||
{
 | 
			
		||||
	QSysInfo::WinVersion version = QSysInfo::windowsVersion();
 | 
			
		||||
@@ -48,3 +49,36 @@ QString Sys::getSystemInfo()
 | 
			
		||||
	return os;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#include <windows.h>
 | 
			
		||||
 | 
			
		||||
uint64_t Sys::getSystemRam()
 | 
			
		||||
{
 | 
			
		||||
	MEMORYSTATUSEX status;
 | 
			
		||||
	status.dwLength = sizeof(status);
 | 
			
		||||
	GlobalMemoryStatusEx( &status );
 | 
			
		||||
	// bytes
 | 
			
		||||
	return (uint64_t)status.ullTotalPhys;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool Sys::isSystem64bit()
 | 
			
		||||
{
 | 
			
		||||
#if defined(_WIN64)
 | 
			
		||||
	return true;  // 64-bit programs run only on Win64
 | 
			
		||||
#elif defined(_WIN32)
 | 
			
		||||
	// 32-bit programs run on both 32-bit and 64-bit Windows
 | 
			
		||||
	// so must sniff
 | 
			
		||||
	BOOL f64 = false;
 | 
			
		||||
	return IsWow64Process(GetCurrentProcess(), &f64) && f64;
 | 
			
		||||
#else
 | 
			
		||||
	// it's some other kind of system...
 | 
			
		||||
	return false;
 | 
			
		||||
#endif
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool Sys::isCPU64bit()
 | 
			
		||||
{
 | 
			
		||||
	SYSTEM_INFO info;
 | 
			
		||||
	GetNativeSystemInfo(&info);
 | 
			
		||||
	auto arch = info.wProcessorArchitecture;
 | 
			
		||||
	return arch == PROCESSOR_ARCHITECTURE_AMD64 || arch == PROCESSOR_ARCHITECTURE_IA64;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user