razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #61 from ideasman42/linux-frameserver-sysconf-fix

Browse source 
Linux: Frameserver system memory access
This commit is contained in:
Shinya Kitaoka 2016-04-15 13:42:46 +09:00
commit a09dc1b458
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp
View file

@ -49,6 +49,10 @@ using namespace std;
#include <sys/sysctl.h> //To retrieve MAC HW infos
#endif
#ifdef LINUX
#include <sys/sysctl.h>
#endif
// forward declaration
class FarmServer;
@ -693,6 +697,7 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo)
hwInfo.m_type = Irix;
#else
#ifdef MACOSX
int mib[2];
TINT64 physMemSize;
size_t len;
@ -701,6 +706,11 @@ void FarmServer::queryHwInfo(HwInfo &hwInfo)
mib[1] = HW_MEMSIZE;
len = sizeof(physMemSize);
sysctl(mib, 2, &physMemSize, &len, NULL, 0);
#endif
#ifdef LINUX
TINT64 physMemSize = (TINT64)sysconf(_SC_PHYS_PAGES) * (TINT64)sysconf(_SC_PAGE_SIZE);
#endif
hwInfo.m_cpuCount = TSystem::getProcessorCount();